Merge commit 'pm-fixes-for-3.3-rc3' into pm-sleep

New material in the pm-sleep branch depends on recent
power management fixes.

127 files changed, 951 insertions, 3695 deletions

diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index 6727b92bc2fb..150fd3833d0b 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -857,42 +857,41 @@ case), we define a mapping like this:
 
 ...
 {
-        .name "2bit"
+        .name = "2bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_1_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "4bit"
+        .name = "4bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_1_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "4bit"
+        .name = "4bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_2_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "8bit"
+        .name = "8bit"
         .ctrl_dev_name = "pinctrl-foo",
-        .function = "mmc0",
         .group = "mmc0_1_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "8bit"
+        .name = "8bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_2_grp",
         .dev_name = "foo-mmc.0",
 },
 {
-        .name "8bit"
+        .name = "8bit"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "mmc0",
         .group = "mmc0_3_grp",
@@ -995,7 +994,7 @@ This is enabled by simply setting the .hog_on_boot field in the map to true,
 like this:
 
 {
-        .name "POWERMAP"
+        .name = "POWERMAP"
         .ctrl_dev_name = "pinctrl-foo",
         .function = "power_func",
         .hog_on_boot = true,
@@ -1025,7 +1024,7 @@ it, disables and releases it, and muxes it in on the pins defined by group B:
 
 foo_switch()
 {
-        struct pinmux pmx;
+        struct pinmux *pmx;
 
         /* Enable on position A */
         pmx = pinmux_get(&device, "spi0-pos-A");
diff --git a/MAINTAINERS b/MAINTAINERS
index 1b6e83550c76..a1fce9a3ab20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4140,6 +4140,7 @@ F:	fs/partitions/ldm.*
 
 LogFS
 M:      Joern Engel <joern@logfs.org>
+M:      Prasad Joshi <prasadjoshi.linux@gmail.com>
 L:      logfs@logfs.org
 W:      logfs.org
 S:      Maintained
@@ -4281,13 +4282,6 @@ S:	Orphan
 F:      drivers/video/matrox/matroxfb_*
 F:      include/linux/matroxfb.h
 
-MAX1668 TEMPERATURE SENSOR DRIVER
-M:      "David George" <david.george@ska.ac.za>
-L:      lm-sensors@lm-sensors.org
-S:      Maintained
-F:      Documentation/hwmon/max1668
-F:      drivers/hwmon/max1668.c
-
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:      "Hans J. Koch" <hjk@hansjkoch.de>
 L:      lm-sensors@lm-sensors.org
@@ -6678,7 +6672,7 @@ TTY LAYER
 M:      Greg Kroah-Hartman <gregkh@suse.de>
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
-F:      drivers/tty/*
+F:      drivers/tty/
 F:      drivers/tty/serial/serial_core.c
 F:      include/linux/serial_core.h
 F:      include/linux/serial.h
@@ -7371,6 +7365,7 @@ S:	Supported
 F:      Documentation/hwmon/wm83??
 F:      arch/arm/mach-s3c64xx/mach-crag6410*
 F:      drivers/leds/leds-wm83*.c
+F:      drivers/hwmon/wm83??-hwmon.c
 F:      drivers/input/misc/wm831x-on.c
 F:      drivers/input/touchscreen/wm831x-ts.c
 F:      drivers/input/touchscreen/wm97*.c
diff --git a/Makefile b/Makefile
index 71e6ed21dd15..e3b23e864a53 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 3
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 74f23a460ba2..c8d6efb99dbf 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -19,6 +19,7 @@ config MICROBLAZE
         select GENERIC_IRQ_SHOW
         select GENERIC_PCI_IOMAP
         select GENERIC_CPU_DEVICES
+        select GENERIC_ATOMIC64
 
 config SWAP
         def_bool n
diff --git a/arch/microblaze/include/asm/atomic.h b/arch/microblaze/include/asm/atomic.h
index 6d2e1d418be7..615f53992c65 100644
--- a/arch/microblaze/include/asm/atomic.h
+++ b/arch/microblaze/include/asm/atomic.h
@@ -2,6 +2,7 @@
 #define _ASM_MICROBLAZE_ATOMIC_H
 
 #include <asm-generic/atomic.h>
+#include <asm-generic/atomic64.h>
 
 /*
  * Atomically test *v and decrement if it is greater than 0.
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index e9f353341693..0ad2f1e1ce9e 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -88,7 +88,6 @@ KBUILD_CFLAGS	+= -pipe -fno-strength-reduce -Wno-sign-compare
 KBUILD_AFLAGS   += $(aflags-y)
 
 OBJCOPYFLAGS    := -O binary
-LDFLAGS_vmlinux := -e start
 
 head-y          := arch/s390/kernel/head.o
 head-y          += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o)
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index e4c79ebb40e6..21109c63eb12 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -9,12 +9,12 @@
 #ifndef CONFIG_64BIT
 OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390")
 OUTPUT_ARCH(s390)
-ENTRY(_start)
+ENTRY(startup)
 jiffies = jiffies_64 + 4;
 #else
 OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")
 OUTPUT_ARCH(s390:64-bit)
-ENTRY(_start)
+ENTRY(startup)
 jiffies = jiffies_64;
 #endif
 
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 396e60ce8114..f8625e290728 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -140,7 +140,7 @@ int drm_gem_object_init(struct drm_device *dev,
         obj->dev = dev;
         obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
         if (IS_ERR(obj->filp))
-                return -ENOMEM;
+                return PTR_ERR(obj->filp);
 
         kref_init(&obj->refcount);
         atomic_set(&obj->handle_count, 0);
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index f7c17b239833..7f4b4e10246e 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -886,7 +886,7 @@ static int i810_flush_queue(struct drm_device *dev)
 }
 
 /* Must be called with the lock held */
-void i810_driver_reclaim_buffers(struct drm_device *dev,
+static void i810_reclaim_buffers(struct drm_device *dev,
                                  struct drm_file *file_priv)
 {
         struct drm_device_dma *dma = dev->dma;
@@ -1223,17 +1223,12 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
                 if (dev_priv->page_flipping)
                         i810_do_cleanup_pageflip(dev);
         }
+}
 
-        if (file_priv->master && file_priv->master->lock.hw_lock) {
-                drm_idlelock_take(&file_priv->master->lock);
-                i810_driver_reclaim_buffers(dev, file_priv);
-                drm_idlelock_release(&file_priv->master->lock);
-        } else {
-                /* master disappeared, clean up stuff anyway and hope nothing
-                 * goes wrong */
-                i810_driver_reclaim_buffers(dev, file_priv);
-        }
-
+void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                        struct drm_file *file_priv)
+{
+        i810_reclaim_buffers(dev, file_priv);
 }
 
 int i810_driver_dma_quiescent(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 053f1ee58393..ec12f7dc717a 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -63,6 +63,7 @@ static struct drm_driver driver = {
         .lastclose = i810_driver_lastclose,
         .preclose = i810_driver_preclose,
         .device_is_agp = i810_driver_device_is_agp,
+        .reclaim_buffers_locked = i810_driver_reclaim_buffers_locked,
         .dma_quiescent = i810_driver_dma_quiescent,
         .ioctls = i810_ioctls,
         .fops = &i810_driver_fops,
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index 6e0acad9e0f5..c9339f481795 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -116,12 +116,14 @@ typedef struct drm_i810_private {
 
                                 /* i810_dma.c */
 extern int i810_driver_dma_quiescent(struct drm_device *dev);
-void i810_driver_reclaim_buffers(struct drm_device *dev,
-                                 struct drm_file *file_priv);
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                               struct drm_file *file_priv);
 extern int i810_driver_load(struct drm_device *, unsigned long flags);
 extern void i810_driver_lastclose(struct drm_device *dev);
 extern void i810_driver_preclose(struct drm_device *dev,
                                  struct drm_file *file_priv);
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                               struct drm_file *file_priv);
 extern int i810_driver_device_is_agp(struct drm_device *dev);
 
 extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
index 7bb1b079f480..e2a393ff0c44 100644
--- a/drivers/gpu/drm/radeon/radeon_i2c.c
+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
@@ -897,6 +897,7 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev,
         i2c->rec = *rec;
         i2c->adapter.owner = THIS_MODULE;
         i2c->adapter.class = I2C_CLASS_DDC;
+        i2c->adapter.dev.parent = &dev->pdev->dev;
         i2c->dev = dev;
         i2c_set_adapdata(&i2c->adapter, i2c);
         if (rec->mm_i2c ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 0af6ebdf205d..b66ef0e3cde1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -378,7 +378,7 @@ int vmw_framebuffer_create_handle(struct drm_framebuffer *fb,
                                   unsigned int *handle)
 {
         if (handle)
-                handle = 0;
+                *handle = 0;
 
         return 0;
 }
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 92f949767ece..6dbfd3e516e4 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -283,11 +283,11 @@ static inline long temp_from_reg(u8 reg)
 
 static inline u8 temp_to_reg(long val)
 {
-        if (val < 0)
-                val = 0;
-        else if (val > 1000 * 0xff)
-                val = 0xff;
-        return ((val + 500) / 1000);
+        if (val <= 0)
+                return 0;
+        if (val >= 1000 * 0xff)
+                return 0xff;
+        return (val + 500) / 1000;
 }
 
 /*
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 6ddeae049058..91fdd1fe18b0 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -883,7 +883,7 @@ static int sht15_invalidate_voltage(struct notifier_block *nb,
 
 static int __devinit sht15_probe(struct platform_device *pdev)
 {
-        int ret = 0;
+        int ret;
         struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL);
         u8 status = 0;
 
@@ -901,6 +901,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)
         init_waitqueue_head(&data->wait_queue);
 
         if (pdev->dev.platform_data == NULL) {
+                ret = -EINVAL;
                 dev_err(&pdev->dev, "no platform data supplied\n");
                 goto err_free_data;
         }
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 0e0af0445222..2dfae7d7cc5b 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -1319,6 +1319,7 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
 {
         struct w83627ehf_data *data = dev_get_drvdata(dev);
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        struct w83627ehf_sio_data *sio_data = dev->platform_data;
         int nr = sensor_attr->index;
         unsigned long val;
         int err;
@@ -1330,6 +1331,11 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
 
         if (val > 1)
                 return -EINVAL;
+
+        /* On NCT67766F, DC mode is only supported for pwm1 */
+        if (sio_data->kind == nct6776 && nr && val != 1)
+                return -EINVAL;
+
         mutex_lock(&data->update_lock);
         reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]);
         data->pwm_mode[nr] = val;
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
index 752493f00406..65d1f05007be 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
@@ -972,11 +972,11 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
         }
 #endif
 
-        spin_unlock_irqrestore(&trans->shrd->lock, flags);
-
         /* saved interrupt in inta variable now we can reset trans_pcie->inta */
         trans_pcie->inta = 0;
 
+        spin_unlock_irqrestore(&trans->shrd->lock, flags);
+
         /* Now service all interrupt bits discovered above. */
         if (inta & CSR_INT_BIT_HW_ERR) {
                 IWL_ERR(trans, "Hardware error detected.  Restarting.\n");
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index fa679057630f..698b905058dd 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -68,7 +68,7 @@ struct netfront_cb {
 
 #define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)
 #define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)
-#define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256)
+#define TX_MAX_TARGET min_t(int, NET_TX_RING_SIZE, 256)
 
 struct netfront_stats {
         u64                     rx_packets;
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 569bdb3ef104..8fe15cf15ac8 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -510,10 +510,12 @@ static struct dentry *debugfs_root;
 
 static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
 {
-        static struct dentry *device_root;
+        struct dentry *device_root;
 
         device_root = debugfs_create_dir(dev_name(pctldev->dev),
                                          debugfs_root);
+        pctldev->device_root = device_root;
+
         if (IS_ERR(device_root) || !device_root) {
                 pr_warn("failed to create debugfs directory for %s\n",
                         dev_name(pctldev->dev));
@@ -529,6 +531,11 @@ static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev)
         pinconf_init_device_debugfs(device_root, pctldev);
 }
 
+static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)
+{
+        debugfs_remove_recursive(pctldev->device_root);
+}
+
 static void pinctrl_init_debugfs(void)
 {
         debugfs_root = debugfs_create_dir("pinctrl", NULL);
@@ -553,6 +560,10 @@ static void pinctrl_init_debugfs(void)
 {
 }
 
+static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)
+{
+}
+
 #endif
 
 /**
@@ -572,40 +583,40 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
         if (pctldesc->name == NULL)
                 return NULL;
 
+        pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL);
+        if (pctldev == NULL)
+                return NULL;
+
+        /* Initialize pin control device struct */
+        pctldev->owner = pctldesc->owner;
+        pctldev->desc = pctldesc;
+        pctldev->driver_data = driver_data;
+        INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL);
+        spin_lock_init(&pctldev->pin_desc_tree_lock);
+        INIT_LIST_HEAD(&pctldev->gpio_ranges);
+        mutex_init(&pctldev->gpio_ranges_lock);
+        pctldev->dev = dev;
+
         /* If we're implementing pinmuxing, check the ops for sanity */
         if (pctldesc->pmxops) {
-                ret = pinmux_check_ops(pctldesc->pmxops);
+                ret = pinmux_check_ops(pctldev);
                 if (ret) {
                         pr_err("%s pinmux ops lacks necessary functions\n",
                                pctldesc->name);
-                        return NULL;
+                        goto out_err;
                 }
         }
 
         /* If we're implementing pinconfig, check the ops for sanity */
         if (pctldesc->confops) {
-                ret = pinconf_check_ops(pctldesc->confops);
+                ret = pinconf_check_ops(pctldev);
                 if (ret) {
                         pr_err("%s pin config ops lacks necessary functions\n",
                                pctldesc->name);
-                        return NULL;
+                        goto out_err;
                 }
         }
 
-        pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL);
-        if (pctldev == NULL)
-                return NULL;
-
-        /* Initialize pin control device struct */
-        pctldev->owner = pctldesc->owner;
-        pctldev->desc = pctldesc;
-        pctldev->driver_data = driver_data;
-        INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL);
-        spin_lock_init(&pctldev->pin_desc_tree_lock);
-        INIT_LIST_HEAD(&pctldev->gpio_ranges);
-        mutex_init(&pctldev->gpio_ranges_lock);
-        pctldev->dev = dev;
-
         /* Register all the pins */
         pr_debug("try to register %d pins on %s...\n",
                  pctldesc->npins, pctldesc->name);
@@ -641,6 +652,7 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev)
         if (pctldev == NULL)
                 return;
 
+        pinctrl_remove_device_debugfs(pctldev);
         pinmux_unhog_maps(pctldev);
         /* TODO: check that no pinmuxes are still active? */
         mutex_lock(&pinctrldev_list_mutex);
diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
index 177a3310547f..cfa86da6b4b1 100644
--- a/drivers/pinctrl/core.h
+++ b/drivers/pinctrl/core.h
@@ -41,6 +41,9 @@ struct pinctrl_dev {
         struct device *dev;
         struct module *owner;
         void *driver_data;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *device_root;
+#endif
 #ifdef CONFIG_PINMUX
         struct mutex pinmux_hogs_lock;
         struct list_head pinmux_hogs;
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index 1259872b0a1d..9fb75456824c 100644
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -205,8 +205,10 @@ int pin_config_group_set(const char *dev_name, const char *pin_group,
 }
 EXPORT_SYMBOL(pin_config_group_set);
 
-int pinconf_check_ops(const struct pinconf_ops *ops)
+int pinconf_check_ops(struct pinctrl_dev *pctldev)
 {
+        const struct pinconf_ops *ops = pctldev->desc->confops;
+
         /* We must be able to read out pin status */
         if (!ops->pin_config_get && !ops->pin_config_group_get)
                 return -EINVAL;
@@ -236,7 +238,7 @@ static int pinconf_pins_show(struct seq_file *s, void *what)
         seq_puts(s, "Format: pin (name): pinmux setting array\n");
 
         /* The pin number can be retrived from the pin controller descriptor */
-        for (i = 0; pin < pctldev->desc->npins; i++) {
+        for (i = 0; i < pctldev->desc->npins; i++) {
                 struct pin_desc *desc;
 
                 pin = pctldev->desc->pins[i].number;
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index e7dc6165032a..006b77fa737e 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_PINCONF
 
-int pinconf_check_ops(const struct pinconf_ops *ops);
+int pinconf_check_ops(struct pinctrl_dev *pctldev);
 void pinconf_init_device_debugfs(struct dentry *devroot,
                                  struct pinctrl_dev *pctldev);
 int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
@@ -23,7 +23,7 @@ int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,
 
 #else
 
-static inline int pinconf_check_ops(const struct pinconf_ops *ops)
+static inline int pinconf_check_ops(struct pinctrl_dev *pctldev)
 {
         return 0;
 }
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index a76a348321bb..7c3193f7a044 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -53,11 +53,6 @@ struct pinmux_group {
  * @dev: the device using this pinmux
  * @usecount: the number of active users of this mux setting, used to keep
  *      track of nested use cases
- * @pins: an array of discrete physical pins used in this mapping, taken
- *      from the global pin enumeration space (copied from pinmux map)
- * @num_pins: the number of pins in this mapping array, i.e. the number of
- *      elements in .pins so we can iterate over that array (copied from
- *      pinmux map)
  * @pctldev: pin control device handling this pinmux
  * @func_selector: the function selector for the pinmux device handling
  *      this pinmux
@@ -152,8 +147,7 @@ static int pin_request(struct pinctrl_dev *pctldev,
                 status = 0;
 
         if (status)
-                dev_err(pctldev->dev, "->request on device %s failed "
-                       "for pin %d\n",
+                dev_err(pctldev->dev, "->request on device %s failed for pin %d\n",
                        pctldev->desc->name, pin);
 out_free_pin:
         if (status) {
@@ -355,21 +349,20 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps,
         /* First sanity check the new mapping */
         for (i = 0; i < num_maps; i++) {
                 if (!maps[i].name) {
-                        pr_err("failed to register map %d: "
-                               "no map name given\n", i);
+                        pr_err("failed to register map %d: no map name given\n",
+                                        i);
                         return -EINVAL;
                 }
 
                 if (!maps[i].ctrl_dev && !maps[i].ctrl_dev_name) {
-                        pr_err("failed to register map %s (%d): "
-                               "no pin control device given\n",
+                        pr_err("failed to register map %s (%d): no pin control device given\n",
                                maps[i].name, i);
                         return -EINVAL;
                 }
 
                 if (!maps[i].function) {
-                        pr_err("failed to register map %s (%d): "
-                               "no function ID given\n", maps[i].name, i);
+                        pr_err("failed to register map %s (%d): no function ID given\n",
+                                        maps[i].name, i);
                         return -EINVAL;
                 }
 
@@ -411,7 +404,7 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps,
 }
 
 /**
- * acquire_pins() - acquire all the pins for a certain funcion on a pinmux
+ * acquire_pins() - acquire all the pins for a certain function on a pinmux
  * @pctldev: the device to take the pins on
  * @func_selector: the function selector to acquire the pins for
  * @group_selector: the group selector containing the pins to acquire
@@ -442,8 +435,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev,
                 ret = pin_request(pctldev, pins[i], func, NULL);
                 if (ret) {
                         dev_err(pctldev->dev,
-                                "could not get pin %d for function %s "
-                                "on device %s - conflicting mux mappings?\n",
+                                "could not get pin %d for function %s on device %s - conflicting mux mappings?\n",
                                 pins[i], func ? : "(undefined)",
                                 pinctrl_dev_get_name(pctldev));
                         /* On error release all taken pins */
@@ -458,7 +450,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev,
 
 /**
  * release_pins() - release pins taken by earlier acquirement
- * @pctldev: the device to free the pinx on
+ * @pctldev: the device to free the pins on
  * @group_selector: the group selector containing the pins to free
  */
 static void release_pins(struct pinctrl_dev *pctldev,
@@ -473,8 +465,7 @@ static void release_pins(struct pinctrl_dev *pctldev,
         ret = pctlops->get_group_pins(pctldev, group_selector,
                                       &pins, &num_pins);
         if (ret) {
-                dev_err(pctldev->dev, "could not get pins to release for "
-                        "group selector %d\n",
+                dev_err(pctldev->dev, "could not get pins to release for group selector %d\n",
                         group_selector);
                 return;
         }
@@ -526,8 +517,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev,
                 ret = pinctrl_get_group_selector(pctldev, groups[0]);
                 if (ret < 0) {
                         dev_err(pctldev->dev,
-                                "function %s wants group %s but the pin "
-                                "controller does not seem to have that group\n",
+                                "function %s wants group %s but the pin controller does not seem to have that group\n",
                                 pmxops->get_function_name(pctldev, func_selector),
                                 groups[0]);
                         return ret;
@@ -535,8 +525,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev,
 
                 if (num_groups > 1)
                         dev_dbg(pctldev->dev,
-                                "function %s support more than one group, "
-                                "default-selecting first group %s (%d)\n",
+                                "function %s support more than one group, default-selecting first group %s (%d)\n",
                                 pmxops->get_function_name(pctldev, func_selector),
                                 groups[0],
                                 ret);
@@ -628,10 +617,8 @@ static int pinmux_enable_muxmap(struct pinctrl_dev *pctldev,
 
         if (pmx->pctldev && pmx->pctldev != pctldev) {
                 dev_err(pctldev->dev,
-                        "different pin control devices given for device %s, "
-                        "function %s\n",
-                        devname,
-                        map->function);
+                        "different pin control devices given for device %s, function %s\n",
+                        devname, map->function);
                 return -EINVAL;
         }
         pmx->dev = dev;
@@ -695,7 +682,6 @@ static void pinmux_free_groups(struct pinmux *pmx)
  */
 struct pinmux *pinmux_get(struct device *dev, const char *name)
 {
-
         struct pinmux_map const *map = NULL;
         struct pinctrl_dev *pctldev = NULL;
         const char *devname = NULL;
@@ -745,8 +731,7 @@ struct pinmux *pinmux_get(struct device *dev, const char *name)
                         else if (map->ctrl_dev_name)
                                 devname = map->ctrl_dev_name;
 
-                        pr_warning("could not find a pinctrl device for pinmux "
-                                   "function %s, fishy, they shall all have one\n",
+                        pr_warning("could not find a pinctrl device for pinmux function %s, fishy, they shall all have one\n",
                                    map->function);
                         pr_warning("given pinctrl device name: %s",
                                    devname ? devname : "UNDEFINED");
@@ -904,8 +889,11 @@ void pinmux_disable(struct pinmux *pmx)
 }
 EXPORT_SYMBOL_GPL(pinmux_disable);
 
-int pinmux_check_ops(const struct pinmux_ops *ops)
+int pinmux_check_ops(struct pinctrl_dev *pctldev)
 {
+        const struct pinmux_ops *ops = pctldev->desc->pmxops;
+        unsigned selector = 0;
+
         /* Check that we implement required operations */
         if (!ops->list_functions ||
             !ops->get_function_name ||
@@ -914,6 +902,18 @@ int pinmux_check_ops(const struct pinmux_ops *ops)
             !ops->disable)
                 return -EINVAL;
 
+        /* Check that all functions registered have names */
+        while (ops->list_functions(pctldev, selector) >= 0) {
+                const char *fname = ops->get_function_name(pctldev,
+                                                           selector);
+                if (!fname) {
+                        pr_err("pinmux ops has no name for function%u\n",
+                                selector);
+                        return -EINVAL;
+                }
+                selector++;
+        }
+
         return 0;
 }
 
@@ -932,8 +932,8 @@ static int pinmux_hog_map(struct pinctrl_dev *pctldev,
                  * without any problems, so then we can hog pinmuxes for
                  * all devices that just want a static pin mux at this point.
                  */
-                dev_err(pctldev->dev, "map %s wants to hog a non-system "
-                        "pinmux, this is not going to work\n", map->name);
+                dev_err(pctldev->dev, "map %s wants to hog a non-system pinmux, this is not going to work\n",
+                                map->name);
                 return -EINVAL;
         }
 
@@ -993,9 +993,12 @@ int pinmux_hog_maps(struct pinctrl_dev *pctldev)
         for (i = 0; i < pinmux_maps_num; i++) {
                 struct pinmux_map const *map = &pinmux_maps[i];
 
-                if (((map->ctrl_dev == dev) ||
-                     !strcmp(map->ctrl_dev_name, devname)) &&
-                    map->hog_on_boot) {
+                if (!map->hog_on_boot)
+                        continue;
+
+                if ((map->ctrl_dev == dev) ||
+                        (map->ctrl_dev_name &&
+                                !strcmp(map->ctrl_dev_name, devname))) {
                         /* OK time to hog! */
                         ret = pinmux_hog_map(pctldev, map);
                         if (ret)
@@ -1122,13 +1125,15 @@ static int pinmux_show(struct seq_file *s, void *what)
 
                 seq_printf(s, "device: %s function: %s (%u),",
                            pinctrl_dev_get_name(pmx->pctldev),
-                           pmxops->get_function_name(pctldev, pmx->func_selector),
+                           pmxops->get_function_name(pctldev,
+                                   pmx->func_selector),
                            pmx->func_selector);
 
                 seq_printf(s, " groups: [");
                 list_for_each_entry(grp, &pmx->groups, node) {
                         seq_printf(s, " %s (%u)",
-                                   pctlops->get_group_name(pctldev, grp->group_selector),
+                                   pctlops->get_group_name(pctldev,
+                                           grp->group_selector),
                                    grp->group_selector);
                 }
                 seq_printf(s, " ]");
diff --git a/drivers/pinctrl/pinmux.h b/drivers/pinctrl/pinmux.h
index 844500b3331b..97f52223fbc2 100644
--- a/drivers/pinctrl/pinmux.h
+++ b/drivers/pinctrl/pinmux.h
@@ -12,7 +12,7 @@
  */
 #ifdef CONFIG_PINMUX
 
-int pinmux_check_ops(const struct pinmux_ops *ops);
+int pinmux_check_ops(struct pinctrl_dev *pctldev);
 void pinmux_init_device_debugfs(struct dentry *devroot,
                                 struct pinctrl_dev *pctldev);
 void pinmux_init_debugfs(struct dentry *subsys_root);
@@ -21,7 +21,7 @@ void pinmux_unhog_maps(struct pinctrl_dev *pctldev);
 
 #else
 
-static inline int pinmux_check_ops(const struct pinmux_ops *ops)
+static inline int pinmux_check_ops(struct pinctrl_dev *pctldev)
 {
         return 0;
 }
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index f1651eb69648..679734d26a16 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -35,7 +35,7 @@ static void of_get_regulation_constraints(struct device_node *np,
         if (constraints->min_uV != constraints->max_uV)
                 constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE;
         /* Only one voltage?  Then make sure it's set. */
-        if (constraints->min_uV == constraints->max_uV)
+        if (min_uV && max_uV && constraints->min_uV == constraints->max_uV)
                 constraints->apply_uV = true;
 
         uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index eef27a197c00..110137e7ec81 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3261,6 +3261,12 @@ void dasd_generic_path_event(struct ccw_device *cdev, int *path_event)
                         device->path_data.tbvpm |= eventlpm;
                         dasd_schedule_device_bh(device);
                 }
+                if (path_event[chp] & PE_PATHGROUP_ESTABLISHED) {
+                        DBF_DEV_EVENT(DBF_WARNING, device, "%s",
+                                      "Pathgroup re-established\n");
+                        if (device->discipline->kick_validate)
+                                device->discipline->kick_validate(device);
+                }
         }
         dasd_put_device(device);
 }
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 553b3c5abb0a..b3beed5434e4 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -189,14 +189,12 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
         unsigned long flags;
         struct alias_server *server, *newserver;
         struct alias_lcu *lcu, *newlcu;
-        int is_lcu_known;
         struct dasd_uid uid;
 
         private = (struct dasd_eckd_private *) device->private;
 
         device->discipline->get_uid(device, &uid);
         spin_lock_irqsave(&aliastree.lock, flags);
-        is_lcu_known = 1;
         server = _find_server(&uid);
         if (!server) {
                 spin_unlock_irqrestore(&aliastree.lock, flags);
@@ -208,7 +206,6 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
                 if (!server) {
                         list_add(&newserver->server, &aliastree.serverlist);
                         server = newserver;
-                        is_lcu_known = 0;
                 } else {
                         /* someone was faster */
                         _free_server(newserver);
@@ -226,12 +223,10 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
                 if (!lcu) {
                         list_add(&newlcu->lcu, &server->lculist);
                         lcu = newlcu;
-                        is_lcu_known = 0;
                 } else {
                         /* someone was faster */
                         _free_lcu(newlcu);
                 }
-                is_lcu_known = 0;
         }
         spin_lock(&lcu->lock);
         list_add(&device->alias_list, &lcu->inactive_devices);
@@ -239,64 +234,7 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device)
         spin_unlock(&lcu->lock);
         spin_unlock_irqrestore(&aliastree.lock, flags);
 
-        return is_lcu_known;
-}
-
-/*
- * The first device to be registered on an LCU will have to do
- * some additional setup steps to configure that LCU on the
- * storage server. All further devices should wait with their
- * initialization until the first device is done.
- * To synchronize this work, the first device will call
- * dasd_alias_lcu_setup_complete when it is done, and all
- * other devices will wait for it with dasd_alias_wait_for_lcu_setup.
- */
-void dasd_alias_lcu_setup_complete(struct dasd_device *device)
-{
-        unsigned long flags;
-        struct alias_server *server;
-        struct alias_lcu *lcu;
-        struct dasd_uid uid;
-
-        device->discipline->get_uid(device, &uid);
-        lcu = NULL;
-        spin_lock_irqsave(&aliastree.lock, flags);
-        server = _find_server(&uid);
-        if (server)
-                lcu = _find_lcu(server, &uid);
-        spin_unlock_irqrestore(&aliastree.lock, flags);
-        if (!lcu) {
-                DBF_EVENT_DEVID(DBF_ERR, device->cdev,
-                                "could not find lcu for %04x %02x",
-                                uid.ssid, uid.real_unit_addr);
-                WARN_ON(1);
-                return;
-        }
-        complete_all(&lcu->lcu_setup);
-}
-
-void dasd_alias_wait_for_lcu_setup(struct dasd_device *device)
-{
-        unsigned long flags;
-        struct alias_server *server;
-        struct alias_lcu *lcu;
-        struct dasd_uid uid;
-
-        device->discipline->get_uid(device, &uid);
-        lcu = NULL;
-        spin_lock_irqsave(&aliastree.lock, flags);
-        server = _find_server(&uid);
-        if (server)
-                lcu = _find_lcu(server, &uid);
-        spin_unlock_irqrestore(&aliastree.lock, flags);
-        if (!lcu) {
-                DBF_EVENT_DEVID(DBF_ERR, device->cdev,
-                                "could not find lcu for %04x %02x",
-                                uid.ssid, uid.real_unit_addr);
-                WARN_ON(1);
-                return;
-        }
-        wait_for_completion(&lcu->lcu_setup);
+        return 0;
 }
 
 /*
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index bbcd5e9206ee..70880be26015 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1534,6 +1534,10 @@ static void dasd_eckd_validate_server(struct dasd_device *device)
         struct dasd_eckd_private *private;
         int enable_pav;
 
+        private = (struct dasd_eckd_private *) device->private;
+        if (private->uid.type == UA_BASE_PAV_ALIAS ||
+            private->uid.type == UA_HYPER_PAV_ALIAS)
+                return;
         if (dasd_nopav || MACHINE_IS_VM)
                 enable_pav = 0;
         else
@@ -1542,11 +1546,28 @@ static void dasd_eckd_validate_server(struct dasd_device *device)
 
         /* may be requested feature is not available on server,
          * therefore just report error and go ahead */
-        private = (struct dasd_eckd_private *) device->private;
         DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "PSF-SSC for SSID %04x "
                         "returned rc=%d", private->uid.ssid, rc);
 }
 
+/*
+ * worker to do a validate server in case of a lost pathgroup
+ */
+static void dasd_eckd_do_validate_server(struct work_struct *work)
+{
+        struct dasd_device *device = container_of(work, struct dasd_device,
+                                                  kick_validate);
+        dasd_eckd_validate_server(device);
+        dasd_put_device(device);
+}
+
+static void dasd_eckd_kick_validate_server(struct dasd_device *device)
+{
+        dasd_get_device(device);
+        /* queue call to do_validate_server to the kernel event daemon. */
+        schedule_work(&device->kick_validate);
+}
+
 static u32 get_fcx_max_data(struct dasd_device *device)
 {
 #if defined(CONFIG_64BIT)
@@ -1588,10 +1609,13 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
         struct dasd_eckd_private *private;
         struct dasd_block *block;
         struct dasd_uid temp_uid;
-        int is_known, rc, i;
+        int rc, i;
         int readonly;
         unsigned long value;
 
+        /* setup work queue for validate server*/
+        INIT_WORK(&device->kick_validate, dasd_eckd_do_validate_server);
+
         if (!ccw_device_is_pathgroup(device->cdev)) {
                 dev_warn(&device->cdev->dev,
                          "A channel path group could not be established\n");
@@ -1651,22 +1675,12 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                 block->base = device;
         }
 
-        /* register lcu with alias handling, enable PAV if this is a new lcu */
-        is_known = dasd_alias_make_device_known_to_lcu(device);
-        if (is_known < 0) {
-                rc = is_known;
+        /* register lcu with alias handling, enable PAV */
+        rc = dasd_alias_make_device_known_to_lcu(device);
+        if (rc)
                 goto out_err2;
-        }
-        /*
-         * dasd_eckd_validate_server is done on the first device that
-         * is found for an LCU. All later other devices have to wait
-         * for it, so they will read the correct feature codes.
-         */
-        if (!is_known) {
-                dasd_eckd_validate_server(device);
-                dasd_alias_lcu_setup_complete(device);
-        } else
-                dasd_alias_wait_for_lcu_setup(device);
+
+        dasd_eckd_validate_server(device);
 
         /* device may report different configuration data after LCU setup */
         rc = dasd_eckd_read_conf(device);
@@ -4098,7 +4112,7 @@ static int dasd_eckd_restore_device(struct dasd_device *device)
 {
         struct dasd_eckd_private *private;
         struct dasd_eckd_characteristics temp_rdc_data;
-        int is_known, rc;
+        int rc;
         struct dasd_uid temp_uid;
         unsigned long flags;
 
@@ -4121,14 +4135,10 @@ static int dasd_eckd_restore_device(struct dasd_device *device)
                 goto out_err;
 
         /* register lcu with alias handling, enable PAV if this is a new lcu */
-        is_known = dasd_alias_make_device_known_to_lcu(device);
-        if (is_known < 0)
-                return is_known;
-        if (!is_known) {
-                dasd_eckd_validate_server(device);
-                dasd_alias_lcu_setup_complete(device);
-        } else
-                dasd_alias_wait_for_lcu_setup(device);
+        rc = dasd_alias_make_device_known_to_lcu(device);
+        if (rc)
+                return rc;
+        dasd_eckd_validate_server(device);
 
         /* RE-Read Configuration Data */
         rc = dasd_eckd_read_conf(device);
@@ -4270,6 +4280,7 @@ static struct dasd_discipline dasd_eckd_discipline = {
         .restore = dasd_eckd_restore_device,
         .reload = dasd_eckd_reload_device,
         .get_uid = dasd_eckd_get_uid,
+        .kick_validate = dasd_eckd_kick_validate_server,
 };
 
 static int __init
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index afe8c33422ed..33a6743ddc55 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -355,6 +355,7 @@ struct dasd_discipline {
         int (*reload) (struct dasd_device *);
 
         int (*get_uid) (struct dasd_device *, struct dasd_uid *);
+        void (*kick_validate) (struct dasd_device *);
 };
 
 extern struct dasd_discipline *dasd_diag_discipline_pointer;
@@ -455,6 +456,7 @@ struct dasd_device {
         struct work_struct kick_work;
         struct work_struct restore_device;
         struct work_struct reload_device;
+        struct work_struct kick_validate;
         struct timer_list timer;
 
         debug_info_t *debug_area;
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250/8250.c
index 9f50c4e3c2be..9f50c4e3c2be 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250/8250.c
diff --git a/drivers/tty/serial/8250.h b/drivers/tty/serial/8250/8250.h
index ae027be57e25..ae027be57e25 100644
--- a/drivers/tty/serial/8250.h
+++ b/drivers/tty/serial/8250/8250.h
diff --git a/drivers/tty/serial/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c
index 34b51c651192..34b51c651192 100644
--- a/drivers/tty/serial/8250_accent.c
+++ b/drivers/tty/serial/8250/8250_accent.c
diff --git a/drivers/tty/serial/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
index b0ce8c56f1a4..b0ce8c56f1a4 100644
--- a/drivers/tty/serial/8250_acorn.c
+++ b/drivers/tty/serial/8250/8250_acorn.c
diff --git a/drivers/tty/serial/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c
index d125dc107985..d125dc107985 100644
--- a/drivers/tty/serial/8250_boca.c
+++ b/drivers/tty/serial/8250/8250_boca.c
diff --git a/drivers/tty/serial/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index f574eef3075f..f574eef3075f 100644
--- a/drivers/tty/serial/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
diff --git a/drivers/tty/serial/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index eaafb98debed..eaafb98debed 100644
--- a/drivers/tty/serial/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
diff --git a/drivers/tty/serial/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c
index bf53aabf9b5e..bf53aabf9b5e 100644
--- a/drivers/tty/serial/8250_exar_st16c554.c
+++ b/drivers/tty/serial/8250/8250_exar_st16c554.c
diff --git a/drivers/tty/serial/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c
index be1582609626..be1582609626 100644
--- a/drivers/tty/serial/8250_fourport.c
+++ b/drivers/tty/serial/8250/8250_fourport.c
diff --git a/drivers/tty/serial/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c
index f4d3c47b88e8..f4d3c47b88e8 100644
--- a/drivers/tty/serial/8250_fsl.c
+++ b/drivers/tty/serial/8250/8250_fsl.c
diff --git a/drivers/tty/serial/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c
index d8c0ffbfa6e3..d8c0ffbfa6e3 100644
--- a/drivers/tty/serial/8250_gsc.c
+++ b/drivers/tty/serial/8250/8250_gsc.c
diff --git a/drivers/tty/serial/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
index c13438c93012..c13438c93012 100644
--- a/drivers/tty/serial/8250_hp300.c
+++ b/drivers/tty/serial/8250/8250_hp300.c
diff --git a/drivers/tty/serial/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c
index a5c778e83de0..a5c778e83de0 100644
--- a/drivers/tty/serial/8250_hub6.c
+++ b/drivers/tty/serial/8250/8250_hub6.c
diff --git a/drivers/tty/serial/8250_mca.c b/drivers/tty/serial/8250/8250_mca.c
index d20abf04541e..d20abf04541e 100644
--- a/drivers/tty/serial/8250_mca.c
+++ b/drivers/tty/serial/8250/8250_mca.c
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index da2b0b0a183f..da2b0b0a183f 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
diff --git a/drivers/tty/serial/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index a2f236510ff1..a2f236510ff1 100644
--- a/drivers/tty/serial/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
new file mode 100644
index 000000000000..591f8018e7dd
--- /dev/null
+++ b/drivers/tty/serial/8250/Kconfig
@@ -0,0 +1,280 @@
+#
+# The 8250/16550 serial drivers.  You shouldn't be in this list unless
+# you somehow have an implicit or explicit dependency on SERIAL_8250.
+#
+
+config SERIAL_8250
+        tristate "8250/16550 and compatible serial support"
+        select SERIAL_CORE
+        ---help---
+          This selects whether you want to include the driver for the standard
+          serial ports.  The standard answer is Y.  People who might say N
+          here are those that are setting up dedicated Ethernet WWW/FTP
+          servers, or users that have one of the various bus mice instead of a
+          serial mouse and don't intend to use their machine's standard serial
+          port for anything.  (Note that the Cyclades and Stallion multi
+          serial port drivers do not need this driver built in for them to
+          work.)
+
+          To compile this driver as a module, choose M here: the
+          module will be called 8250.
+          [WARNING: Do not compile this driver as a module if you are using
+          non-standard serial ports, since the configuration information will
+          be lost when the driver is unloaded.  This limitation may be lifted
+          in the future.]
+
+          BTW1: If you have a mouseman serial mouse which is not recognized by
+          the X window system, try running gpm first.
+
+          BTW2: If you intend to use a software modem (also called Winmodem)
+          under Linux, forget it.  These modems are crippled and require
+          proprietary drivers which are only available under Windows.
+
+          Most people will say Y or M here, so that they can use serial mice,
+          modems and similar devices connecting to the standard serial ports.
+
+config SERIAL_8250_CONSOLE
+        bool "Console on 8250/16550 and compatible serial port"
+        depends on SERIAL_8250=y
+        select SERIAL_CORE_CONSOLE
+        ---help---
+          If you say Y here, it will be possible to use a serial port as the
+          system console (the system console is the device which receives all
+          kernel messages and warnings and which allows logins in single user
+          mode). This could be useful if some terminal or printer is connected
+          to that serial port.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyS1". (Try "man bootparam" or see the documentation of
+          your boot loader (grub or lilo or loadlin) about how to pass options
+          to the kernel at boot time.)
+
+          If you don't have a VGA card installed and you say Y here, the
+          kernel will automatically use the first serial line, /dev/ttyS0, as
+          system console.
+
+          You can set that using a kernel command line option such as
+          "console=uart8250,io,0x3f8,9600n8"
+          "console=uart8250,mmio,0xff5e0000,115200n8".
+          and it will switch to normal serial console when the corresponding
+          port is ready.
+          "earlycon=uart8250,io,0x3f8,9600n8"
+          "earlycon=uart8250,mmio,0xff5e0000,115200n8".
+          it will not only setup early console.
+
+          If unsure, say N.
+
+config FIX_EARLYCON_MEM
+        bool
+        depends on X86
+        default y
+
+config SERIAL_8250_GSC
+        tristate
+        depends on SERIAL_8250 && GSC
+        default SERIAL_8250
+
+config SERIAL_8250_PCI
+        tristate "8250/16550 PCI device support" if EXPERT
+        depends on SERIAL_8250 && PCI
+        default SERIAL_8250
+        help
+          This builds standard PCI serial support. You may be able to
+          disable this feature if you only need legacy serial support.
+          Saves about 9K.
+
+config SERIAL_8250_PNP
+        tristate "8250/16550 PNP device support" if EXPERT
+        depends on SERIAL_8250 && PNP
+        default SERIAL_8250
+        help
+          This builds standard PNP serial support. You may be able to
+          disable this feature if you only need legacy serial support.
+
+config SERIAL_8250_HP300
+        tristate
+        depends on SERIAL_8250 && HP300
+        default SERIAL_8250
+
+config SERIAL_8250_CS
+        tristate "8250/16550 PCMCIA device support"
+        depends on PCMCIA && SERIAL_8250
+        ---help---
+          Say Y here to enable support for 16-bit PCMCIA serial devices,
+          including serial port cards, modems, and the modem functions of
+          multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are
+          credit-card size devices often used with laptops.)
+
+          To compile this driver as a module, choose M here: the
+          module will be called serial_cs.
+
+          If unsure, say N.
+
+config SERIAL_8250_NR_UARTS
+        int "Maximum number of 8250/16550 serial ports"
+        depends on SERIAL_8250
+        default "4"
+        help
+          Set this to the number of serial ports you want the driver
+          to support.  This includes any ports discovered via ACPI or
+          PCI enumeration and any ports that may be added at run-time
+          via hot-plug, or any ISA multi-port serial cards.
+
+config SERIAL_8250_RUNTIME_UARTS
+        int "Number of 8250/16550 serial ports to register at runtime"
+        depends on SERIAL_8250
+        range 0 SERIAL_8250_NR_UARTS
+        default "4"
+        help
+          Set this to the maximum number of serial ports you want
+          the kernel to register at boot time.  This can be overridden
+          with the module parameter "nr_uarts", or boot-time parameter
+          8250.nr_uarts
+
+config SERIAL_8250_EXTENDED
+        bool "Extended 8250/16550 serial driver options"
+        depends on SERIAL_8250
+        help
+          If you wish to use any non-standard features of the standard "dumb"
+          driver, say Y here. This includes HUB6 support, shared serial
+          interrupts, special multiport support, support for more than the
+          four COM 1/2/3/4 boards, etc.
+
+          Note that the answer to this question won't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about serial driver options. If unsure, say N.
+
+config SERIAL_8250_MANY_PORTS
+        bool "Support more than 4 legacy serial ports"
+        depends on SERIAL_8250_EXTENDED && !IA64
+        help
+          Say Y here if you have dumb serial boards other than the four
+          standard COM 1/2/3/4 ports. This may happen if you have an AST
+          FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
+          from <http://www.tldp.org/docs.html#howto>), or other custom
+          serial port hardware which acts similar to standard serial port
+          hardware. If you only use the standard COM 1/2/3/4 ports, you can
+          say N here to save some memory. You can also say Y if you have an
+          "intelligent" multiport card such as Cyclades, Digiboards, etc.
+
+#
+# Multi-port serial cards
+#
+
+config SERIAL_8250_FOURPORT
+        tristate "Support Fourport cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have an AST FourPort serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_fourport.
+
+config SERIAL_8250_ACCENT
+        tristate "Support Accent cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have an Accent Async serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_accent.
+
+config SERIAL_8250_BOCA
+        tristate "Support Boca cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have a Boca serial board.  Please read the Boca
+          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_boca.
+
+config SERIAL_8250_EXAR_ST16C554
+        tristate "Support Exar ST16C554/554D Quad UART"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          The Uplogix Envoy TU301 uses this Exar Quad UART.  If you are
+          tinkering with your Envoy TU301, or have a machine with this UART,
+          say Y here.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_exar_st16c554.
+
+config SERIAL_8250_HUB6
+        tristate "Support Hub6 cards"
+        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+        help
+          Say Y here if you have a HUB6 serial board.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_hub6.
+
+#
+# Misc. options/drivers.
+#
+
+config SERIAL_8250_SHARE_IRQ
+        bool "Support for sharing serial interrupts"
+        depends on SERIAL_8250_EXTENDED
+        help
+          Some serial boards have hardware support which allows multiple dumb
+          serial ports on the same board to share a single IRQ. To enable
+          support for this in the serial driver, say Y here.
+
+config SERIAL_8250_DETECT_IRQ
+        bool "Autodetect IRQ on standard ports (unsafe)"
+        depends on SERIAL_8250_EXTENDED
+        help
+          Say Y here if you want the kernel to try to guess which IRQ
+          to use for your serial port.
+
+          This is considered unsafe; it is far better to configure the IRQ in
+          a boot script using the setserial command.
+
+          If unsure, say N.
+
+config SERIAL_8250_RSA
+        bool "Support RSA serial ports"
+        depends on SERIAL_8250_EXTENDED
+        help
+          ::: To be written :::
+
+config SERIAL_8250_MCA
+        tristate "Support 8250-type ports on MCA buses"
+        depends on SERIAL_8250 != n && MCA
+        help
+          Say Y here if you have a MCA serial ports.
+
+          To compile this driver as a module, choose M here: the module
+          will be called 8250_mca.
+
+config SERIAL_8250_ACORN
+        tristate "Acorn expansion card serial port support"
+        depends on ARCH_ACORN && SERIAL_8250
+        help
+          If you have an Atomwide Serial card or Serial Port card for an Acorn
+          system, say Y to this option.  The driver can handle 1, 2, or 3 port
+          cards.  If unsure, say N.
+
+config SERIAL_8250_RM9K
+        bool "Support for MIPS RM9xxx integrated serial port"
+        depends on SERIAL_8250 != n && SERIAL_RM9000
+        select SERIAL_8250_SHARE_IRQ
+        help
+          Selecting this option will add support for the integrated serial
+          port hardware found on MIPS RM9122 and similar processors.
+          If unsure, say N.
+
+config SERIAL_8250_FSL
+        bool
+        depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
+        default PPC
+
+config SERIAL_8250_DW
+        tristate "Support for Synopsys DesignWare 8250 quirks"
+        depends on SERIAL_8250 && OF
+        help
+          Selecting this option will enable handling of the extra features
+          present in the Synopsys DesignWare APB UART.
diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile
new file mode 100644
index 000000000000..867bba738908
--- /dev/null
+++ b/drivers/tty/serial/8250/Makefile
@@ -0,0 +1,20 @@
+#
+# Makefile for the 8250 serial device drivers.
+#
+
+obj-$(CONFIG_SERIAL_8250)               += 8250.o
+obj-$(CONFIG_SERIAL_8250_PNP)           += 8250_pnp.o
+obj-$(CONFIG_SERIAL_8250_GSC)           += 8250_gsc.o
+obj-$(CONFIG_SERIAL_8250_PCI)           += 8250_pci.o
+obj-$(CONFIG_SERIAL_8250_HP300)         += 8250_hp300.o
+obj-$(CONFIG_SERIAL_8250_CS)            += serial_cs.o
+obj-$(CONFIG_SERIAL_8250_ACORN)         += 8250_acorn.o
+obj-$(CONFIG_SERIAL_8250_CONSOLE)       += 8250_early.o
+obj-$(CONFIG_SERIAL_8250_FOURPORT)      += 8250_fourport.o
+obj-$(CONFIG_SERIAL_8250_ACCENT)        += 8250_accent.o
+obj-$(CONFIG_SERIAL_8250_BOCA)          += 8250_boca.o
+obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
+obj-$(CONFIG_SERIAL_8250_HUB6)          += 8250_hub6.o
+obj-$(CONFIG_SERIAL_8250_MCA)           += 8250_mca.o
+obj-$(CONFIG_SERIAL_8250_FSL)           += 8250_fsl.o
+obj-$(CONFIG_SERIAL_8250_DW)            += 8250_dw.o
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/8250/m32r_sio.c
index 94a6792bf97b..94a6792bf97b 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/8250/m32r_sio.c
diff --git a/drivers/tty/serial/m32r_sio.h b/drivers/tty/serial/8250/m32r_sio.h
index e9b7e11793b1..e9b7e11793b1 100644
--- a/drivers/tty/serial/m32r_sio.h
+++ b/drivers/tty/serial/8250/m32r_sio.h
diff --git a/drivers/tty/serial/m32r_sio_reg.h b/drivers/tty/serial/8250/m32r_sio_reg.h
index 4671473793e3..4671473793e3 100644
--- a/drivers/tty/serial/m32r_sio_reg.h
+++ b/drivers/tty/serial/8250/m32r_sio_reg.h
diff --git a/drivers/tty/serial/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
index 86090605a84e..86090605a84e 100644
--- a/drivers/tty/serial/serial_cs.c
+++ b/drivers/tty/serial/8250/serial_cs.c
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index aca2386c5ef1..2de99248dfae 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -5,279 +5,7 @@
 menu "Serial drivers"
         depends on HAS_IOMEM
 
-#
-# The new 8250/16550 serial drivers
-config SERIAL_8250
-        tristate "8250/16550 and compatible serial support"
-        select SERIAL_CORE
-        ---help---
-          This selects whether you want to include the driver for the standard
-          serial ports.  The standard answer is Y.  People who might say N
-          here are those that are setting up dedicated Ethernet WWW/FTP
-          servers, or users that have one of the various bus mice instead of a
-          serial mouse and don't intend to use their machine's standard serial
-          port for anything.  (Note that the Cyclades and Stallion multi
-          serial port drivers do not need this driver built in for them to
-          work.)
-
-          To compile this driver as a module, choose M here: the
-          module will be called 8250.
-          [WARNING: Do not compile this driver as a module if you are using
-          non-standard serial ports, since the configuration information will
-          be lost when the driver is unloaded.  This limitation may be lifted
-          in the future.]
-
-          BTW1: If you have a mouseman serial mouse which is not recognized by
-          the X window system, try running gpm first.
-
-          BTW2: If you intend to use a software modem (also called Winmodem)
-          under Linux, forget it.  These modems are crippled and require
-          proprietary drivers which are only available under Windows.
-
-          Most people will say Y or M here, so that they can use serial mice,
-          modems and similar devices connecting to the standard serial ports.
-
-config SERIAL_8250_CONSOLE
-        bool "Console on 8250/16550 and compatible serial port"
-        depends on SERIAL_8250=y
-        select SERIAL_CORE_CONSOLE
-        ---help---
-          If you say Y here, it will be possible to use a serial port as the
-          system console (the system console is the device which receives all
-          kernel messages and warnings and which allows logins in single user
-          mode). This could be useful if some terminal or printer is connected
-          to that serial port.
-
-          Even if you say Y here, the currently visible virtual console
-          (/dev/tty0) will still be used as the system console by default, but
-          you can alter that using a kernel command line option such as
-          "console=ttyS1". (Try "man bootparam" or see the documentation of
-          your boot loader (grub or lilo or loadlin) about how to pass options
-          to the kernel at boot time.)
-
-          If you don't have a VGA card installed and you say Y here, the
-          kernel will automatically use the first serial line, /dev/ttyS0, as
-          system console.
-
-          You can set that using a kernel command line option such as
-          "console=uart8250,io,0x3f8,9600n8"
-          "console=uart8250,mmio,0xff5e0000,115200n8".
-          and it will switch to normal serial console when the corresponding 
-          port is ready.
-          "earlycon=uart8250,io,0x3f8,9600n8"
-          "earlycon=uart8250,mmio,0xff5e0000,115200n8".
-          it will not only setup early console.
-
-          If unsure, say N.
-
-config FIX_EARLYCON_MEM
-        bool
-        depends on X86
-        default y
-
-config SERIAL_8250_GSC
-        tristate
-        depends on SERIAL_8250 && GSC
-        default SERIAL_8250
-
-config SERIAL_8250_PCI
-        tristate "8250/16550 PCI device support" if EXPERT
-        depends on SERIAL_8250 && PCI
-        default SERIAL_8250
-        help
-          This builds standard PCI serial support. You may be able to
-          disable this feature if you only need legacy serial support.
-          Saves about 9K.
-
-config SERIAL_8250_PNP
-        tristate "8250/16550 PNP device support" if EXPERT
-        depends on SERIAL_8250 && PNP
-        default SERIAL_8250
-        help
-          This builds standard PNP serial support. You may be able to
-          disable this feature if you only need legacy serial support.
-
-config SERIAL_8250_FSL
-        bool
-        depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
-        default PPC
-
-config SERIAL_8250_HP300
-        tristate
-        depends on SERIAL_8250 && HP300
-        default SERIAL_8250
-
-config SERIAL_8250_CS
-        tristate "8250/16550 PCMCIA device support"
-        depends on PCMCIA && SERIAL_8250
-        ---help---
-          Say Y here to enable support for 16-bit PCMCIA serial devices,
-          including serial port cards, modems, and the modem functions of
-          multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are
-          credit-card size devices often used with laptops.)
-
-          To compile this driver as a module, choose M here: the
-          module will be called serial_cs.
-
-          If unsure, say N.
-
-config SERIAL_8250_NR_UARTS
-        int "Maximum number of 8250/16550 serial ports"
-        depends on SERIAL_8250
-        default "4"
-        help
-          Set this to the number of serial ports you want the driver
-          to support.  This includes any ports discovered via ACPI or
-          PCI enumeration and any ports that may be added at run-time
-          via hot-plug, or any ISA multi-port serial cards.
-
-config SERIAL_8250_RUNTIME_UARTS
-        int "Number of 8250/16550 serial ports to register at runtime"
-        depends on SERIAL_8250
-        range 0 SERIAL_8250_NR_UARTS
-        default "4"
-        help
-          Set this to the maximum number of serial ports you want
-          the kernel to register at boot time.  This can be overridden
-          with the module parameter "nr_uarts", or boot-time parameter
-          8250.nr_uarts
-
-config SERIAL_8250_EXTENDED
-        bool "Extended 8250/16550 serial driver options"
-        depends on SERIAL_8250
-        help
-          If you wish to use any non-standard features of the standard "dumb"
-          driver, say Y here. This includes HUB6 support, shared serial
-          interrupts, special multiport support, support for more than the
-          four COM 1/2/3/4 boards, etc.
-
-          Note that the answer to this question won't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about serial driver options. If unsure, say N.
-
-config SERIAL_8250_MANY_PORTS
-        bool "Support more than 4 legacy serial ports"
-        depends on SERIAL_8250_EXTENDED && !IA64
-        help
-          Say Y here if you have dumb serial boards other than the four
-          standard COM 1/2/3/4 ports. This may happen if you have an AST
-          FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
-          from <http://www.tldp.org/docs.html#howto>), or other custom
-          serial port hardware which acts similar to standard serial port
-          hardware. If you only use the standard COM 1/2/3/4 ports, you can
-          say N here to save some memory. You can also say Y if you have an
-          "intelligent" multiport card such as Cyclades, Digiboards, etc.
-
-#
-# Multi-port serial cards
-#
-
-config SERIAL_8250_FOURPORT
-        tristate "Support Fourport cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have an AST FourPort serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_fourport.
-
-config SERIAL_8250_ACCENT
-        tristate "Support Accent cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have an Accent Async serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_accent.
-
-config SERIAL_8250_BOCA
-        tristate "Support Boca cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have a Boca serial board.  Please read the Boca
-          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_boca.
-
-config SERIAL_8250_EXAR_ST16C554
-        tristate "Support Exar ST16C554/554D Quad UART"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          The Uplogix Envoy TU301 uses this Exar Quad UART.  If you are
-          tinkering with your Envoy TU301, or have a machine with this UART,
-          say Y here.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_exar_st16c554.
-
-config SERIAL_8250_HUB6
-        tristate "Support Hub6 cards"
-        depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
-        help
-          Say Y here if you have a HUB6 serial board.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_hub6.
-
-config SERIAL_8250_SHARE_IRQ
-        bool "Support for sharing serial interrupts"
-        depends on SERIAL_8250_EXTENDED
-        help
-          Some serial boards have hardware support which allows multiple dumb
-          serial ports on the same board to share a single IRQ. To enable
-          support for this in the serial driver, say Y here.
-
-config SERIAL_8250_DETECT_IRQ
-        bool "Autodetect IRQ on standard ports (unsafe)"
-        depends on SERIAL_8250_EXTENDED
-        help
-          Say Y here if you want the kernel to try to guess which IRQ
-          to use for your serial port.
-
-          This is considered unsafe; it is far better to configure the IRQ in
-          a boot script using the setserial command.
-
-          If unsure, say N.
-
-config SERIAL_8250_RSA
-        bool "Support RSA serial ports"
-        depends on SERIAL_8250_EXTENDED
-        help
-          ::: To be written :::
-
-config SERIAL_8250_MCA
-        tristate "Support 8250-type ports on MCA buses"
-        depends on SERIAL_8250 != n && MCA
-        help
-          Say Y here if you have a MCA serial ports.
-
-          To compile this driver as a module, choose M here: the module
-          will be called 8250_mca.
-
-config SERIAL_8250_ACORN
-        tristate "Acorn expansion card serial port support"
-        depends on ARCH_ACORN && SERIAL_8250
-        help
-          If you have an Atomwide Serial card or Serial Port card for an Acorn
-          system, say Y to this option.  The driver can handle 1, 2, or 3 port
-          cards.  If unsure, say N.
-
-config SERIAL_8250_RM9K
-        bool "Support for MIPS RM9xxx integrated serial port"
-        depends on SERIAL_8250 != n && SERIAL_RM9000
-        select SERIAL_8250_SHARE_IRQ
-        help
-          Selecting this option will add support for the integrated serial
-          port hardware found on MIPS RM9122 and similar processors.
-          If unsure, say N.
-
-config SERIAL_8250_DW
-        tristate "Support for Synopsys DesignWare 8250 quirks"
-        depends on SERIAL_8250 && OF
-        help
-          Selecting this option will enable handling of the extra features
-          present in the Synopsys DesignWare APB UART.
+source "drivers/tty/serial/8250/Kconfig"
 
 comment "Non-8250 serial port support"
 
@@ -536,15 +264,6 @@ config SERIAL_MAX3107
         help
           MAX3107 chip support
 
-config SERIAL_MAX3107_AAVA
-        tristate "MAX3107 AAVA platform support"
-        depends on X86_MRST && SERIAL_MAX3107 && GPIOLIB
-        select SERIAL_CORE
-        help
-          Support for the MAX3107 chip configuration found on the AAVA
-          platform. Includes the extra initialisation and GPIO support
-          neded for this device.
-
 config SERIAL_DZ
         bool "DECstation DZ serial driver"
         depends on MACH_DECSTATION && 32BIT
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index f5b01f2ce525..fef32e10c851 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -14,22 +14,9 @@ obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
 obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
 obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
 
-obj-$(CONFIG_SERIAL_8250) += 8250.o
-obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
-obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
-obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
-obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
-obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
-obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
-obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
-obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o
-obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
-obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
-obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
-obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
-obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
-obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o
-obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o
+# Now bring in any enabled 8250/16450/16550 type drivers.
+obj-$(CONFIG_SERIAL_8250) += 8250/
+
 obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
 obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
 obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
@@ -42,7 +29,6 @@ obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
 obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
 obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
 obj-$(CONFIG_SERIAL_MAX3107) += max3107.o
-obj-$(CONFIG_SERIAL_MAX3107_AAVA) += max3107-aava.o
 obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
 obj-$(CONFIG_SERIAL_MUX) += mux.o
 obj-$(CONFIG_SERIAL_68328) += 68328serial.o
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 9ae024025ff3..6800f5f26241 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -159,6 +159,7 @@ struct uart_amba_port {
         unsigned int            fifosize;       /* vendor-specific */
         unsigned int            lcrh_tx;        /* vendor-specific */
         unsigned int            lcrh_rx;        /* vendor-specific */
+        unsigned int            old_cr;         /* state during shutdown */
         bool                    autorts;
         char                    type[12];
         bool                    interrupt_may_hang; /* vendor-specific */
@@ -1411,7 +1412,9 @@ static int pl011_startup(struct uart_port *port)
         while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_BUSY)
                 barrier();
 
-        cr = UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
+        /* restore RTS and DTR */
+        cr = uap->old_cr & (UART011_CR_RTS | UART011_CR_DTR);
+        cr |= UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
         writew(cr, uap->port.membase + UART011_CR);
 
         /* Clear pending error interrupts */
@@ -1469,6 +1472,7 @@ static void pl011_shutdown_channel(struct uart_amba_port *uap,
 static void pl011_shutdown(struct uart_port *port)
 {
         struct uart_amba_port *uap = (struct uart_amba_port *)port;
+        unsigned int cr;
 
         /*
          * disable all interrupts
@@ -1488,9 +1492,16 @@ static void pl011_shutdown(struct uart_port *port)
 
         /*
          * disable the port
+         * disable the port. It should not disable RTS and DTR.
+         * Also RTS and DTR state should be preserved to restore
+         * it during startup().
          */
         uap->autorts = false;
-        writew(UART01x_CR_UARTEN | UART011_CR_TXE, uap->port.membase + UART011_CR);
+        cr = readw(uap->port.membase + UART011_CR);
+        uap->old_cr = cr;
+        cr &= UART011_CR_RTS | UART011_CR_DTR;
+        cr |= UART01x_CR_UARTEN | UART011_CR_TXE;
+        writew(cr, uap->port.membase + UART011_CR);
 
         /*
          * disable break condition and fifos
@@ -1740,9 +1751,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_amba_port *uap = amba_ports[co->index];
         unsigned int status, old_cr, new_cr;
+        unsigned long flags;
+        int locked = 1;
 
         clk_enable(uap->clk);
 
+        local_irq_save(flags);
+        if (uap->port.sysrq)
+                locked = 0;
+        else if (oops_in_progress)
+                locked = spin_trylock(&uap->port.lock);
+        else
+                spin_lock(&uap->port.lock);
+
         /*
          *      First save the CR then disable the interrupts
          */
@@ -1762,6 +1783,10 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
         } while (status & UART01x_FR_BUSY);
         writew(old_cr, uap->port.membase + UART011_CR);
 
+        if (locked)
+                spin_unlock(&uap->port.lock);
+        local_irq_restore(flags);
+
         clk_disable(uap->clk);
 }
 
@@ -1905,6 +1930,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
         uap->vendor = vendor;
         uap->lcrh_rx = vendor->lcrh_rx;
         uap->lcrh_tx = vendor->lcrh_tx;
+        uap->old_cr = 0;
         uap->fifosize = vendor->fifosize;
         uap->interrupt_may_hang = vendor->interrupt_may_hang;
         uap->port.dev = &dev->dev;
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 7c867a046c97..7545fe1b9925 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -251,6 +251,7 @@ static void jsm_io_resume(struct pci_dev *pdev)
         struct jsm_board *brd = pci_get_drvdata(pdev);
 
         pci_restore_state(pdev);
+        pci_save_state(pdev);
 
         jsm_uart_port_init(brd);
 }
diff --git a/drivers/tty/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c
deleted file mode 100644
index aae772a71de6..000000000000
--- a/drivers/tty/serial/max3107-aava.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- *  max3107.c - spi uart protocol driver for Maxim 3107
- *  Based on max3100.c
- *      by Christian Pellegrin <chripell@evolware.org>
- *  and max3110.c
- *      by Feng Tang <feng.tang@intel.com>
- *
- *  Copyright (C) Aavamobile 2009
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- */
-
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/spi/spi.h>
-#include <linux/freezer.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/sfi.h>
-#include <linux/module.h>
-#include <asm/mrst.h>
-#include "max3107.h"
-
-/* GPIO direction to input function */
-static int max3107_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[1];             /* Buffer for SPI transfer */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return -EINVAL;
-        }
-
-        /* Read current GPIO configuration register */
-        buf[0] = MAX3107_GPIOCFG_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) {
-                dev_err(&s->spi->dev, "SPI transfer GPIO read failed\n");
-                return -EIO;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-
-        /* Set GPIO to input */
-        buf[0] &= ~(0x0001 << offset);
-
-        /* Write new GPIO configuration register value */
-        buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG);
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, NULL, 2)) {
-                dev_err(&s->spi->dev, "SPI transfer GPIO write failed\n");
-                return -EIO;
-        }
-        return 0;
-}
-
-/* GPIO direction to output function */
-static int max3107_gpio_direction_out(struct gpio_chip *chip, unsigned offset,
-                                        int value)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[2];     /* Buffer for SPI transfers */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return -EINVAL;
-        }
-
-        /* Read current GPIO configuration and data registers */
-        buf[0] = MAX3107_GPIOCFG_REG;
-        buf[1] = MAX3107_GPIODATA_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) {
-                dev_err(&s->spi->dev, "SPI transfer gpio failed\n");
-                return -EIO;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-        buf[1] &= MAX3107_SPI_RX_DATA_MASK;
-
-        /* Set GPIO to output */
-        buf[0] |= (0x0001 << offset);
-        /* Set value */
-        if (value)
-                buf[1] |= (0x0001 << offset);
-        else
-                buf[1] &= ~(0x0001 << offset);
-
-        /* Write new GPIO configuration and data register values */
-        buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG);
-        buf[1] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG);
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, NULL, 4)) {
-                dev_err(&s->spi->dev,
-                        "SPI transfer for GPIO conf data w failed\n");
-                return -EIO;
-        }
-        return 0;
-}
-
-/* GPIO value query function */
-static int max3107_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[1];     /* Buffer for SPI transfer */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return -EINVAL;
-        }
-
-        /* Read current GPIO data register */
-        buf[0] = MAX3107_GPIODATA_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) {
-                dev_err(&s->spi->dev, "SPI transfer GPIO data r failed\n");
-                return -EIO;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-
-        /* Return value */
-        return buf[0] & (0x0001 << offset);
-}
-
-/* GPIO value set function */
-static void max3107_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
-{
-        struct max3107_port *s = container_of(chip, struct max3107_port, chip);
-        u16 buf[2];     /* Buffer for SPI transfers */
-
-        if (offset >= MAX3107_GPIO_COUNT) {
-                dev_err(&s->spi->dev, "Invalid GPIO\n");
-                return;
-        }
-
-        /* Read current GPIO configuration registers*/
-        buf[0] = MAX3107_GPIODATA_REG;
-        buf[1] = MAX3107_GPIOCFG_REG;
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) {
-                dev_err(&s->spi->dev,
-                        "SPI transfer for GPIO data and config read failed\n");
-                return;
-        }
-        buf[0] &= MAX3107_SPI_RX_DATA_MASK;
-        buf[1] &= MAX3107_SPI_RX_DATA_MASK;
-
-        if (!(buf[1] & (0x0001 << offset))) {
-                /* Configured as input, can't set value */
-                dev_warn(&s->spi->dev,
-                                "Trying to set value for input GPIO\n");
-                return;
-        }
-
-        /* Set value */
-        if (value)
-                buf[0] |= (0x0001 << offset);
-        else
-                buf[0] &= ~(0x0001 << offset);
-
-        /* Write new GPIO data register value */
-        buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG);
-        /* Perform SPI transfer */
-        if (max3107_rw(s, (u8 *)buf, NULL, 2))
-                dev_err(&s->spi->dev, "SPI transfer GPIO data w failed\n");
-}
-
-/* GPIO chip data */
-static struct gpio_chip max3107_gpio_chip = {
-        .owner                  = THIS_MODULE,
-        .direction_input        = max3107_gpio_direction_in,
-        .direction_output       = max3107_gpio_direction_out,
-        .get                    = max3107_gpio_get,
-        .set                    = max3107_gpio_set,
-        .can_sleep              = 1,
-        .base                   = MAX3107_GPIO_BASE,
-        .ngpio                  = MAX3107_GPIO_COUNT,
-};
-
-/**
- *      max3107_aava_reset      -       reset on AAVA systems
- *      @spi: The SPI device we are probing
- *
- *      Reset the device ready for probing.
- */
-
-static int max3107_aava_reset(struct spi_device *spi)
-{
-        /* Reset the chip */
-        if (gpio_request(MAX3107_RESET_GPIO, "max3107")) {
-                pr_err("Requesting RESET GPIO failed\n");
-                return -EIO;
-        }
-        if (gpio_direction_output(MAX3107_RESET_GPIO, 0)) {
-                pr_err("Setting RESET GPIO to 0 failed\n");
-                gpio_free(MAX3107_RESET_GPIO);
-                return -EIO;
-        }
-        msleep(MAX3107_RESET_DELAY);
-        if (gpio_direction_output(MAX3107_RESET_GPIO, 1)) {
-                pr_err("Setting RESET GPIO to 1 failed\n");
-                gpio_free(MAX3107_RESET_GPIO);
-                return -EIO;
-        }
-        gpio_free(MAX3107_RESET_GPIO);
-        msleep(MAX3107_WAKEUP_DELAY);
-        return 0;
-}
-
-static int max3107_aava_configure(struct max3107_port *s)
-{
-        int retval;
-
-        /* Initialize GPIO chip data */
-        s->chip = max3107_gpio_chip;
-        s->chip.label = s->spi->modalias;
-        s->chip.dev = &s->spi->dev;
-
-        /* Add GPIO chip */
-        retval = gpiochip_add(&s->chip);
-        if (retval) {
-                dev_err(&s->spi->dev, "Adding GPIO chip failed\n");
-                return retval;
-        }
-
-        /* Temporary fix for EV2 boot problems, set modem reset to 0 */
-        max3107_gpio_direction_out(&s->chip, 3, 0);
-        return 0;
-}
-
-#if 0
-/* This will get enabled once we have the board stuff merged for this
-   specific case */
-
-static const struct baud_table brg13_ext[] = {
-        { 300,    MAX3107_BRG13_B300 },
-        { 600,    MAX3107_BRG13_B600 },
-        { 1200,   MAX3107_BRG13_B1200 },
-        { 2400,   MAX3107_BRG13_B2400 },
-        { 4800,   MAX3107_BRG13_B4800 },
-        { 9600,   MAX3107_BRG13_B9600 },
-        { 19200,  MAX3107_BRG13_B19200 },
-        { 57600,  MAX3107_BRG13_B57600 },
-        { 115200, MAX3107_BRG13_B115200 },
-        { 230400, MAX3107_BRG13_B230400 },
-        { 460800, MAX3107_BRG13_B460800 },
-        { 921600, MAX3107_BRG13_B921600 },
-        { 0, 0 }
-};
-
-static void max3107_aava_init(struct max3107_port *s)
-{
-        /*override for AAVA SC specific*/
-        if (mrst_platform_id() == MRST_PLATFORM_AAVA_SC) {
-                if (get_koski_build_id() <= KOSKI_EV2)
-                        if (s->ext_clk) {
-                                s->brg_cfg = MAX3107_BRG13_B9600;
-                                s->baud_tbl = (struct baud_table *)brg13_ext;
-                        }
-        }
-}
-#endif
-
-static int __devexit max3107_aava_remove(struct spi_device *spi)
-{
-        struct max3107_port *s = dev_get_drvdata(&spi->dev);
-
-        /* Remove GPIO chip */
-        if (gpiochip_remove(&s->chip))
-                dev_warn(&spi->dev, "Removing GPIO chip failed\n");
-
-        /* Then do the default remove */
-        return max3107_remove(spi);
-}
-
-/* Platform data */
-static struct max3107_plat aava_plat_data = {
-        .loopback               = 0,
-        .ext_clk                = 1,
-/*      .init                   = max3107_aava_init, */
-        .configure              = max3107_aava_configure,
-        .hw_suspend             = max3107_hw_susp,
-        .polled_mode            = 0,
-        .poll_time              = 0,
-};
-
-
-static int __devinit max3107_probe_aava(struct spi_device *spi)
-{
-        int err = max3107_aava_reset(spi);
-        if (err < 0)
-                return err;
-        return max3107_probe(spi, &aava_plat_data);
-}
-
-/* Spi driver data */
-static struct spi_driver max3107_driver = {
-        .driver = {
-                .name           = "aava-max3107",
-                .owner          = THIS_MODULE,
-        },
-        .probe          = max3107_probe_aava,
-        .remove         = __devexit_p(max3107_aava_remove),
-        .suspend        = max3107_suspend,
-        .resume         = max3107_resume,
-};
-
-/* Driver init function */
-static int __init max3107_init(void)
-{
-        return spi_register_driver(&max3107_driver);
-}
-
-/* Driver exit function */
-static void __exit max3107_exit(void)
-{
-        spi_unregister_driver(&max3107_driver);
-}
-
-module_init(max3107_init);
-module_exit(max3107_exit);
-
-MODULE_DESCRIPTION("MAX3107 driver");
-MODULE_AUTHOR("Aavamobile");
-MODULE_ALIAS("spi:aava-max3107");
-MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index d192dcbb82f5..1c2426931484 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1160,7 +1160,7 @@ static struct uart_driver serial_omap_reg = {
         .cons           = OMAP_CONSOLE,
 };
 
-#ifdef CONFIG_SUSPEND
+#ifdef CONFIG_PM_SLEEP
 static int serial_omap_suspend(struct device *dev)
 {
         struct uart_omap_port *up = dev_get_drvdata(dev);
@@ -1521,6 +1521,7 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1)
         }
 }
 
+#ifdef CONFIG_PM_RUNTIME
 static void serial_omap_restore_context(struct uart_omap_port *up)
 {
         if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
@@ -1550,7 +1551,6 @@ static void serial_omap_restore_context(struct uart_omap_port *up)
                 serial_out(up, UART_OMAP_MDR1, up->mdr1);
 }
 
-#ifdef CONFIG_PM_RUNTIME
 static int serial_omap_runtime_suspend(struct device *dev)
 {
         struct uart_omap_port *up = dev_get_drvdata(dev);
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index c7bf31a6a7e7..13056180adf5 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2348,11 +2348,11 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
          */
         tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev);
         if (likely(!IS_ERR(tty_dev))) {
-                device_init_wakeup(tty_dev, 1);
-                device_set_wakeup_enable(tty_dev, 0);
-        } else
+                device_set_wakeup_capable(tty_dev, 1);
+        } else {
                 printk(KERN_ERR "Cannot register tty device on line %d\n",
                        uport->line);
+        }
 
         /*
          * Ensure UPF_DEAD is not set.
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index ef9dd628ba0b..bf6e238146ae 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -227,7 +227,6 @@ int tty_port_block_til_ready(struct tty_port *port,
         int do_clocal = 0, retval;
         unsigned long flags;
         DEFINE_WAIT(wait);
-        int cd;
 
         /* block if port is in the process of being closed */
         if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
@@ -284,11 +283,14 @@ int tty_port_block_til_ready(struct tty_port *port,
                                 retval = -ERESTARTSYS;
                         break;
                 }
-                /* Probe the carrier. For devices with no carrier detect this
-                   will always return true */
-                cd = tty_port_carrier_raised(port);
+                /*
+                 * Probe the carrier. For devices with no carrier detect
+                 * tty_port_carrier_raised will always return true.
+                 * Never ask drivers if CLOCAL is set, this causes troubles
+                 * on some hardware.
+                 */
                 if (!(port->flags & ASYNC_CLOSING) &&
-                                (do_clocal || cd))
+                                (do_clocal || tty_port_carrier_raised(port)))
                         break;
                 if (signal_pending(current)) {
                         retval = -ERESTARTSYS;
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 1c50baff7725..d2b3cffca3f7 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -57,6 +57,8 @@ MODULE_DEVICE_TABLE (usb, wdm_ids);
 
 #define WDM_MAX                 16
 
+/* CDC-WMC r1.1 requires wMaxCommand to be "at least 256 decimal (0x100)" */
+#define WDM_DEFAULT_BUFSIZE     256
 
 static DEFINE_MUTEX(wdm_mutex);
 
@@ -88,7 +90,8 @@ struct wdm_device {
         int                     count;
         dma_addr_t              shandle;
         dma_addr_t              ihandle;
-        struct mutex            lock;
+        struct mutex            wlock;
+        struct mutex            rlock;
         wait_queue_head_t       wait;
         struct work_struct      rxwork;
         int                     werr;
@@ -323,7 +326,7 @@ static ssize_t wdm_write
         }
 
         /* concurrent writes and disconnect */
-        r = mutex_lock_interruptible(&desc->lock);
+        r = mutex_lock_interruptible(&desc->wlock);
         rv = -ERESTARTSYS;
         if (r) {
                 kfree(buf);
@@ -386,7 +389,7 @@ static ssize_t wdm_write
 out:
         usb_autopm_put_interface(desc->intf);
 outnp:
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
 outnl:
         return rv < 0 ? rv : count;
 }
@@ -399,7 +402,7 @@ static ssize_t wdm_read
         struct wdm_device *desc = file->private_data;
 
 
-        rv = mutex_lock_interruptible(&desc->lock); /*concurrent reads */
+        rv = mutex_lock_interruptible(&desc->rlock); /*concurrent reads */
         if (rv < 0)
                 return -ERESTARTSYS;
 
@@ -467,14 +470,16 @@ retry:
         for (i = 0; i < desc->length - cntr; i++)
                 desc->ubuf[i] = desc->ubuf[i + cntr];
 
+        spin_lock_irq(&desc->iuspin);
         desc->length -= cntr;
+        spin_unlock_irq(&desc->iuspin);
         /* in case we had outstanding data */
         if (!desc->length)
                 clear_bit(WDM_READ, &desc->flags);
         rv = cntr;
 
 err:
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->rlock);
         return rv;
 }
 
@@ -540,7 +545,8 @@ static int wdm_open(struct inode *inode, struct file *file)
         }
         intf->needs_remote_wakeup = 1;
 
-        mutex_lock(&desc->lock);
+        /* using write lock to protect desc->count */
+        mutex_lock(&desc->wlock);
         if (!desc->count++) {
                 desc->werr = 0;
                 desc->rerr = 0;
@@ -553,7 +559,7 @@ static int wdm_open(struct inode *inode, struct file *file)
         } else {
                 rv = 0;
         }
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
         usb_autopm_put_interface(desc->intf);
 out:
         mutex_unlock(&wdm_mutex);
@@ -565,9 +571,11 @@ static int wdm_release(struct inode *inode, struct file *file)
         struct wdm_device *desc = file->private_data;
 
         mutex_lock(&wdm_mutex);
-        mutex_lock(&desc->lock);
+
+        /* using write lock to protect desc->count */
+        mutex_lock(&desc->wlock);
         desc->count--;
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
 
         if (!desc->count) {
                 dev_dbg(&desc->intf->dev, "wdm_release: cleanup");
@@ -630,7 +638,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
         struct usb_cdc_dmm_desc *dmhd;
         u8 *buffer = intf->altsetting->extra;
         int buflen = intf->altsetting->extralen;
-        u16 maxcom = 0;
+        u16 maxcom = WDM_DEFAULT_BUFSIZE;
 
         if (!buffer)
                 goto out;
@@ -665,7 +673,8 @@ next_desc:
         desc = kzalloc(sizeof(struct wdm_device), GFP_KERNEL);
         if (!desc)
                 goto out;
-        mutex_init(&desc->lock);
+        mutex_init(&desc->rlock);
+        mutex_init(&desc->wlock);
         spin_lock_init(&desc->iuspin);
         init_waitqueue_head(&desc->wait);
         desc->wMaxCommand = maxcom;
@@ -716,7 +725,7 @@ next_desc:
                 goto err;
 
         desc->inbuf = usb_alloc_coherent(interface_to_usbdev(intf),
-                                         desc->bMaxPacketSize0,
+                                         desc->wMaxCommand,
                                          GFP_KERNEL,
                                          &desc->response->transfer_dma);
         if (!desc->inbuf)
@@ -779,11 +788,13 @@ static void wdm_disconnect(struct usb_interface *intf)
         /* to terminate pending flushes */
         clear_bit(WDM_IN_USE, &desc->flags);
         spin_unlock_irqrestore(&desc->iuspin, flags);
-        mutex_lock(&desc->lock);
+        wake_up_all(&desc->wait);
+        mutex_lock(&desc->rlock);
+        mutex_lock(&desc->wlock);
         kill_urbs(desc);
         cancel_work_sync(&desc->rxwork);
-        mutex_unlock(&desc->lock);
-        wake_up_all(&desc->wait);
+        mutex_unlock(&desc->wlock);
+        mutex_unlock(&desc->rlock);
         if (!desc->count)
                 cleanup(desc);
         mutex_unlock(&wdm_mutex);
@@ -798,8 +809,10 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
         dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor);
 
         /* if this is an autosuspend the caller does the locking */
-        if (!PMSG_IS_AUTO(message))
-                mutex_lock(&desc->lock);
+        if (!PMSG_IS_AUTO(message)) {
+                mutex_lock(&desc->rlock);
+                mutex_lock(&desc->wlock);
+        }
         spin_lock_irq(&desc->iuspin);
 
         if (PMSG_IS_AUTO(message) &&
@@ -815,8 +828,10 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
                 kill_urbs(desc);
                 cancel_work_sync(&desc->rxwork);
         }
-        if (!PMSG_IS_AUTO(message))
-                mutex_unlock(&desc->lock);
+        if (!PMSG_IS_AUTO(message)) {
+                mutex_unlock(&desc->wlock);
+                mutex_unlock(&desc->rlock);
+        }
 
         return rv;
 }
@@ -854,7 +869,8 @@ static int wdm_pre_reset(struct usb_interface *intf)
 {
         struct wdm_device *desc = usb_get_intfdata(intf);
 
-        mutex_lock(&desc->lock);
+        mutex_lock(&desc->rlock);
+        mutex_lock(&desc->wlock);
         kill_urbs(desc);
 
         /*
@@ -876,7 +892,8 @@ static int wdm_post_reset(struct usb_interface *intf)
         int rv;
 
         rv = recover_from_urb_loss(desc);
-        mutex_unlock(&desc->lock);
+        mutex_unlock(&desc->wlock);
+        mutex_unlock(&desc->rlock);
         return 0;
 }
 
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 2f51de57593a..c8df1dd967ef 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -126,7 +126,6 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
                 struct dwc3_request *req)
 {
         struct dwc3             *dwc = dep->dwc;
-        u32                     type;
         int                     ret = 0;
 
         req->request.actual     = 0;
@@ -149,20 +148,14 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
 
                 direction = !!(dep->flags & DWC3_EP0_DIR_IN);
 
-                if (dwc->ep0state == EP0_STATUS_PHASE) {
-                        type = dwc->three_stage_setup
-                                ? DWC3_TRBCTL_CONTROL_STATUS3
-                                : DWC3_TRBCTL_CONTROL_STATUS2;
-                } else if (dwc->ep0state == EP0_DATA_PHASE) {
-                        type = DWC3_TRBCTL_CONTROL_DATA;
-                } else {
-                        /* should never happen */
-                        WARN_ON(1);
+                if (dwc->ep0state != EP0_DATA_PHASE) {
+                        dev_WARN(dwc->dev, "Unexpected pending request\n");
                         return 0;
                 }
 
                 ret = dwc3_ep0_start_trans(dwc, direction,
-                                req->request.dma, req->request.length, type);
+                                req->request.dma, req->request.length,
+                                DWC3_TRBCTL_CONTROL_DATA);
                 dep->flags &= ~(DWC3_EP_PENDING_REQUEST |
                                 DWC3_EP0_DIR_IN);
         } else if (dwc->delayed_status) {
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index a696bde53222..064b6e2cd411 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -101,7 +101,7 @@ void dwc3_unmap_buffer_from_dma(struct dwc3_request *req)
         if (req->request.num_mapped_sgs) {
                 req->request.dma = DMA_ADDR_INVALID;
                 dma_unmap_sg(dwc->dev, req->request.sg,
-                                req->request.num_sgs,
+                                req->request.num_mapped_sgs,
                                 req->direction ? DMA_TO_DEVICE
                                 : DMA_FROM_DEVICE);
 
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index a95de6a4a134..baaebf2830fc 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -175,13 +175,12 @@ ep_found:
         _ep->comp_desc = comp_desc;
         if (g->speed == USB_SPEED_SUPER) {
                 switch (usb_endpoint_type(_ep->desc)) {
-                case USB_ENDPOINT_XFER_BULK:
-                case USB_ENDPOINT_XFER_INT:
-                        _ep->maxburst = comp_desc->bMaxBurst;
-                        break;
                 case USB_ENDPOINT_XFER_ISOC:
                         /* mult: bits 1:0 of bmAttributes */
                         _ep->mult = comp_desc->bmAttributes & 0x3;
+                case USB_ENDPOINT_XFER_BULK:
+                case USB_ENDPOINT_XFER_INT:
+                        _ep->maxburst = comp_desc->bMaxBurst;
                         break;
                 default:
                         /* Do nothing for control endpoints */
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 753aa0683ac1..e0e6375ef5dd 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -126,7 +126,7 @@ ep_matches (
          * descriptor and see if the EP matches it
          */
         if (usb_endpoint_xfer_bulk(desc)) {
-                if (ep_comp) {
+                if (ep_comp && gadget->max_speed >= USB_SPEED_SUPER) {
                         num_req_streams = ep_comp->bmAttributes & 0x1f;
                         if (num_req_streams > ep->max_streams)
                                 return 0;
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 6353eca1e852..ee8ceec01560 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -3123,15 +3123,15 @@ fsg_add(struct usb_composite_dev *cdev, struct usb_configuration *c,
 
 struct fsg_module_parameters {
         char            *file[FSG_MAX_LUNS];
-        int             ro[FSG_MAX_LUNS];
-        int             removable[FSG_MAX_LUNS];
-        int             cdrom[FSG_MAX_LUNS];
-        int             nofua[FSG_MAX_LUNS];
+        bool            ro[FSG_MAX_LUNS];
+        bool            removable[FSG_MAX_LUNS];
+        bool            cdrom[FSG_MAX_LUNS];
+        bool            nofua[FSG_MAX_LUNS];
 
         unsigned int    file_count, ro_count, removable_count, cdrom_count;
         unsigned int    nofua_count;
         unsigned int    luns;   /* nluns */
-        int             stall;  /* can_stall */
+        bool            stall;  /* can_stall */
 };
 
 #define _FSG_MODULE_PARAM_ARRAY(prefix, params, name, type, desc)       \
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index d7ea6c076ce9..b04712f19f1e 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1430,7 +1430,7 @@ static void setup_received_irq(struct fsl_udc *udc,
                         int pipe = get_pipe_by_windex(wIndex);
                         struct fsl_ep *ep;
 
-                        if (wValue != 0 || wLength != 0 || pipe > udc->max_ep)
+                        if (wValue != 0 || wLength != 0 || pipe >= udc->max_ep)
                                 break;
                         ep = get_ep_by_pipe(udc, pipe);
 
@@ -1673,7 +1673,7 @@ static void dtd_complete_irq(struct fsl_udc *udc)
         if (!bit_pos)
                 return;
 
-        for (i = 0; i < udc->max_ep * 2; i++) {
+        for (i = 0; i < udc->max_ep; i++) {
                 ep_num = i >> 1;
                 direction = i % 2;
 
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index fa0fcc11263f..e2293c1588ee 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -11,11 +11,6 @@
 /* #undef       DEBUG */
 /* #undef       VERBOSE_DEBUG */
 
-#if defined(CONFIG_USB_LANGWELL_OTG)
-#define OTG_TRANSCEIVER
-#endif
-
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
@@ -1522,8 +1517,7 @@ static void langwell_udc_stop(struct langwell_udc *dev)
 
 
 /* stop all USB activities */
-static void stop_activity(struct langwell_udc *dev,
-                struct usb_gadget_driver *driver)
+static void stop_activity(struct langwell_udc *dev)
 {
         struct langwell_ep      *ep;
         dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__);
@@ -1535,9 +1529,9 @@ static void stop_activity(struct langwell_udc *dev,
         }
 
         /* report disconnect; the driver is already quiesced */
-        if (driver) {
+        if (dev->driver) {
                 spin_unlock(&dev->lock);
-                driver->disconnect(&dev->gadget);
+                dev->driver->disconnect(&dev->gadget);
                 spin_lock(&dev->lock);
         }
 
@@ -1925,11 +1919,10 @@ static int langwell_stop(struct usb_gadget *g,
 
         /* stop all usb activities */
         dev->gadget.speed = USB_SPEED_UNKNOWN;
-        stop_activity(dev, driver);
-        spin_unlock_irqrestore(&dev->lock, flags);
-
         dev->gadget.dev.driver = NULL;
         dev->driver = NULL;
+        stop_activity(dev);
+        spin_unlock_irqrestore(&dev->lock, flags);
 
         device_remove_file(&dev->pdev->dev, &dev_attr_function);
 
@@ -2315,13 +2308,9 @@ static void handle_setup_packet(struct langwell_udc *dev,
 
                         if (!gadget_is_otg(&dev->gadget))
                                 break;
-                        else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE) {
+                        else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE)
                                 dev->gadget.b_hnp_enable = 1;
-#ifdef  OTG_TRANSCEIVER
-                                if (!dev->lotg->otg.default_a)
-                                        dev->lotg->hsm.b_hnp_enable = 1;
-#endif
-                        } else if (setup->bRequest == USB_DEVICE_A_HNP_SUPPORT)
+                        else if (setup->bRequest == USB_DEVICE_A_HNP_SUPPORT)
                                 dev->gadget.a_hnp_support = 1;
                         else if (setup->bRequest ==
                                         USB_DEVICE_A_ALT_HNP_SUPPORT)
@@ -2733,7 +2722,7 @@ static void handle_usb_reset(struct langwell_udc *dev)
                 dev->bus_reset = 1;
 
                 /* reset all the queues, stop all USB activities */
-                stop_activity(dev, dev->driver);
+                stop_activity(dev);
                 dev->usb_state = USB_STATE_DEFAULT;
         } else {
                 dev_vdbg(&dev->pdev->dev, "device controller reset\n");
@@ -2741,7 +2730,7 @@ static void handle_usb_reset(struct langwell_udc *dev)
                 langwell_udc_reset(dev);
 
                 /* reset all the queues, stop all USB activities */
-                stop_activity(dev, dev->driver);
+                stop_activity(dev);
 
                 /* reset ep0 dQH and endptctrl */
                 ep0_reset(dev);
@@ -2752,12 +2741,6 @@ static void handle_usb_reset(struct langwell_udc *dev)
                 dev->usb_state = USB_STATE_ATTACHED;
         }
 
-#ifdef  OTG_TRANSCEIVER
-        /* refer to USB OTG 6.6.2.3 b_hnp_en is cleared */
-        if (!dev->lotg->otg.default_a)
-                dev->lotg->hsm.b_hnp_enable = 0;
-#endif
-
         dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);
 }
 
@@ -2770,29 +2753,6 @@ static void handle_bus_suspend(struct langwell_udc *dev)
         dev->resume_state = dev->usb_state;
         dev->usb_state = USB_STATE_SUSPENDED;
 
-#ifdef  OTG_TRANSCEIVER
-        if (dev->lotg->otg.default_a) {
-                if (dev->lotg->hsm.b_bus_suspend_vld == 1) {
-                        dev->lotg->hsm.b_bus_suspend = 1;
-                        /* notify transceiver the state changes */
-                        if (spin_trylock(&dev->lotg->wq_lock)) {
-                                langwell_update_transceiver();
-                                spin_unlock(&dev->lotg->wq_lock);
-                        }
-                }
-                dev->lotg->hsm.b_bus_suspend_vld++;
-        } else {
-                if (!dev->lotg->hsm.a_bus_suspend) {
-                        dev->lotg->hsm.a_bus_suspend = 1;
-                        /* notify transceiver the state changes */
-                        if (spin_trylock(&dev->lotg->wq_lock)) {
-                                langwell_update_transceiver();
-                                spin_unlock(&dev->lotg->wq_lock);
-                        }
-                }
-        }
-#endif
-
         /* report suspend to the driver */
         if (dev->driver) {
                 if (dev->driver->suspend) {
@@ -2823,11 +2783,6 @@ static void handle_bus_resume(struct langwell_udc *dev)
         if (dev->pdev->device != 0x0829)
                 langwell_phy_low_power(dev, 0);
 
-#ifdef  OTG_TRANSCEIVER
-        if (dev->lotg->otg.default_a == 0)
-                dev->lotg->hsm.a_bus_suspend = 0;
-#endif
-
         /* report resume to the driver */
         if (dev->driver) {
                 if (dev->driver->resume) {
@@ -3020,7 +2975,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
 
         dev->done = &done;
 
-#ifndef OTG_TRANSCEIVER
         /* free dTD dma_pool and dQH */
         if (dev->dtd_pool)
                 dma_pool_destroy(dev->dtd_pool);
@@ -3032,7 +2986,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
         /* release SRAM caching */
         if (dev->has_sram && dev->got_sram)
                 sram_deinit(dev);
-#endif
 
         if (dev->status_req) {
                 kfree(dev->status_req->req.buf);
@@ -3045,7 +2998,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
         if (dev->got_irq)
                 free_irq(pdev->irq, dev);
 
-#ifndef OTG_TRANSCEIVER
         if (dev->cap_regs)
                 iounmap(dev->cap_regs);
 
@@ -3055,13 +3007,6 @@ static void langwell_udc_remove(struct pci_dev *pdev)
 
         if (dev->enabled)
                 pci_disable_device(pdev);
-#else
-        if (dev->transceiver) {
-                otg_put_transceiver(dev->transceiver);
-                dev->transceiver = NULL;
-                dev->lotg = NULL;
-        }
-#endif
 
         dev->cap_regs = NULL;
 
@@ -3072,9 +3017,7 @@ static void langwell_udc_remove(struct pci_dev *pdev)
         device_remove_file(&pdev->dev, &dev_attr_langwell_udc);
         device_remove_file(&pdev->dev, &dev_attr_remote_wakeup);
 
-#ifndef OTG_TRANSCEIVER
         pci_set_drvdata(pdev, NULL);
-#endif
 
         /* free dev, wait for the release() finished */
         wait_for_completion(&done);
@@ -3089,9 +3032,7 @@ static int langwell_udc_probe(struct pci_dev *pdev,
                 const struct pci_device_id *id)
 {
         struct langwell_udc     *dev;
-#ifndef OTG_TRANSCEIVER
         unsigned long           resource, len;
-#endif
         void                    __iomem *base = NULL;
         size_t                  size;
         int                     retval;
@@ -3109,16 +3050,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->pdev = pdev;
         dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__);
 
-#ifdef  OTG_TRANSCEIVER
-        /* PCI device is already enabled by otg_transceiver driver */
-        dev->enabled = 1;
-
-        /* mem region and register base */
-        dev->region = 1;
-        dev->transceiver = otg_get_transceiver();
-        dev->lotg = otg_to_langwell(dev->transceiver);
-        base = dev->lotg->regs;
-#else
         pci_set_drvdata(pdev, dev);
 
         /* now all the pci goodies ... */
@@ -3139,7 +3070,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->region = 1;
 
         base = ioremap_nocache(resource, len);
-#endif
         if (base == NULL) {
                 dev_err(&dev->pdev->dev, "can't map memory\n");
                 retval = -EFAULT;
@@ -3163,7 +3093,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->got_sram = 0;
         dev_vdbg(&dev->pdev->dev, "dev->has_sram: %d\n", dev->has_sram);
 
-#ifndef OTG_TRANSCEIVER
         /* enable SRAM caching if detected */
         if (dev->has_sram && !dev->got_sram)
                 sram_init(dev);
@@ -3182,7 +3111,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
                 goto error;
         }
         dev->got_irq = 1;
-#endif
 
         /* set stopped bit */
         dev->stopped = 1;
@@ -3257,10 +3185,8 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->remote_wakeup = 0;
         dev->dev_status = 1 << USB_DEVICE_SELF_POWERED;
 
-#ifndef OTG_TRANSCEIVER
         /* reset device controller */
         langwell_udc_reset(dev);
-#endif
 
         /* initialize gadget structure */
         dev->gadget.ops = &langwell_ops;        /* usb_gadget_ops */
@@ -3268,9 +3194,6 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         INIT_LIST_HEAD(&dev->gadget.ep_list);   /* ep_list */
         dev->gadget.speed = USB_SPEED_UNKNOWN;  /* speed */
         dev->gadget.max_speed = USB_SPEED_HIGH; /* support dual speed */
-#ifdef  OTG_TRANSCEIVER
-        dev->gadget.is_otg = 1;                 /* support otg mode */
-#endif
 
         /* the "gadget" abstracts/virtualizes the controller */
         dev_set_name(&dev->gadget.dev, "gadget");
@@ -3282,10 +3205,8 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         /* controller endpoints reinit */
         eps_reinit(dev);
 
-#ifndef OTG_TRANSCEIVER
         /* reset ep0 dQH and endptctrl */
         ep0_reset(dev);
-#endif
 
         /* create dTD dma_pool resource */
         dev->dtd_pool = dma_pool_create("langwell_dtd",
@@ -3367,7 +3288,7 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state)
 
         spin_lock_irq(&dev->lock);
         /* stop all usb activities */
-        stop_activity(dev, dev->driver);
+        stop_activity(dev);
         spin_unlock_irq(&dev->lock);
 
         /* free dTD dma_pool and dQH */
@@ -3525,22 +3446,14 @@ static struct pci_driver langwell_pci_driver = {
 
 static int __init init(void)
 {
-#ifdef  OTG_TRANSCEIVER
-        return langwell_register_peripheral(&langwell_pci_driver);
-#else
         return pci_register_driver(&langwell_pci_driver);
-#endif
 }
 module_init(init);
 
 
 static void __exit cleanup(void)
 {
-#ifdef  OTG_TRANSCEIVER
-        return langwell_unregister_peripheral(&langwell_pci_driver);
-#else
         pci_unregister_driver(&langwell_pci_driver);
-#endif
 }
 module_exit(cleanup);
 
diff --git a/drivers/usb/gadget/langwell_udc.h b/drivers/usb/gadget/langwell_udc.h
index ef79e242b7b0..d6e78accaffe 100644
--- a/drivers/usb/gadget/langwell_udc.h
+++ b/drivers/usb/gadget/langwell_udc.h
@@ -8,7 +8,6 @@
  */
 
 #include <linux/usb/langwell_udc.h>
-#include <linux/usb/langwell_otg.h>
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index c7f291a331df..85ea14e2545e 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -598,16 +598,16 @@ static __maybe_unused struct usb_ss_cap_descriptor fsg_ss_cap_desc = {
                 | USB_5GBPS_OPERATION),
         .bFunctionalitySupport = USB_LOW_SPEED_OPERATION,
         .bU1devExitLat =        USB_DEFAULT_U1_DEV_EXIT_LAT,
-        .bU2DevExitLat =        USB_DEFAULT_U2_DEV_EXIT_LAT,
+        .bU2DevExitLat =        cpu_to_le16(USB_DEFAULT_U2_DEV_EXIT_LAT),
 };
 
 static __maybe_unused struct usb_bos_descriptor fsg_bos_desc = {
         .bLength =              USB_DT_BOS_SIZE,
         .bDescriptorType =      USB_DT_BOS,
 
-        .wTotalLength =         USB_DT_BOS_SIZE
+        .wTotalLength =         cpu_to_le16(USB_DT_BOS_SIZE
                                 + USB_DT_USB_EXT_CAP_SIZE
-                                + USB_DT_USB_SS_CAP_SIZE,
+                                + USB_DT_USB_SS_CAP_SIZE),
 
         .bNumDeviceCaps =       2,
 };
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index e90344a17631..b556a72264d1 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -125,7 +125,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
          */
         if (pdata->init && pdata->init(pdev)) {
                 retval = -ENODEV;
-                goto err3;
+                goto err4;
         }
 
         /* Enable USB controller, 83xx or 8536 */
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index f4b627d343ac..01bb7241d6ef 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -276,6 +276,9 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
 
         /* Serial Bus Release Number is at PCI 0x60 offset */
         pci_read_config_byte(pdev, 0x60, &ehci->sbrn);
+        if (pdev->vendor == PCI_VENDOR_ID_STMICRO
+            && pdev->device == PCI_DEVICE_ID_STMICRO_USB_HOST)
+                ehci->sbrn = 0x20; /* ConneXT has no sbrn register */
 
         /* Keep this around for a while just in case some EHCI
          * implementation uses legacy PCI PM support.  This test
@@ -526,6 +529,9 @@ static const struct pci_device_id pci_ids [] = { {
         /* handle any USB 2.0 EHCI controller */
         PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
         .driver_data =  (unsigned long) &ehci_pci_hc_driver,
+        }, {
+        PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_HOST),
+        .driver_data = (unsigned long) &ehci_pci_hc_driver,
         },
         { /* end: all zeroes */ }
 };
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 5179fcd73d8a..e4bcb62b930a 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -82,6 +82,14 @@ urb_print(struct urb * urb, char * str, int small, int status)
                 ohci_dbg(ohci,format, ## arg ); \
         } while (0);
 
+/* Version for use where "next" is the address of a local variable */
+#define ohci_dbg_nosw(ohci, next, size, format, arg...) \
+        do { \
+                unsigned s_len; \
+                s_len = scnprintf(*next, *size, format, ## arg); \
+                *size -= s_len; *next += s_len; \
+        } while (0);
+
 
 static void ohci_dump_intr_mask (
         struct ohci_hcd *ohci,
@@ -653,7 +661,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
 
         /* dump driver info, then registers in spec order */
 
-        ohci_dbg_sw (ohci, &next, &size,
+        ohci_dbg_nosw(ohci, &next, &size,
                 "bus %s, device %s\n"
                 "%s\n"
                 "%s\n",
@@ -672,7 +680,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf)
 
         /* hcca */
         if (ohci->hcca)
-                ohci_dbg_sw (ohci, &next, &size,
+                ohci_dbg_nosw(ohci, &next, &size,
                         "hcca frame 0x%04x\n", ohci_frame_no(ohci));
 
         /* other registers mostly affect frame timings */
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 6109810cc2d3..1843bb68ac7c 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -397,6 +397,10 @@ static const struct pci_device_id pci_ids [] = { {
         /* handle any USB OHCI controller */
         PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0),
         .driver_data =  (unsigned long) &ohci_pci_hc_driver,
+        }, {
+        /* The device in the ConneXT I/O hub has no class reg */
+        PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_OHCI),
+        .driver_data =  (unsigned long) &ohci_pci_hc_driver,
         }, { /* end: all zeroes */ }
 };
 MODULE_DEVICE_TABLE (pci, pci_ids);
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index b90e1386418b..b62037bff688 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1204,6 +1204,7 @@ static void handle_vendor_event(struct xhci_hcd *xhci,
  *
  * Returns a zero-based port number, which is suitable for indexing into each of
  * the split roothubs' port arrays and bus state arrays.
+ * Add one to it in order to call xhci_find_slot_id_by_port.
  */
 static unsigned int find_faked_portnum_from_hw_portnum(struct usb_hcd *hcd,
                 struct xhci_hcd *xhci, u32 port_id)
@@ -1324,7 +1325,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
                         xhci_set_link_state(xhci, port_array, faked_port_index,
                                                 XDEV_U0);
                         slot_id = xhci_find_slot_id_by_port(hcd, xhci,
-                                        faked_port_index);
+                                        faked_port_index + 1);
                         if (!slot_id) {
                                 xhci_dbg(xhci, "slot_id is zero\n");
                                 goto cleanup;
@@ -3323,7 +3324,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 /* Check TD length */
                 if (running_total != td_len) {
                         xhci_err(xhci, "ISOC TD length unmatch\n");
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto cleanup;
                 }
         }
 
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index d9b6a0355443..da97dcec1f32 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -37,9 +37,6 @@ static int emi26_set_reset(struct usb_device *dev, unsigned char reset_bit);
 static int emi26_load_firmware (struct usb_device *dev);
 static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *id);
 static void emi26_disconnect(struct usb_interface *intf);
-static int __init emi26_init (void);
-static void __exit emi26_exit (void);
-
 
 /* thanks to drivers/usb/serial/keyspan_pda.c code */
 static int emi26_writememory (struct usb_device *dev, int address,
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index 9f39062ebb08..4e0f167a6c4e 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -46,9 +46,6 @@ static int emi62_set_reset(struct usb_device *dev, unsigned char reset_bit);
 static int emi62_load_firmware (struct usb_device *dev);
 static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *id);
 static void emi62_disconnect(struct usb_interface *intf);
-static int __init emi62_init (void);
-static void __exit emi62_exit (void);
-
 
 /* thanks to drivers/usb/serial/keyspan_pda.c code */
 static int emi62_writememory(struct usb_device *dev, int address,
diff --git a/drivers/usb/misc/usbsevseg.c b/drivers/usb/misc/usbsevseg.c
index 107bf13b1cf1..b2d82b937392 100644
--- a/drivers/usb/misc/usbsevseg.c
+++ b/drivers/usb/misc/usbsevseg.c
@@ -24,7 +24,7 @@
 
 #define VENDOR_ID       0x0fc5
 #define PRODUCT_ID      0x1227
-#define MAXLEN          6
+#define MAXLEN          8
 
 /* table of devices that work with this driver */
 static const struct usb_device_id id_table[] = {
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index f9a3f62a83b5..7c569f51212a 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -33,9 +33,6 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <mach/hardware.h>
-#include <mach/memory.h>
-#include <asm/gpio.h>
 #include <mach/cputype.h>
 
 #include <asm/mach-types.h>
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 56cf0243979e..3d11cf64ebd1 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -981,6 +981,9 @@ static void musb_shutdown(struct platform_device *pdev)
         unsigned long   flags;
 
         pm_runtime_get_sync(musb->controller);
+
+        musb_gadget_cleanup(musb);
+
         spin_lock_irqsave(&musb->lock, flags);
         musb_platform_disable(musb);
         musb_generic_disable(musb);
@@ -1827,8 +1830,6 @@ static void musb_free(struct musb *musb)
         sysfs_remove_group(&musb->controller->kobj, &musb_attr_group);
 #endif
 
-        musb_gadget_cleanup(musb);
-
         if (musb->nIrq >= 0) {
                 if (musb->irq_wake)
                         disable_irq_wake(musb->nIrq);
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index c27bbbf32b52..df719eae3b03 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -222,7 +222,6 @@ static inline void omap2430_low_level_init(struct musb *musb)
         musb_writel(musb->mregs, OTG_FORCESTDBY, l);
 }
 
-/* blocking notifier support */
 static int musb_otg_notifications(struct notifier_block *nb,
                 unsigned long event, void *unused)
 {
@@ -231,7 +230,7 @@ static int musb_otg_notifications(struct notifier_block *nb,
         musb->xceiv_event = event;
         schedule_work(&musb->otg_notifier_work);
 
-        return 0;
+        return NOTIFY_OK;
 }
 
 static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
@@ -386,6 +385,7 @@ static void omap2430_musb_disable(struct musb *musb)
 static int omap2430_musb_exit(struct musb *musb)
 {
         del_timer_sync(&musb_idle_timer);
+        cancel_work_sync(&musb->otg_notifier_work);
 
         omap2430_low_level_exit(musb);
         otg_put_transceiver(musb->xceiv);
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 2a25955881fc..76d629345418 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -86,20 +86,6 @@ config NOP_USB_XCEIV
           built-in with usb ip or which are autonomous and doesn't require any
           phy programming such as ISP1x04 etc.
 
-config USB_LANGWELL_OTG
-        tristate "Intel Langwell USB OTG dual-role support"
-        depends on USB && PCI && INTEL_SCU_IPC
-        select USB_OTG
-        select USB_OTG_UTILS
-        help
-          Say Y here if you want to build Intel Langwell USB OTG
-          transciever driver in kernel. This driver implements role
-          switch between EHCI host driver and Langwell USB OTG
-          client driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called langwell_otg.
-
 config USB_MSM_OTG
         tristate "OTG support for Qualcomm on-chip USB controller"
         depends on (USB || USB_GADGET) && ARCH_MSM
@@ -124,7 +110,7 @@ config AB8500_USB
 
 config FSL_USB2_OTG
         bool "Freescale USB OTG Transceiver Driver"
-        depends on USB_EHCI_FSL && USB_GADGET_FSL_USB2
+        depends on USB_EHCI_FSL && USB_GADGET_FSL_USB2 && USB_SUSPEND
         select USB_OTG
         select USB_OTG_UTILS
         help
@@ -132,7 +118,7 @@ config FSL_USB2_OTG
 
 config USB_MV_OTG
         tristate "Marvell USB OTG support"
-        depends on USB_MV_UDC
+        depends on USB_MV_UDC && USB_SUSPEND
         select USB_OTG
         select USB_OTG_UTILS
         help
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
index b2c5a9598637..41aa5098b139 100644
--- a/drivers/usb/otg/Makefile
+++ b/drivers/usb/otg/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_USB_GPIO_VBUS)	+= gpio_vbus.o
 obj-$(CONFIG_ISP1301_OMAP)      += isp1301_omap.o
 obj-$(CONFIG_TWL4030_USB)       += twl4030-usb.o
 obj-$(CONFIG_TWL6030_USB)       += twl6030-usb.o
-obj-$(CONFIG_USB_LANGWELL_OTG)  += langwell_otg.o
 obj-$(CONFIG_NOP_USB_XCEIV)     += nop-usb-xceiv.o
 obj-$(CONFIG_USB_ULPI)          += ulpi.o
 obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi_viewport.o
diff --git a/drivers/usb/otg/langwell_otg.c b/drivers/usb/otg/langwell_otg.c
deleted file mode 100644
index f08f784086f7..000000000000
--- a/drivers/usb/otg/langwell_otg.c
+++ /dev/null
@@ -1,2347 +0,0 @@
-/*
- * Intel Langwell USB OTG transceiver driver
- * Copyright (C) 2008 - 2010, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-/* This driver helps to switch Langwell OTG controller function between host
- * and peripheral. It works with EHCI driver and Langwell client controller
- * driver together.
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/device.h>
-#include <linux/moduleparam.h>
-#include <linux/usb/ch9.h>
-#include <linux/usb/gadget.h>
-#include <linux/usb.h>
-#include <linux/usb/otg.h>
-#include <linux/usb/hcd.h>
-#include <linux/notifier.h>
-#include <linux/delay.h>
-#include <asm/intel_scu_ipc.h>
-
-#include <linux/usb/langwell_otg.h>
-
-#define DRIVER_DESC             "Intel Langwell USB OTG transceiver driver"
-#define DRIVER_VERSION          "July 10, 2010"
-
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_AUTHOR("Henry Yuan <hang.yuan@intel.com>, Hao Wu <hao.wu@intel.com>");
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");
-
-static const char driver_name[] = "langwell_otg";
-
-static int langwell_otg_probe(struct pci_dev *pdev,
-                        const struct pci_device_id *id);
-static void langwell_otg_remove(struct pci_dev *pdev);
-static int langwell_otg_suspend(struct pci_dev *pdev, pm_message_t message);
-static int langwell_otg_resume(struct pci_dev *pdev);
-
-static int langwell_otg_set_host(struct otg_transceiver *otg,
-                                struct usb_bus *host);
-static int langwell_otg_set_peripheral(struct otg_transceiver *otg,
-                                struct usb_gadget *gadget);
-static int langwell_otg_start_srp(struct otg_transceiver *otg);
-
-static const struct pci_device_id pci_ids[] = {{
-        .class =        ((PCI_CLASS_SERIAL_USB << 8) | 0xfe),
-        .class_mask =   ~0,
-        .vendor =       0x8086,
-        .device =       0x0811,
-        .subvendor =    PCI_ANY_ID,
-        .subdevice =    PCI_ANY_ID,
-}, { /* end: all zeroes */ }
-};
-
-static struct pci_driver otg_pci_driver = {
-        .name =         (char *) driver_name,
-        .id_table =     pci_ids,
-
-        .probe =        langwell_otg_probe,
-        .remove =       langwell_otg_remove,
-
-        .suspend =      langwell_otg_suspend,
-        .resume =       langwell_otg_resume,
-};
-
-/* HSM timers */
-static inline struct langwell_otg_timer *otg_timer_initializer
-(void (*function)(unsigned long), unsigned long expires, unsigned long data)
-{
-        struct langwell_otg_timer *timer;
-        timer = kmalloc(sizeof(struct langwell_otg_timer), GFP_KERNEL);
-        if (timer == NULL)
-                return timer;
-
-        timer->function = function;
-        timer->expires = expires;
-        timer->data = data;
-        return timer;
-}
-
-static struct langwell_otg_timer *a_wait_vrise_tmr, *a_aidl_bdis_tmr,
-        *b_se0_srp_tmr, *b_srp_init_tmr;
-
-static struct list_head active_timers;
-
-static struct langwell_otg *the_transceiver;
-
-/* host/client notify transceiver when event affects HNP state */
-void langwell_update_transceiver(void)
-{
-        struct langwell_otg *lnw = the_transceiver;
-
-        dev_dbg(lnw->dev, "transceiver is updated\n");
-
-        if (!lnw->qwork)
-                return ;
-
-        queue_work(lnw->qwork, &lnw->work);
-}
-EXPORT_SYMBOL(langwell_update_transceiver);
-
-static int langwell_otg_set_host(struct otg_transceiver *otg,
-                                        struct usb_bus *host)
-{
-        otg->host = host;
-
-        return 0;
-}
-
-static int langwell_otg_set_peripheral(struct otg_transceiver *otg,
-                                        struct usb_gadget *gadget)
-{
-        otg->gadget = gadget;
-
-        return 0;
-}
-
-static int langwell_otg_set_power(struct otg_transceiver *otg,
-                                unsigned mA)
-{
-        return 0;
-}
-
-/* A-device drives vbus, controlled through IPC commands */
-static int langwell_otg_set_vbus(struct otg_transceiver *otg, bool enabled)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        u8                              sub_id;
-
-        dev_dbg(lnw->dev, "%s <--- %s\n", __func__, enabled ? "on" : "off");
-
-        if (enabled)
-                sub_id = 0x8; /* Turn on the VBus */
-        else
-                sub_id = 0x9; /* Turn off the VBus */
-
-        if (intel_scu_ipc_simple_command(0xef, sub_id)) {
-                dev_dbg(lnw->dev, "Failed to set Vbus via IPC commands\n");
-                return -EBUSY;
-        }
-
-        dev_dbg(lnw->dev, "%s --->\n", __func__);
-
-        return 0;
-}
-
-/* charge vbus or discharge vbus through a resistor to ground */
-static void langwell_otg_chrg_vbus(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        u32     val;
-
-        val = readl(lnw->iotg.base + CI_OTGSC);
-
-        if (on)
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_VC,
-                                lnw->iotg.base + CI_OTGSC);
-        else
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_VD,
-                                lnw->iotg.base + CI_OTGSC);
-}
-
-/* Start SRP */
-static int langwell_otg_start_srp(struct otg_transceiver *otg)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s --->\n", __func__);
-
-        val = readl(iotg->base + CI_OTGSC);
-
-        writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HADP,
-                                iotg->base + CI_OTGSC);
-
-        /* Check if the data plus is finished or not */
-        msleep(8);
-        val = readl(iotg->base + CI_OTGSC);
-        if (val & (OTGSC_HADP | OTGSC_DP))
-                dev_dbg(lnw->dev, "DataLine SRP Error\n");
-
-        /* Disable interrupt - b_sess_vld */
-        val = readl(iotg->base + CI_OTGSC);
-        val &= (~(OTGSC_BSVIE | OTGSC_BSEIE));
-        writel(val, iotg->base + CI_OTGSC);
-
-        /* Start VBus SRP, drive vbus to generate VBus pulse */
-        iotg->otg.set_vbus(&iotg->otg, true);
-        msleep(15);
-        iotg->otg.set_vbus(&iotg->otg, false);
-
-        /* Enable interrupt - b_sess_vld*/
-        val = readl(iotg->base + CI_OTGSC);
-        dev_dbg(lnw->dev, "after VBUS pulse otgsc = %x\n", val);
-
-        val |= (OTGSC_BSVIE | OTGSC_BSEIE);
-        writel(val, iotg->base + CI_OTGSC);
-
-        /* If Vbus is valid, then update the hsm */
-        if (val & OTGSC_BSV) {
-                dev_dbg(lnw->dev, "no b_sess_vld interrupt\n");
-
-                lnw->iotg.hsm.b_sess_vld = 1;
-                langwell_update_transceiver();
-        }
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-        return 0;
-}
-
-/* stop SOF via bus_suspend */
-static void langwell_otg_loc_sof(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        struct usb_hcd          *hcd;
-        int                     err;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "suspend" : "resume");
-
-        hcd = bus_to_hcd(lnw->iotg.otg.host);
-        if (on)
-                err = hcd->driver->bus_resume(hcd);
-        else
-                err = hcd->driver->bus_suspend(hcd);
-
-        if (err)
-                dev_dbg(lnw->dev, "Fail to resume/suspend USB bus - %d\n", err);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-static int langwell_otg_check_otgsc(void)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        u32                             otgsc, usbcfg;
-
-        dev_dbg(lnw->dev, "check sync OTGSC and USBCFG registers\n");
-
-        otgsc = readl(lnw->iotg.base + CI_OTGSC);
-        usbcfg = readl(lnw->usbcfg);
-
-        dev_dbg(lnw->dev, "OTGSC = %08x, USBCFG = %08x\n",
-                                        otgsc, usbcfg);
-        dev_dbg(lnw->dev, "OTGSC_AVV = %d\n", !!(otgsc & OTGSC_AVV));
-        dev_dbg(lnw->dev, "USBCFG.VBUSVAL = %d\n",
-                                        !!(usbcfg & USBCFG_VBUSVAL));
-        dev_dbg(lnw->dev, "OTGSC_ASV = %d\n", !!(otgsc & OTGSC_ASV));
-        dev_dbg(lnw->dev, "USBCFG.AVALID = %d\n",
-                                        !!(usbcfg & USBCFG_AVALID));
-        dev_dbg(lnw->dev, "OTGSC_BSV = %d\n", !!(otgsc & OTGSC_BSV));
-        dev_dbg(lnw->dev, "USBCFG.BVALID = %d\n",
-                                        !!(usbcfg & USBCFG_BVALID));
-        dev_dbg(lnw->dev, "OTGSC_BSE = %d\n", !!(otgsc & OTGSC_BSE));
-        dev_dbg(lnw->dev, "USBCFG.SESEND = %d\n",
-                                        !!(usbcfg & USBCFG_SESEND));
-
-        /* Check USBCFG VBusValid/AValid/BValid/SessEnd */
-        if (!!(otgsc & OTGSC_AVV) ^ !!(usbcfg & USBCFG_VBUSVAL)) {
-                dev_dbg(lnw->dev, "OTGSC.AVV != USBCFG.VBUSVAL\n");
-                goto err;
-        }
-        if (!!(otgsc & OTGSC_ASV) ^ !!(usbcfg & USBCFG_AVALID)) {
-                dev_dbg(lnw->dev, "OTGSC.ASV != USBCFG.AVALID\n");
-                goto err;
-        }
-        if (!!(otgsc & OTGSC_BSV) ^ !!(usbcfg & USBCFG_BVALID)) {
-                dev_dbg(lnw->dev, "OTGSC.BSV != USBCFG.BVALID\n");
-                goto err;
-        }
-        if (!!(otgsc & OTGSC_BSE) ^ !!(usbcfg & USBCFG_SESEND)) {
-                dev_dbg(lnw->dev, "OTGSC.BSE != USBCFG.SESSEN\n");
-                goto err;
-        }
-
-        dev_dbg(lnw->dev, "OTGSC and USBCFG are synced\n");
-
-        return 0;
-
-err:
-        dev_warn(lnw->dev, "OTGSC isn't equal to USBCFG\n");
-        return -EPIPE;
-}
-
-
-static void langwell_otg_phy_low_power(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u8                              val, phcd;
-        int                             retval;
-
-        dev_dbg(lnw->dev, "%s ---> %s mode\n",
-                        __func__, on ? "Low power" : "Normal");
-
-        phcd = 0x40;
-
-        val = readb(iotg->base + CI_HOSTPC1 + 2);
-
-        if (on) {
-                /* Due to hardware issue, after set PHCD, sync will failed
-                 * between USBCFG and OTGSC, so before set PHCD, check if
-                 * sync is in process now. If the answer is "yes", then do
-                 * not touch PHCD bit */
-                retval = langwell_otg_check_otgsc();
-                if (retval) {
-                        dev_dbg(lnw->dev, "Skip PHCD programming..\n");
-                        return ;
-                }
-
-                writeb(val | phcd, iotg->base + CI_HOSTPC1 + 2);
-        } else
-                writeb(val & ~phcd, iotg->base + CI_HOSTPC1 + 2);
-
-        dev_dbg(lnw->dev, "%s <--- done\n", __func__);
-}
-
-/* After drv vbus, add 5 ms delay to set PHCD */
-static void langwell_otg_phy_low_power_wait(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-
-        dev_dbg(lnw->dev, "add 5ms delay before programing PHCD\n");
-
-        mdelay(5);
-        langwell_otg_phy_low_power(on);
-}
-
-/* Enable/Disable OTG interrupt */
-static void langwell_otg_intr(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off");
-
-        val = readl(iotg->base + CI_OTGSC);
-
-        /* OTGSC_INT_MASK doesn't contains 1msInt */
-        if (on) {
-                val = val | (OTGSC_INT_MASK);
-                writel(val, iotg->base + CI_OTGSC);
-        } else {
-                val = val & ~(OTGSC_INT_MASK);
-                writel(val, iotg->base + CI_OTGSC);
-        }
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-/* set HAAR: Hardware Assist Auto-Reset */
-static void langwell_otg_HAAR(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off");
-
-        val = readl(iotg->base + CI_OTGSC);
-        if (on)
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HAAR,
-                                        iotg->base + CI_OTGSC);
-        else
-                writel((val & ~OTGSC_INTSTS_MASK) & ~OTGSC_HAAR,
-                                        iotg->base + CI_OTGSC);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-/* set HABA: Hardware Assist B-Disconnect to A-Connect */
-static void langwell_otg_HABA(int on)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val;
-
-        dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off");
-
-        val = readl(iotg->base + CI_OTGSC);
-        if (on)
-                writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HABA,
-                                        iotg->base + CI_OTGSC);
-        else
-                writel((val & ~OTGSC_INTSTS_MASK) & ~OTGSC_HABA,
-                                        iotg->base + CI_OTGSC);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-}
-
-static int langwell_otg_check_se0_srp(int on)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        int                     delay_time = TB_SE0_SRP * 10;
-        u32                     val;
-
-        dev_dbg(lnw->dev, "%s --->\n", __func__);
-
-        do {
-                udelay(100);
-                if (!delay_time--)
-                        break;
-                val = readl(lnw->iotg.base + CI_PORTSC1);
-                val &= PORTSC_LS;
-        } while (!val);
-
-        dev_dbg(lnw->dev, "%s <---\n", __func__);
-        return val;
-}
-
-/* The timeout callback function to set time out bit */
-static void set_tmout(unsigned long indicator)
-{
-        *(int *)indicator = 1;
-}
-
-void langwell_otg_nsf_msg(unsigned long indicator)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-
-        switch (indicator) {
-        case 2:
-        case 4:
-        case 6:
-        case 7:
-                dev_warn(lnw->dev,
-                        "OTG:NSF-%lu - deivce not responding\n", indicator);
-                break;
-        case 3:
-                dev_warn(lnw->dev,
-                        "OTG:NSF-%lu - deivce not supported\n", indicator);
-                break;
-        default:
-                dev_warn(lnw->dev, "Do not have this kind of NSF\n");
-                break;
-        }
-}
-
-/* Initialize timers */
-static int langwell_otg_init_timers(struct otg_hsm *hsm)
-{
-        /* HSM used timers */
-        a_wait_vrise_tmr = otg_timer_initializer(&set_tmout, TA_WAIT_VRISE,
-                                (unsigned long)&hsm->a_wait_vrise_tmout);
-        if (a_wait_vrise_tmr == NULL)
-                return -ENOMEM;
-        a_aidl_bdis_tmr = otg_timer_initializer(&set_tmout, TA_AIDL_BDIS,
-                                (unsigned long)&hsm->a_aidl_bdis_tmout);
-        if (a_aidl_bdis_tmr == NULL)
-                return -ENOMEM;
-        b_se0_srp_tmr = otg_timer_initializer(&set_tmout, TB_SE0_SRP,
-                                (unsigned long)&hsm->b_se0_srp);
-        if (b_se0_srp_tmr == NULL)
-                return -ENOMEM;
-        b_srp_init_tmr = otg_timer_initializer(&set_tmout, TB_SRP_INIT,
-                                (unsigned long)&hsm->b_srp_init_tmout);
-        if (b_srp_init_tmr == NULL)
-                return -ENOMEM;
-
-        return 0;
-}
-
-/* Free timers */
-static void langwell_otg_free_timers(void)
-{
-        kfree(a_wait_vrise_tmr);
-        kfree(a_aidl_bdis_tmr);
-        kfree(b_se0_srp_tmr);
-        kfree(b_srp_init_tmr);
-}
-
-/* The timeout callback function to set time out bit */
-static void langwell_otg_timer_fn(unsigned long indicator)
-{
-        struct langwell_otg *lnw = the_transceiver;
-
-        *(int *)indicator = 1;
-
-        dev_dbg(lnw->dev, "kernel timer - timeout\n");
-
-        langwell_update_transceiver();
-}
-
-/* kernel timer used instead of HW based interrupt */
-static void langwell_otg_add_ktimer(enum langwell_otg_timer_type timers)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        unsigned long           j = jiffies;
-        unsigned long           data, time;
-
-        switch (timers) {
-        case TA_WAIT_VRISE_TMR:
-                iotg->hsm.a_wait_vrise_tmout = 0;
-                data = (unsigned long)&iotg->hsm.a_wait_vrise_tmout;
-                time = TA_WAIT_VRISE;
-                break;
-        case TA_WAIT_BCON_TMR:
-                iotg->hsm.a_wait_bcon_tmout = 0;
-                data = (unsigned long)&iotg->hsm.a_wait_bcon_tmout;
-                time = TA_WAIT_BCON;
-                break;
-        case TA_AIDL_BDIS_TMR:
-                iotg->hsm.a_aidl_bdis_tmout = 0;
-                data = (unsigned long)&iotg->hsm.a_aidl_bdis_tmout;
-                time = TA_AIDL_BDIS;
-                break;
-        case TB_ASE0_BRST_TMR:
-                iotg->hsm.b_ase0_brst_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_ase0_brst_tmout;
-                time = TB_ASE0_BRST;
-                break;
-        case TB_SRP_INIT_TMR:
-                iotg->hsm.b_srp_init_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_srp_init_tmout;
-                time = TB_SRP_INIT;
-                break;
-        case TB_SRP_FAIL_TMR:
-                iotg->hsm.b_srp_fail_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_srp_fail_tmout;
-                time = TB_SRP_FAIL;
-                break;
-        case TB_BUS_SUSPEND_TMR:
-                iotg->hsm.b_bus_suspend_tmout = 0;
-                data = (unsigned long)&iotg->hsm.b_bus_suspend_tmout;
-                time = TB_BUS_SUSPEND;
-                break;
-        default:
-                dev_dbg(lnw->dev, "unknown timer, cannot enable it\n");
-                return;
-        }
-
-        lnw->hsm_timer.data = data;
-        lnw->hsm_timer.function = langwell_otg_timer_fn;
-        lnw->hsm_timer.expires = j + time * HZ / 1000; /* milliseconds */
-
-        add_timer(&lnw->hsm_timer);
-
-        dev_dbg(lnw->dev, "add timer successfully\n");
-}
-
-/* Add timer to timer list */
-static void langwell_otg_add_timer(void *gtimer)
-{
-        struct langwell_otg_timer *timer = (struct langwell_otg_timer *)gtimer;
-        struct langwell_otg_timer *tmp_timer;
-        struct intel_mid_otg_xceiv *iotg = &the_transceiver->iotg;
-        u32     val32;
-
-        /* Check if the timer is already in the active list,
-         * if so update timer count
-         */
-        list_for_each_entry(tmp_timer, &active_timers, list)
-                if (tmp_timer == timer) {
-                        timer->count = timer->expires;
-                        return;
-                }
-        timer->count = timer->expires;
-
-        if (list_empty(&active_timers)) {
-                val32 = readl(iotg->base + CI_OTGSC);
-                writel(val32 | OTGSC_1MSE, iotg->base + CI_OTGSC);
-        }
-
-        list_add_tail(&timer->list, &active_timers);
-}
-
-/* Remove timer from the timer list; clear timeout status */
-static void langwell_otg_del_timer(void *gtimer)
-{
-        struct langwell_otg *lnw = the_transceiver;
-        struct langwell_otg_timer *timer = (struct langwell_otg_timer *)gtimer;
-        struct langwell_otg_timer *tmp_timer, *del_tmp;
-        u32 val32;
-
-        list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list)
-                if (tmp_timer == timer)
-                        list_del(&timer->list);
-
-        if (list_empty(&active_timers)) {
-                val32 = readl(lnw->iotg.base + CI_OTGSC);
-                writel(val32 & ~OTGSC_1MSE, lnw->iotg.base + CI_OTGSC);
-        }
-}
-
-/* Reduce timer count by 1, and find timeout conditions.*/
-static int langwell_otg_tick_timer(u32 *int_sts)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        struct langwell_otg_timer *tmp_timer, *del_tmp;
-        int expired = 0;
-
-        list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list) {
-                tmp_timer->count--;
-                /* check if timer expires */
-                if (!tmp_timer->count) {
-                        list_del(&tmp_timer->list);
-                        tmp_timer->function(tmp_timer->data);
-                        expired = 1;
-                }
-        }
-
-        if (list_empty(&active_timers)) {
-                dev_dbg(lnw->dev, "tick timer: disable 1ms int\n");
-                *int_sts = *int_sts & ~OTGSC_1MSE;
-        }
-        return expired;
-}
-
-static void reset_otg(void)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        int                     delay_time = 1000;
-        u32                     val;
-
-        dev_dbg(lnw->dev, "reseting OTG controller ...\n");
-        val = readl(lnw->iotg.base + CI_USBCMD);
-        writel(val | USBCMD_RST, lnw->iotg.base + CI_USBCMD);
-        do {
-                udelay(100);
-                if (!delay_time--)
-                        dev_dbg(lnw->dev, "reset timeout\n");
-                val = readl(lnw->iotg.base + CI_USBCMD);
-                val &= USBCMD_RST;
-        } while (val != 0);
-        dev_dbg(lnw->dev, "reset done.\n");
-}
-
-static void set_host_mode(void)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        u32                     val;
-
-        reset_otg();
-        val = readl(lnw->iotg.base + CI_USBMODE);
-        val = (val & (~USBMODE_CM)) | USBMODE_HOST;
-        writel(val, lnw->iotg.base + CI_USBMODE);
-}
-
-static void set_client_mode(void)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        u32                     val;
-
-        reset_otg();
-        val = readl(lnw->iotg.base + CI_USBMODE);
-        val = (val & (~USBMODE_CM)) | USBMODE_DEVICE;
-        writel(val, lnw->iotg.base + CI_USBMODE);
-}
-
-static void init_hsm(void)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val32;
-
-        /* read OTGSC after reset */
-        val32 = readl(lnw->iotg.base + CI_OTGSC);
-        dev_dbg(lnw->dev, "%s: OTGSC init value = 0x%x\n", __func__, val32);
-
-        /* set init state */
-        if (val32 & OTGSC_ID) {
-                iotg->hsm.id = 1;
-                iotg->otg.default_a = 0;
-                set_client_mode();
-                iotg->otg.state = OTG_STATE_B_IDLE;
-        } else {
-                iotg->hsm.id = 0;
-                iotg->otg.default_a = 1;
-                set_host_mode();
-                iotg->otg.state = OTG_STATE_A_IDLE;
-        }
-
-        /* set session indicator */
-        if (val32 & OTGSC_BSE)
-                iotg->hsm.b_sess_end = 1;
-        if (val32 & OTGSC_BSV)
-                iotg->hsm.b_sess_vld = 1;
-        if (val32 & OTGSC_ASV)
-                iotg->hsm.a_sess_vld = 1;
-        if (val32 & OTGSC_AVV)
-                iotg->hsm.a_vbus_vld = 1;
-
-        /* defautly power the bus */
-        iotg->hsm.a_bus_req = 1;
-        iotg->hsm.a_bus_drop = 0;
-        /* defautly don't request bus as B device */
-        iotg->hsm.b_bus_req = 0;
-        /* no system error */
-        iotg->hsm.a_clr_err = 0;
-
-        langwell_otg_phy_low_power_wait(1);
-}
-
-static void update_hsm(void)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             val32;
-
-        /* read OTGSC */
-        val32 = readl(lnw->iotg.base + CI_OTGSC);
-        dev_dbg(lnw->dev, "%s: OTGSC value = 0x%x\n", __func__, val32);
-
-        iotg->hsm.id = !!(val32 & OTGSC_ID);
-        iotg->hsm.b_sess_end = !!(val32 & OTGSC_BSE);
-        iotg->hsm.b_sess_vld = !!(val32 & OTGSC_BSV);
-        iotg->hsm.a_sess_vld = !!(val32 & OTGSC_ASV);
-        iotg->hsm.a_vbus_vld = !!(val32 & OTGSC_AVV);
-}
-
-static irqreturn_t otg_dummy_irq(int irq, void *_dev)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        void __iomem            *reg_base = _dev;
-        u32                     val;
-        u32                     int_mask = 0;
-
-        val = readl(reg_base + CI_USBMODE);
-        if ((val & USBMODE_CM) != USBMODE_DEVICE)
-                return IRQ_NONE;
-
-        val = readl(reg_base + CI_USBSTS);
-        int_mask = val & INTR_DUMMY_MASK;
-
-        if (int_mask == 0)
-                return IRQ_NONE;
-
-        /* clear hsm.b_conn here since host driver can't detect it
-        *  otg_dummy_irq called means B-disconnect happened.
-        */
-        if (lnw->iotg.hsm.b_conn) {
-                lnw->iotg.hsm.b_conn = 0;
-                if (spin_trylock(&lnw->wq_lock)) {
-                        langwell_update_transceiver();
-                        spin_unlock(&lnw->wq_lock);
-                }
-        }
-
-        /* Clear interrupts */
-        writel(int_mask, reg_base + CI_USBSTS);
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t otg_irq(int irq, void *_dev)
-{
-        struct langwell_otg             *lnw = _dev;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        u32                             int_sts, int_en;
-        u32                             int_mask = 0;
-        int                             flag = 0;
-
-        int_sts = readl(lnw->iotg.base + CI_OTGSC);
-        int_en = (int_sts & OTGSC_INTEN_MASK) >> 8;
-        int_mask = int_sts & int_en;
-        if (int_mask == 0)
-                return IRQ_NONE;
-
-        if (int_mask & OTGSC_IDIS) {
-                dev_dbg(lnw->dev, "%s: id change int\n", __func__);
-                iotg->hsm.id = (int_sts & OTGSC_ID) ? 1 : 0;
-                dev_dbg(lnw->dev, "id = %d\n", iotg->hsm.id);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_DPIS) {
-                dev_dbg(lnw->dev, "%s: data pulse int\n", __func__);
-                iotg->hsm.a_srp_det = (int_sts & OTGSC_DPS) ? 1 : 0;
-                dev_dbg(lnw->dev, "data pulse = %d\n", iotg->hsm.a_srp_det);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_BSEIS) {
-                dev_dbg(lnw->dev, "%s: b session end int\n", __func__);
-                iotg->hsm.b_sess_end = (int_sts & OTGSC_BSE) ? 1 : 0;
-                dev_dbg(lnw->dev, "b_sess_end = %d\n", iotg->hsm.b_sess_end);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_BSVIS) {
-                dev_dbg(lnw->dev, "%s: b session valid int\n", __func__);
-                iotg->hsm.b_sess_vld = (int_sts & OTGSC_BSV) ? 1 : 0;
-                dev_dbg(lnw->dev, "b_sess_vld = %d\n", iotg->hsm.b_sess_end);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_ASVIS) {
-                dev_dbg(lnw->dev, "%s: a session valid int\n", __func__);
-                iotg->hsm.a_sess_vld = (int_sts & OTGSC_ASV) ? 1 : 0;
-                dev_dbg(lnw->dev, "a_sess_vld = %d\n", iotg->hsm.a_sess_vld);
-                flag = 1;
-        }
-        if (int_mask & OTGSC_AVVIS) {
-                dev_dbg(lnw->dev, "%s: a vbus valid int\n", __func__);
-                iotg->hsm.a_vbus_vld = (int_sts & OTGSC_AVV) ? 1 : 0;
-                dev_dbg(lnw->dev, "a_vbus_vld = %d\n", iotg->hsm.a_vbus_vld);
-                flag = 1;
-        }
-
-        if (int_mask & OTGSC_1MSS) {
-                /* need to schedule otg_work if any timer is expired */
-                if (langwell_otg_tick_timer(&int_sts))
-                        flag = 1;
-        }
-
-        writel((int_sts & ~OTGSC_INTSTS_MASK) | int_mask,
-                                        lnw->iotg.base + CI_OTGSC);
-        if (flag)
-                langwell_update_transceiver();
-
-        return IRQ_HANDLED;
-}
-
-static int langwell_otg_iotg_notify(struct notifier_block *nb,
-                                unsigned long action, void *data)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = data;
-        int                             flag = 0;
-
-        if (iotg == NULL)
-                return NOTIFY_BAD;
-
-        if (lnw == NULL)
-                return NOTIFY_BAD;
-
-        switch (action) {
-        case MID_OTG_NOTIFY_CONNECT:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Connect Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.b_conn = 1;
-                else
-                        iotg->hsm.a_conn = 1;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_DISCONN:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Disconnect Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.b_conn = 0;
-                else
-                        iotg->hsm.a_conn = 0;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_HSUSPEND:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Host Bus suspend Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.a_suspend_req = 1;
-                else
-                        iotg->hsm.b_bus_req = 0;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_HRESUME:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Host Bus resume Event\n");
-                if (iotg->otg.default_a == 1)
-                        iotg->hsm.b_bus_resume = 1;
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_CSUSPEND:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Client Bus suspend Event\n");
-                if (iotg->otg.default_a == 1) {
-                        if (iotg->hsm.b_bus_suspend_vld == 2) {
-                                iotg->hsm.b_bus_suspend = 1;
-                                iotg->hsm.b_bus_suspend_vld = 0;
-                                flag = 1;
-                        } else {
-                                iotg->hsm.b_bus_suspend_vld++;
-                                flag = 0;
-                        }
-                } else {
-                        if (iotg->hsm.a_bus_suspend == 0) {
-                                iotg->hsm.a_bus_suspend = 1;
-                                flag = 1;
-                        }
-                }
-                break;
-        case MID_OTG_NOTIFY_CRESUME:
-                dev_dbg(lnw->dev, "Lnw OTG Notify Client Bus resume Event\n");
-                if (iotg->otg.default_a == 0)
-                        iotg->hsm.a_bus_suspend = 0;
-                flag = 0;
-                break;
-        case MID_OTG_NOTIFY_HOSTADD:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Host Driver Add\n");
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_HOSTREMOVE:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Host Driver remove\n");
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_CLIENTADD:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Client Driver Add\n");
-                flag = 1;
-                break;
-        case MID_OTG_NOTIFY_CLIENTREMOVE:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity Client Driver remove\n");
-                flag = 1;
-                break;
-        default:
-                dev_dbg(lnw->dev, "Lnw OTG Nofity unknown notify message\n");
-                return NOTIFY_DONE;
-        }
-
-        if (flag)
-                langwell_update_transceiver();
-
-        return NOTIFY_OK;
-}
-
-static void langwell_otg_work(struct work_struct *work)
-{
-        struct langwell_otg             *lnw;
-        struct intel_mid_otg_xceiv      *iotg;
-        int                             retval;
-        struct pci_dev                  *pdev;
-
-        lnw = container_of(work, struct langwell_otg, work);
-        iotg = &lnw->iotg;
-        pdev = to_pci_dev(lnw->dev);
-
-        dev_dbg(lnw->dev, "%s: old state = %s\n", __func__,
-                        otg_state_string(iotg->otg.state));
-
-        switch (iotg->otg.state) {
-        case OTG_STATE_UNDEFINED:
-        case OTG_STATE_B_IDLE:
-                if (!iotg->hsm.id) {
-                        langwell_otg_del_timer(b_srp_init_tmr);
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.b_sess_vld) {
-                        langwell_otg_del_timer(b_srp_init_tmr);
-                        del_timer_sync(&lnw->hsm_timer);
-                        iotg->hsm.b_sess_end = 0;
-                        iotg->hsm.a_bus_suspend = 0;
-                        langwell_otg_chrg_vbus(0);
-
-                        if (lnw->iotg.start_peripheral) {
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                                iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                        } else
-                                dev_dbg(lnw->dev, "client driver not loaded\n");
-
-                } else if (iotg->hsm.b_srp_init_tmout) {
-                        iotg->hsm.b_srp_init_tmout = 0;
-                        dev_warn(lnw->dev, "SRP init timeout\n");
-                } else if (iotg->hsm.b_srp_fail_tmout) {
-                        iotg->hsm.b_srp_fail_tmout = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        /* No silence failure */
-                        langwell_otg_nsf_msg(6);
-                } else if (iotg->hsm.b_bus_req && iotg->hsm.b_sess_end) {
-                        del_timer_sync(&lnw->hsm_timer);
-                        /* workaround for b_se0_srp detection */
-                        retval = langwell_otg_check_se0_srp(0);
-                        if (retval) {
-                                iotg->hsm.b_bus_req = 0;
-                                dev_dbg(lnw->dev, "LS isn't SE0, try later\n");
-                        } else {
-                                /* clear the PHCD before start srp */
-                                langwell_otg_phy_low_power(0);
-
-                                /* Start SRP */
-                                langwell_otg_add_timer(b_srp_init_tmr);
-                                iotg->otg.start_srp(&iotg->otg);
-                                langwell_otg_del_timer(b_srp_init_tmr);
-                                langwell_otg_add_ktimer(TB_SRP_FAIL_TMR);
-
-                                /* reset PHY low power mode here */
-                                langwell_otg_phy_low_power_wait(1);
-                        }
-                }
-                break;
-        case OTG_STATE_B_SRP_INIT:
-                if (!iotg->hsm.id) {
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_chrg_vbus(0);
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.b_sess_vld) {
-                        langwell_otg_chrg_vbus(0);
-                        if (lnw->iotg.start_peripheral) {
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                                iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                        } else
-                                dev_dbg(lnw->dev, "client driver not loaded\n");
-                }
-                break;
-        case OTG_STATE_B_PERIPHERAL:
-                if (!iotg->hsm.id) {
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.b_sess_vld) {
-                        iotg->hsm.b_hnp_enable = 0;
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if (iotg->hsm.b_bus_req && iotg->otg.gadget &&
-                                        iotg->otg.gadget->b_hnp_enable &&
-                                        iotg->hsm.a_bus_suspend) {
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        langwell_otg_HAAR(1);
-                        iotg->hsm.a_conn = 0;
-
-                        if (lnw->iotg.start_host) {
-                                lnw->iotg.start_host(&lnw->iotg);
-                                iotg->otg.state = OTG_STATE_B_WAIT_ACON;
-                        } else
-                                dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-
-                        iotg->hsm.a_bus_resume = 0;
-                        langwell_otg_add_ktimer(TB_ASE0_BRST_TMR);
-                }
-                break;
-
-        case OTG_STATE_B_WAIT_ACON:
-                if (!iotg->hsm.id) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-
-                        langwell_otg_HAAR(0);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.b_sess_vld) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->hsm.b_hnp_enable = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        langwell_otg_HAAR(0);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if (iotg->hsm.a_conn) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        langwell_otg_HAAR(0);
-                        iotg->otg.state = OTG_STATE_B_HOST;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_resume ||
-                                iotg->hsm.b_ase0_brst_tmout) {
-                        /* delete hsm timer for b_ase0_brst_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        langwell_otg_HAAR(0);
-                        langwell_otg_nsf_msg(7);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        iotg->hsm.a_bus_suspend = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.start_peripheral)
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver not loaded.\n");
-
-                        iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                }
-                break;
-
-        case OTG_STATE_B_HOST:
-                if (!iotg->hsm.id) {
-                        iotg->otg.default_a = 1;
-                        iotg->hsm.a_srp_det = 0;
-
-                        langwell_otg_chrg_vbus(0);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.b_sess_vld) {
-                        iotg->hsm.b_hnp_enable = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if ((!iotg->hsm.b_bus_req) ||
-                                (!iotg->hsm.a_conn)) {
-                        iotg->hsm.b_bus_req = 0;
-                        langwell_otg_loc_sof(0);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        iotg->hsm.a_bus_suspend = 0;
-
-                        if (lnw->iotg.start_peripheral)
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                                "client driver not loaded.\n");
-
-                        iotg->otg.state = OTG_STATE_B_PERIPHERAL;
-                }
-                break;
-
-        case OTG_STATE_A_IDLE:
-                iotg->otg.default_a = 1;
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-                        iotg->hsm.vbus_srp_up = 0;
-
-                        langwell_otg_chrg_vbus(0);
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_bus_drop &&
-                        (iotg->hsm.a_srp_det || iotg->hsm.a_bus_req)) {
-                        langwell_otg_phy_low_power(0);
-
-                        /* Turn on VBus */
-                        iotg->otg.set_vbus(&iotg->otg, true);
-
-                        iotg->hsm.vbus_srp_up = 0;
-                        iotg->hsm.a_wait_vrise_tmout = 0;
-                        langwell_otg_add_timer(a_wait_vrise_tmr);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VRISE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_bus_drop && iotg->hsm.a_sess_vld) {
-                        iotg->hsm.vbus_srp_up = 1;
-                } else if (!iotg->hsm.a_sess_vld && iotg->hsm.vbus_srp_up) {
-                        msleep(10);
-                        langwell_otg_phy_low_power(0);
-
-                        /* Turn on VBus */
-                        iotg->otg.set_vbus(&iotg->otg, true);
-                        iotg->hsm.a_srp_det = 1;
-                        iotg->hsm.vbus_srp_up = 0;
-                        iotg->hsm.a_wait_vrise_tmout = 0;
-                        langwell_otg_add_timer(a_wait_vrise_tmr);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VRISE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_sess_vld &&
-                                !iotg->hsm.vbus_srp_up) {
-                        langwell_otg_phy_low_power(1);
-                }
-                break;
-        case OTG_STATE_A_WAIT_VRISE:
-                if (iotg->hsm.id) {
-                        langwell_otg_del_timer(a_wait_vrise_tmr);
-                        iotg->hsm.b_bus_req = 0;
-                        iotg->otg.default_a = 0;
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                } else if (iotg->hsm.a_vbus_vld) {
-                        langwell_otg_del_timer(a_wait_vrise_tmr);
-                        iotg->hsm.b_conn = 0;
-                        if (lnw->iotg.start_host)
-                                lnw->iotg.start_host(&lnw->iotg);
-                        else {
-                                dev_dbg(lnw->dev, "host driver not loaded.\n");
-                                break;
-                        }
-
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                } else if (iotg->hsm.a_wait_vrise_tmout) {
-                        iotg->hsm.b_conn = 0;
-                        if (iotg->hsm.a_vbus_vld) {
-                                if (lnw->iotg.start_host)
-                                        lnw->iotg.start_host(&lnw->iotg);
-                                else {
-                                        dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-                                        break;
-                                }
-                                langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                                iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                        } else {
-
-                                /* Turn off VBus */
-                                iotg->otg.set_vbus(&iotg->otg, false);
-                                langwell_otg_phy_low_power_wait(1);
-                                iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                        }
-                }
-                break;
-        case OTG_STATE_A_WAIT_BCON:
-                if (iotg->hsm.id) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                } else if (iotg->hsm.a_bus_drop ||
-                                (iotg->hsm.a_wait_bcon_tmout &&
-                                !iotg->hsm.a_bus_req)) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (iotg->hsm.b_conn) {
-                        /* delete hsm timer for a_wait_bcon_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        iotg->hsm.a_suspend_req = 0;
-                        iotg->otg.state = OTG_STATE_A_HOST;
-                        if (iotg->hsm.a_srp_det && iotg->otg.host &&
-                                        !iotg->otg.host->b_hnp_enable) {
-                                /* SRP capable peripheral-only device */
-                                iotg->hsm.a_bus_req = 1;
-                                iotg->hsm.a_srp_det = 0;
-                        } else if (!iotg->hsm.a_bus_req && iotg->otg.host &&
-                                        iotg->otg.host->b_hnp_enable) {
-                                /* It is not safe enough to do a fast
-                                 * transition from A_WAIT_BCON to
-                                 * A_SUSPEND */
-                                msleep(10000);
-                                if (iotg->hsm.a_bus_req)
-                                        break;
-
-                                if (request_irq(pdev->irq,
-                                        otg_dummy_irq, IRQF_SHARED,
-                                        driver_name, iotg->base) != 0) {
-                                        dev_dbg(lnw->dev,
-                                                "request interrupt %d fail\n",
-                                                pdev->irq);
-                                }
-
-                                langwell_otg_HABA(1);
-                                iotg->hsm.b_bus_resume = 0;
-                                iotg->hsm.a_aidl_bdis_tmout = 0;
-
-                                langwell_otg_loc_sof(0);
-                                /* clear PHCD to enable HW timer */
-                                langwell_otg_phy_low_power(0);
-                                langwell_otg_add_timer(a_aidl_bdis_tmr);
-                                iotg->otg.state = OTG_STATE_A_SUSPEND;
-                        } else if (!iotg->hsm.a_bus_req && iotg->otg.host &&
-                                !iotg->otg.host->b_hnp_enable) {
-                                if (lnw->iotg.stop_host)
-                                        lnw->iotg.stop_host(&lnw->iotg);
-                                else
-                                        dev_dbg(lnw->dev,
-                                                "host driver removed.\n");
-
-                                /* Turn off VBus */
-                                iotg->otg.set_vbus(&iotg->otg, false);
-                                iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                        }
-                }
-                break;
-        case OTG_STATE_A_HOST:
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_drop ||
-                                (iotg->otg.host &&
-                                !iotg->otg.host->b_hnp_enable &&
-                                        !iotg->hsm.a_bus_req)) {
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                } else if (iotg->otg.host &&
-                                iotg->otg.host->b_hnp_enable &&
-                                !iotg->hsm.a_bus_req) {
-                        /* Set HABA to enable hardware assistance to signal
-                         *  A-connect after receiver B-disconnect. Hardware
-                         *  will then set client mode and enable URE, SLE and
-                         *  PCE after the assistance. otg_dummy_irq is used to
-                         *  clean these ints when client driver is not resumed.
-                         */
-                        if (request_irq(pdev->irq, otg_dummy_irq, IRQF_SHARED,
-                                        driver_name, iotg->base) != 0) {
-                                dev_dbg(lnw->dev,
-                                        "request interrupt %d failed\n",
-                                                pdev->irq);
-                        }
-
-                        /* set HABA */
-                        langwell_otg_HABA(1);
-                        iotg->hsm.b_bus_resume = 0;
-                        iotg->hsm.a_aidl_bdis_tmout = 0;
-                        langwell_otg_loc_sof(0);
-                        /* clear PHCD to enable HW timer */
-                        langwell_otg_phy_low_power(0);
-                        langwell_otg_add_timer(a_aidl_bdis_tmr);
-                        iotg->otg.state = OTG_STATE_A_SUSPEND;
-                } else if (!iotg->hsm.b_conn || !iotg->hsm.a_bus_req) {
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                }
-                break;
-        case OTG_STATE_A_SUSPEND:
-                if (iotg->hsm.id) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_req ||
-                                iotg->hsm.b_bus_resume) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        iotg->hsm.a_suspend_req = 0;
-                        langwell_otg_loc_sof(1);
-                        iotg->otg.state = OTG_STATE_A_HOST;
-                } else if (iotg->hsm.a_aidl_bdis_tmout ||
-                                iotg->hsm.a_bus_drop) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (!iotg->hsm.b_conn && iotg->otg.host &&
-                                iotg->otg.host->b_hnp_enable) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        iotg->hsm.b_bus_suspend = 0;
-                        iotg->hsm.b_bus_suspend_vld = 0;
-
-                        /* msleep(200); */
-                        if (lnw->iotg.start_peripheral)
-                                lnw->iotg.start_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver not loaded.\n");
-
-                        langwell_otg_add_ktimer(TB_BUS_SUSPEND_TMR);
-                        iotg->otg.state = OTG_STATE_A_PERIPHERAL;
-                        break;
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        langwell_otg_del_timer(a_aidl_bdis_tmr);
-                        langwell_otg_HABA(0);
-                        free_irq(pdev->irq, iotg->base);
-                        if (lnw->iotg.stop_host)
-                                lnw->iotg.stop_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "host driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                }
-                break;
-        case OTG_STATE_A_PERIPHERAL:
-                if (iotg->hsm.id) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.b_bus_req = 0;
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        set_client_mode();
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (!iotg->hsm.a_vbus_vld) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        langwell_otg_phy_low_power_wait(1);
-                        iotg->otg.state = OTG_STATE_A_VBUS_ERR;
-                } else if (iotg->hsm.a_bus_drop) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        /* Turn off VBus */
-                        iotg->otg.set_vbus(&iotg->otg, false);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VFALL;
-                } else if (iotg->hsm.b_bus_suspend) {
-                        /* delete hsm timer for b_bus_suspend_tmr */
-                        del_timer_sync(&lnw->hsm_timer);
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        if (lnw->iotg.start_host)
-                                lnw->iotg.start_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                } else if (iotg->hsm.b_bus_suspend_tmout) {
-                        u32     val;
-                        val = readl(lnw->iotg.base + CI_PORTSC1);
-                        if (!(val & PORTSC_SUSP))
-                                break;
-
-                        if (lnw->iotg.stop_peripheral)
-                                lnw->iotg.stop_peripheral(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                        "client driver has been removed.\n");
-
-                        if (lnw->iotg.start_host)
-                                lnw->iotg.start_host(&lnw->iotg);
-                        else
-                                dev_dbg(lnw->dev,
-                                                "host driver not loaded.\n");
-                        langwell_otg_add_ktimer(TA_WAIT_BCON_TMR);
-                        iotg->otg.state = OTG_STATE_A_WAIT_BCON;
-                }
-                break;
-        case OTG_STATE_A_VBUS_ERR:
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        iotg->hsm.a_clr_err = 0;
-                        iotg->hsm.a_srp_det = 0;
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_clr_err) {
-                        iotg->hsm.a_clr_err = 0;
-                        iotg->hsm.a_srp_det = 0;
-                        reset_otg();
-                        init_hsm();
-                        if (iotg->otg.state == OTG_STATE_A_IDLE)
-                                langwell_update_transceiver();
-                } else {
-                        /* FW will clear PHCD bit when any VBus
-                         * event detected. Reset PHCD to 1 again */
-                        langwell_otg_phy_low_power(1);
-                }
-                break;
-        case OTG_STATE_A_WAIT_VFALL:
-                if (iotg->hsm.id) {
-                        iotg->otg.default_a = 0;
-                        set_client_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_B_IDLE;
-                        langwell_update_transceiver();
-                } else if (iotg->hsm.a_bus_req) {
-
-                        /* Turn on VBus */
-                        iotg->otg.set_vbus(&iotg->otg, true);
-                        iotg->hsm.a_wait_vrise_tmout = 0;
-                        langwell_otg_add_timer(a_wait_vrise_tmr);
-                        iotg->otg.state = OTG_STATE_A_WAIT_VRISE;
-                } else if (!iotg->hsm.a_sess_vld) {
-                        iotg->hsm.a_srp_det = 0;
-                        set_host_mode();
-                        langwell_otg_phy_low_power(1);
-                        iotg->otg.state = OTG_STATE_A_IDLE;
-                }
-                break;
-        default:
-                ;
-        }
-
-        dev_dbg(lnw->dev, "%s: new state = %s\n", __func__,
-                        otg_state_string(iotg->otg.state));
-}
-
-static ssize_t
-show_registers(struct device *_dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size,
-                "\n"
-                "USBCMD = 0x%08x\n"
-                "USBSTS = 0x%08x\n"
-                "USBINTR = 0x%08x\n"
-                "ASYNCLISTADDR = 0x%08x\n"
-                "PORTSC1 = 0x%08x\n"
-                "HOSTPC1 = 0x%08x\n"
-                "OTGSC = 0x%08x\n"
-                "USBMODE = 0x%08x\n",
-                readl(lnw->iotg.base + 0x30),
-                readl(lnw->iotg.base + 0x34),
-                readl(lnw->iotg.base + 0x38),
-                readl(lnw->iotg.base + 0x48),
-                readl(lnw->iotg.base + 0x74),
-                readl(lnw->iotg.base + 0xb4),
-                readl(lnw->iotg.base + 0xf4),
-                readl(lnw->iotg.base + 0xf8)
-             );
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-static DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL);
-
-static ssize_t
-show_hsm(struct device *_dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        char                            *next;
-        unsigned                        size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        if (iotg->otg.host)
-                iotg->hsm.a_set_b_hnp_en = iotg->otg.host->b_hnp_enable;
-
-        if (iotg->otg.gadget)
-                iotg->hsm.b_hnp_enable = iotg->otg.gadget->b_hnp_enable;
-
-        t = scnprintf(next, size,
-                "\n"
-                "current state = %s\n"
-                "a_bus_resume = \t%d\n"
-                "a_bus_suspend = \t%d\n"
-                "a_conn = \t%d\n"
-                "a_sess_vld = \t%d\n"
-                "a_srp_det = \t%d\n"
-                "a_vbus_vld = \t%d\n"
-                "b_bus_resume = \t%d\n"
-                "b_bus_suspend = \t%d\n"
-                "b_conn = \t%d\n"
-                "b_se0_srp = \t%d\n"
-                "b_sess_end = \t%d\n"
-                "b_sess_vld = \t%d\n"
-                "id = \t%d\n"
-                "a_set_b_hnp_en = \t%d\n"
-                "b_srp_done = \t%d\n"
-                "b_hnp_enable = \t%d\n"
-                "a_wait_vrise_tmout = \t%d\n"
-                "a_wait_bcon_tmout = \t%d\n"
-                "a_aidl_bdis_tmout = \t%d\n"
-                "b_ase0_brst_tmout = \t%d\n"
-                "a_bus_drop = \t%d\n"
-                "a_bus_req = \t%d\n"
-                "a_clr_err = \t%d\n"
-                "a_suspend_req = \t%d\n"
-                "b_bus_req = \t%d\n"
-                "b_bus_suspend_tmout = \t%d\n"
-                "b_bus_suspend_vld = \t%d\n",
-                otg_state_string(iotg->otg.state),
-                iotg->hsm.a_bus_resume,
-                iotg->hsm.a_bus_suspend,
-                iotg->hsm.a_conn,
-                iotg->hsm.a_sess_vld,
-                iotg->hsm.a_srp_det,
-                iotg->hsm.a_vbus_vld,
-                iotg->hsm.b_bus_resume,
-                iotg->hsm.b_bus_suspend,
-                iotg->hsm.b_conn,
-                iotg->hsm.b_se0_srp,
-                iotg->hsm.b_sess_end,
-                iotg->hsm.b_sess_vld,
-                iotg->hsm.id,
-                iotg->hsm.a_set_b_hnp_en,
-                iotg->hsm.b_srp_done,
-                iotg->hsm.b_hnp_enable,
-                iotg->hsm.a_wait_vrise_tmout,
-                iotg->hsm.a_wait_bcon_tmout,
-                iotg->hsm.a_aidl_bdis_tmout,
-                iotg->hsm.b_ase0_brst_tmout,
-                iotg->hsm.a_bus_drop,
-                iotg->hsm.a_bus_req,
-                iotg->hsm.a_clr_err,
-                iotg->hsm.a_suspend_req,
-                iotg->hsm.b_bus_req,
-                iotg->hsm.b_bus_suspend_tmout,
-                iotg->hsm.b_bus_suspend_vld
-                );
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-static DEVICE_ATTR(hsm, S_IRUGO, show_hsm, NULL);
-
-static ssize_t
-get_a_bus_req(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size, "%d", lnw->iotg.hsm.a_bus_req);
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-
-static ssize_t
-set_a_bus_req(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (!iotg->otg.default_a)
-                return -1;
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '0') {
-                iotg->hsm.a_bus_req = 0;
-                dev_dbg(lnw->dev, "User request: a_bus_req = 0\n");
-        } else if (buf[0] == '1') {
-                /* If a_bus_drop is TRUE, a_bus_req can't be set */
-                if (iotg->hsm.a_bus_drop)
-                        return -1;
-                iotg->hsm.a_bus_req = 1;
-                dev_dbg(lnw->dev, "User request: a_bus_req = 1\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(a_bus_req, S_IRUGO | S_IWUSR, get_a_bus_req, set_a_bus_req);
-
-static ssize_t
-get_a_bus_drop(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size, "%d", lnw->iotg.hsm.a_bus_drop);
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-
-static ssize_t
-set_a_bus_drop(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (!iotg->otg.default_a)
-                return -1;
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '0') {
-                iotg->hsm.a_bus_drop = 0;
-                dev_dbg(lnw->dev, "User request: a_bus_drop = 0\n");
-        } else if (buf[0] == '1') {
-                iotg->hsm.a_bus_drop = 1;
-                iotg->hsm.a_bus_req = 0;
-                dev_dbg(lnw->dev, "User request: a_bus_drop = 1\n");
-                dev_dbg(lnw->dev, "User request: and a_bus_req = 0\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(a_bus_drop, S_IRUGO | S_IWUSR, get_a_bus_drop, set_a_bus_drop);
-
-static ssize_t
-get_b_bus_req(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        char                    *next;
-        unsigned                size, t;
-
-        next = buf;
-        size = PAGE_SIZE;
-
-        t = scnprintf(next, size, "%d", lnw->iotg.hsm.b_bus_req);
-        size -= t;
-        next += t;
-
-        return PAGE_SIZE - size;
-}
-
-static ssize_t
-set_b_bus_req(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (iotg->otg.default_a)
-                return -1;
-
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '0') {
-                iotg->hsm.b_bus_req = 0;
-                dev_dbg(lnw->dev, "User request: b_bus_req = 0\n");
-        } else if (buf[0] == '1') {
-                iotg->hsm.b_bus_req = 1;
-                dev_dbg(lnw->dev, "User request: b_bus_req = 1\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(b_bus_req, S_IRUGO | S_IWUSR, get_b_bus_req, set_b_bus_req);
-
-static ssize_t
-set_a_clr_err(struct device *dev, struct device_attribute *attr,
-                const char *buf, size_t count)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-
-        if (!iotg->otg.default_a)
-                return -1;
-        if (count > 2)
-                return -1;
-
-        if (buf[0] == '1') {
-                iotg->hsm.a_clr_err = 1;
-                dev_dbg(lnw->dev, "User request: a_clr_err = 1\n");
-        }
-        if (spin_trylock(&lnw->wq_lock)) {
-                langwell_update_transceiver();
-                spin_unlock(&lnw->wq_lock);
-        }
-        return count;
-}
-static DEVICE_ATTR(a_clr_err, S_IWUSR, NULL, set_a_clr_err);
-
-static struct attribute *inputs_attrs[] = {
-        &dev_attr_a_bus_req.attr,
-        &dev_attr_a_bus_drop.attr,
-        &dev_attr_b_bus_req.attr,
-        &dev_attr_a_clr_err.attr,
-        NULL,
-};
-
-static struct attribute_group debug_dev_attr_group = {
-        .name = "inputs",
-        .attrs = inputs_attrs,
-};
-
-static int langwell_otg_probe(struct pci_dev *pdev,
-                const struct pci_device_id *id)
-{
-        unsigned long           resource, len;
-        void __iomem            *base = NULL;
-        int                     retval;
-        u32                     val32;
-        struct langwell_otg     *lnw;
-        char                    qname[] = "langwell_otg_queue";
-
-        retval = 0;
-        dev_dbg(&pdev->dev, "\notg controller is detected.\n");
-        if (pci_enable_device(pdev) < 0) {
-                retval = -ENODEV;
-                goto done;
-        }
-
-        lnw = kzalloc(sizeof *lnw, GFP_KERNEL);
-        if (lnw == NULL) {
-                retval = -ENOMEM;
-                goto done;
-        }
-        the_transceiver = lnw;
-
-        /* control register: BAR 0 */
-        resource = pci_resource_start(pdev, 0);
-        len = pci_resource_len(pdev, 0);
-        if (!request_mem_region(resource, len, driver_name)) {
-                retval = -EBUSY;
-                goto err;
-        }
-        lnw->region = 1;
-
-        base = ioremap_nocache(resource, len);
-        if (base == NULL) {
-                retval = -EFAULT;
-                goto err;
-        }
-        lnw->iotg.base = base;
-
-        if (!request_mem_region(USBCFG_ADDR, USBCFG_LEN, driver_name)) {
-                retval = -EBUSY;
-                goto err;
-        }
-        lnw->cfg_region = 1;
-
-        /* For the SCCB.USBCFG register */
-        base = ioremap_nocache(USBCFG_ADDR, USBCFG_LEN);
-        if (base == NULL) {
-                retval = -EFAULT;
-                goto err;
-        }
-        lnw->usbcfg = base;
-
-        if (!pdev->irq) {
-                dev_dbg(&pdev->dev, "No IRQ.\n");
-                retval = -ENODEV;
-                goto err;
-        }
-
-        lnw->qwork = create_singlethread_workqueue(qname);
-        if (!lnw->qwork) {
-                dev_dbg(&pdev->dev, "cannot create workqueue %s\n", qname);
-                retval = -ENOMEM;
-                goto err;
-        }
-        INIT_WORK(&lnw->work, langwell_otg_work);
-
-        /* OTG common part */
-        lnw->dev = &pdev->dev;
-        lnw->iotg.otg.dev = lnw->dev;
-        lnw->iotg.otg.label = driver_name;
-        lnw->iotg.otg.set_host = langwell_otg_set_host;
-        lnw->iotg.otg.set_peripheral = langwell_otg_set_peripheral;
-        lnw->iotg.otg.set_power = langwell_otg_set_power;
-        lnw->iotg.otg.set_vbus = langwell_otg_set_vbus;
-        lnw->iotg.otg.start_srp = langwell_otg_start_srp;
-        lnw->iotg.otg.state = OTG_STATE_UNDEFINED;
-
-        if (otg_set_transceiver(&lnw->iotg.otg)) {
-                dev_dbg(lnw->dev, "can't set transceiver\n");
-                retval = -EBUSY;
-                goto err;
-        }
-
-        reset_otg();
-        init_hsm();
-
-        spin_lock_init(&lnw->lock);
-        spin_lock_init(&lnw->wq_lock);
-        INIT_LIST_HEAD(&active_timers);
-        retval = langwell_otg_init_timers(&lnw->iotg.hsm);
-        if (retval) {
-                dev_dbg(&pdev->dev, "Failed to init timers\n");
-                goto err;
-        }
-
-        init_timer(&lnw->hsm_timer);
-        ATOMIC_INIT_NOTIFIER_HEAD(&lnw->iotg.iotg_notifier);
-
-        lnw->iotg_notifier.notifier_call = langwell_otg_iotg_notify;
-
-        retval = intel_mid_otg_register_notifier(&lnw->iotg,
-                                                &lnw->iotg_notifier);
-        if (retval) {
-                dev_dbg(lnw->dev, "Failed to register notifier\n");
-                goto err;
-        }
-
-        if (request_irq(pdev->irq, otg_irq, IRQF_SHARED,
-                                driver_name, lnw) != 0) {
-                dev_dbg(lnw->dev, "request interrupt %d failed\n", pdev->irq);
-                retval = -EBUSY;
-                goto err;
-        }
-
-        /* enable OTGSC int */
-        val32 = OTGSC_DPIE | OTGSC_BSEIE | OTGSC_BSVIE |
-                OTGSC_ASVIE | OTGSC_AVVIE | OTGSC_IDIE | OTGSC_IDPU;
-        writel(val32, lnw->iotg.base + CI_OTGSC);
-
-        retval = device_create_file(&pdev->dev, &dev_attr_registers);
-        if (retval < 0) {
-                dev_dbg(lnw->dev,
-                        "Can't register sysfs attribute: %d\n", retval);
-                goto err;
-        }
-
-        retval = device_create_file(&pdev->dev, &dev_attr_hsm);
-        if (retval < 0) {
-                dev_dbg(lnw->dev, "Can't hsm sysfs attribute: %d\n", retval);
-                goto err;
-        }
-
-        retval = sysfs_create_group(&pdev->dev.kobj, &debug_dev_attr_group);
-        if (retval < 0) {
-                dev_dbg(lnw->dev,
-                        "Can't register sysfs attr group: %d\n", retval);
-                goto err;
-        }
-
-        if (lnw->iotg.otg.state == OTG_STATE_A_IDLE)
-                langwell_update_transceiver();
-
-        return 0;
-
-err:
-        if (the_transceiver)
-                langwell_otg_remove(pdev);
-done:
-        return retval;
-}
-
-static void langwell_otg_remove(struct pci_dev *pdev)
-{
-        struct langwell_otg *lnw = the_transceiver;
-
-        if (lnw->qwork) {
-                flush_workqueue(lnw->qwork);
-                destroy_workqueue(lnw->qwork);
-        }
-        intel_mid_otg_unregister_notifier(&lnw->iotg, &lnw->iotg_notifier);
-        langwell_otg_free_timers();
-
-        /* disable OTGSC interrupt as OTGSC doesn't change in reset */
-        writel(0, lnw->iotg.base + CI_OTGSC);
-
-        if (pdev->irq)
-                free_irq(pdev->irq, lnw);
-        if (lnw->usbcfg)
-                iounmap(lnw->usbcfg);
-        if (lnw->cfg_region)
-                release_mem_region(USBCFG_ADDR, USBCFG_LEN);
-        if (lnw->iotg.base)
-                iounmap(lnw->iotg.base);
-        if (lnw->region)
-                release_mem_region(pci_resource_start(pdev, 0),
-                                pci_resource_len(pdev, 0));
-
-        otg_set_transceiver(NULL);
-        pci_disable_device(pdev);
-        sysfs_remove_group(&pdev->dev.kobj, &debug_dev_attr_group);
-        device_remove_file(&pdev->dev, &dev_attr_hsm);
-        device_remove_file(&pdev->dev, &dev_attr_registers);
-        kfree(lnw);
-        lnw = NULL;
-}
-
-static void transceiver_suspend(struct pci_dev *pdev)
-{
-        pci_save_state(pdev);
-        pci_set_power_state(pdev, PCI_D3hot);
-        langwell_otg_phy_low_power(1);
-}
-
-static int langwell_otg_suspend(struct pci_dev *pdev, pm_message_t message)
-{
-        struct langwell_otg             *lnw = the_transceiver;
-        struct intel_mid_otg_xceiv      *iotg = &lnw->iotg;
-        int                             ret = 0;
-
-        /* Disbale OTG interrupts */
-        langwell_otg_intr(0);
-
-        if (pdev->irq)
-                free_irq(pdev->irq, lnw);
-
-        /* Prevent more otg_work */
-        flush_workqueue(lnw->qwork);
-        destroy_workqueue(lnw->qwork);
-        lnw->qwork = NULL;
-
-        /* start actions */
-        switch (iotg->otg.state) {
-        case OTG_STATE_A_WAIT_VFALL:
-                iotg->otg.state = OTG_STATE_A_IDLE;
-        case OTG_STATE_A_IDLE:
-        case OTG_STATE_B_IDLE:
-        case OTG_STATE_A_VBUS_ERR:
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_WAIT_VRISE:
-                langwell_otg_del_timer(a_wait_vrise_tmr);
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_WAIT_BCON:
-                del_timer_sync(&lnw->hsm_timer);
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_HOST:
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_SUSPEND:
-                langwell_otg_del_timer(a_aidl_bdis_tmr);
-                langwell_otg_HABA(0);
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(lnw->dev, "host driver has been removed.\n");
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_A_PERIPHERAL:
-                del_timer_sync(&lnw->hsm_timer);
-
-                if (lnw->iotg.stop_peripheral)
-                        lnw->iotg.stop_peripheral(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev,
-                                "client driver has been removed.\n");
-                iotg->hsm.a_srp_det = 0;
-
-                /* Turn off VBus */
-                iotg->otg.set_vbus(&iotg->otg, false);
-                iotg->otg.state = OTG_STATE_A_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_B_HOST:
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-                iotg->hsm.b_bus_req = 0;
-                iotg->otg.state = OTG_STATE_B_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_B_PERIPHERAL:
-                if (lnw->iotg.stop_peripheral)
-                        lnw->iotg.stop_peripheral(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev,
-                                "client driver has been removed.\n");
-                iotg->otg.state = OTG_STATE_B_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        case OTG_STATE_B_WAIT_ACON:
-                /* delete hsm timer for b_ase0_brst_tmr */
-                del_timer_sync(&lnw->hsm_timer);
-
-                langwell_otg_HAAR(0);
-
-                if (lnw->iotg.stop_host)
-                        lnw->iotg.stop_host(&lnw->iotg);
-                else
-                        dev_dbg(&pdev->dev, "host driver has been removed.\n");
-                iotg->hsm.b_bus_req = 0;
-                iotg->otg.state = OTG_STATE_B_IDLE;
-                transceiver_suspend(pdev);
-                break;
-        default:
-                dev_dbg(lnw->dev, "error state before suspend\n");
-                break;
-        }
-
-        return ret;
-}
-
-static void transceiver_resume(struct pci_dev *pdev)
-{
-        pci_restore_state(pdev);
-        pci_set_power_state(pdev, PCI_D0);
-}
-
-static int langwell_otg_resume(struct pci_dev *pdev)
-{
-        struct langwell_otg     *lnw = the_transceiver;
-        int                     ret = 0;
-
-        transceiver_resume(pdev);
-
-        lnw->qwork = create_singlethread_workqueue("langwell_otg_queue");
-        if (!lnw->qwork) {
-                dev_dbg(&pdev->dev, "cannot create langwell otg workqueuen");
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        if (request_irq(pdev->irq, otg_irq, IRQF_SHARED,
-                                driver_name, lnw) != 0) {
-                dev_dbg(&pdev->dev, "request interrupt %d failed\n", pdev->irq);
-                ret = -EBUSY;
-                goto error;
-        }
-
-        /* enable OTG interrupts */
-        langwell_otg_intr(1);
-
-        update_hsm();
-
-        langwell_update_transceiver();
-
-        return ret;
-error:
-        langwell_otg_intr(0);
-        transceiver_suspend(pdev);
-        return ret;
-}
-
-static int __init langwell_otg_init(void)
-{
-        return pci_register_driver(&otg_pci_driver);
-}
-module_init(langwell_otg_init);
-
-static void __exit langwell_otg_cleanup(void)
-{
-        pci_unregister_driver(&otg_pci_driver);
-}
-module_exit(langwell_otg_cleanup);
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c
index db0d4fcdc8e2..b5fbe1452ab0 100644
--- a/drivers/usb/otg/mv_otg.c
+++ b/drivers/usb/otg/mv_otg.c
@@ -202,6 +202,7 @@ static void mv_otg_init_irq(struct mv_otg *mvotg)
 
 static void mv_otg_start_host(struct mv_otg *mvotg, int on)
 {
+#ifdef CONFIG_USB
         struct otg_transceiver *otg = &mvotg->otg;
         struct usb_hcd *hcd;
 
@@ -216,6 +217,7 @@ static void mv_otg_start_host(struct mv_otg *mvotg, int on)
                 usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
         else
                 usb_remove_hcd(hcd);
+#endif /* CONFIG_USB */
 }
 
 static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on)
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 528691d5f3e2..7542aa94a462 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -425,7 +425,7 @@ static int usbhsg_recip_run_handle(struct usbhs_priv *priv,
         struct usbhs_pipe *pipe;
         int recip = ctrl->bRequestType & USB_RECIP_MASK;
         int nth = le16_to_cpu(ctrl->wIndex) & USB_ENDPOINT_NUMBER_MASK;
-        int ret;
+        int ret = 0;
         int (*func)(struct usbhs_priv *priv, struct usbhsg_uep *uep,
                     struct usb_ctrlrequest *ctrl);
         char *msg;
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index fba1147ed916..8dbf51a43c45 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -39,6 +39,8 @@ static void cp210x_get_termios(struct tty_struct *,
         struct usb_serial_port *port);
 static void cp210x_get_termios_port(struct usb_serial_port *port,
         unsigned int *cflagp, unsigned int *baudp);
+static void cp210x_change_speed(struct tty_struct *, struct usb_serial_port *,
+                                                        struct ktermios *);
 static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *,
                                                         struct ktermios*);
 static int cp210x_tiocmget(struct tty_struct *);
@@ -138,6 +140,7 @@ 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(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
         { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
         { } /* Terminating Entry */
 };
@@ -201,6 +204,8 @@ static struct usb_serial_driver cp210x_device = {
 #define CP210X_EMBED_EVENTS     0x15
 #define CP210X_GET_EVENTSTATE   0x16
 #define CP210X_SET_CHARS        0x19
+#define CP210X_GET_BAUDRATE     0x1D
+#define CP210X_SET_BAUDRATE     0x1E
 
 /* CP210X_IFC_ENABLE */
 #define UART_ENABLE             0x0001
@@ -360,8 +365,8 @@ static inline int cp210x_set_config_single(struct usb_serial_port *port,
  * Quantises the baud rate as per AN205 Table 1
  */
 static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
-        if      (baud <= 56)       baud = 0;
-        else if (baud <= 300)      baud = 300;
+        if (baud <= 300)
+                baud = 300;
         else if (baud <= 600)      baud = 600;
         else if (baud <= 1200)     baud = 1200;
         else if (baud <= 1800)     baud = 1800;
@@ -389,10 +394,10 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
         else if (baud <= 491520)   baud = 460800;
         else if (baud <= 567138)   baud = 500000;
         else if (baud <= 670254)   baud = 576000;
-        else if (baud <= 1053257)  baud = 921600;
-        else if (baud <= 1474560)  baud = 1228800;
-        else if (baud <= 2457600)  baud = 1843200;
-        else                       baud = 3686400;
+        else if (baud < 1000000)
+                baud = 921600;
+        else if (baud > 2000000)
+                baud = 2000000;
         return baud;
 }
 
@@ -409,13 +414,14 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
                 return result;
         }
 
-        result = usb_serial_generic_open(tty, port);
-        if (result)
-                return result;
-
         /* Configure the termios structure */
         cp210x_get_termios(tty, port);
-        return 0;
+
+        /* The baud rate must be initialised on cp2104 */
+        if (tty)
+                cp210x_change_speed(tty, port, NULL);
+
+        return usb_serial_generic_open(tty, port);
 }
 
 static void cp210x_close(struct usb_serial_port *port)
@@ -467,10 +473,7 @@ static void cp210x_get_termios_port(struct usb_serial_port *port,
 
         dbg("%s - port %d", __func__, port->number);
 
-        cp210x_get_config(port, CP210X_GET_BAUDDIV, &baud, 2);
-        /* Convert to baudrate */
-        if (baud)
-                baud = cp210x_quantise_baudrate((BAUD_RATE_GEN_FREQ + baud/2)/ baud);
+        cp210x_get_config(port, CP210X_GET_BAUDRATE, &baud, 4);
 
         dbg("%s - baud rate = %d", __func__, baud);
         *baudp = baud;
@@ -579,11 +582,64 @@ static void cp210x_get_termios_port(struct usb_serial_port *port,
         *cflagp = cflag;
 }
 
+/*
+ * CP2101 supports the following baud rates:
+ *
+ *      300, 600, 1200, 1800, 2400, 4800, 7200, 9600, 14400, 19200, 28800,
+ *      38400, 56000, 57600, 115200, 128000, 230400, 460800, 921600
+ *
+ * CP2102 and CP2103 support the following additional rates:
+ *
+ *      4000, 16000, 51200, 64000, 76800, 153600, 250000, 256000, 500000,
+ *      576000
+ *
+ * The device will map a requested rate to a supported one, but the result
+ * of requests for rates greater than 1053257 is undefined (see AN205).
+ *
+ * CP2104, CP2105 and CP2110 support most rates up to 2M, 921k and 1M baud,
+ * respectively, with an error less than 1%. The actual rates are determined
+ * by
+ *
+ *      div = round(freq / (2 x prescale x request))
+ *      actual = freq / (2 x prescale x div)
+ *
+ * For CP2104 and CP2105 freq is 48Mhz and prescale is 4 for request <= 365bps
+ * or 1 otherwise.
+ * For CP2110 freq is 24Mhz and prescale is 4 for request <= 300bps or 1
+ * otherwise.
+ */
+static void cp210x_change_speed(struct tty_struct *tty,
+                struct usb_serial_port *port, struct ktermios *old_termios)
+{
+        u32 baud;
+
+        baud = tty->termios->c_ospeed;
+
+        /* This maps the requested rate to a rate valid on cp2102 or cp2103,
+         * or to an arbitrary rate in [1M,2M].
+         *
+         * NOTE: B0 is not implemented.
+         */
+        baud = cp210x_quantise_baudrate(baud);
+
+        dbg("%s - setting baud rate to %u", __func__, baud);
+        if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud,
+                                                        sizeof(baud))) {
+                dev_warn(&port->dev, "failed to set baud rate to %u\n", baud);
+                if (old_termios)
+                        baud = old_termios->c_ospeed;
+                else
+                        baud = 9600;
+        }
+
+        tty_encode_baud_rate(tty, baud, baud);
+}
+
 static void cp210x_set_termios(struct tty_struct *tty,
                 struct usb_serial_port *port, struct ktermios *old_termios)
 {
         unsigned int cflag, old_cflag;
-        unsigned int baud = 0, bits;
+        unsigned int bits;
         unsigned int modem_ctl[4];
 
         dbg("%s - port %d", __func__, port->number);
@@ -593,20 +649,9 @@ static void cp210x_set_termios(struct tty_struct *tty,
 
         cflag = tty->termios->c_cflag;
         old_cflag = old_termios->c_cflag;
-        baud = cp210x_quantise_baudrate(tty_get_baud_rate(tty));
-
-        /* If the baud rate is to be updated*/
-        if (baud != tty_termios_baud_rate(old_termios) && baud != 0) {
-                dbg("%s - Setting baud rate to %d baud", __func__,
-                                baud);
-                if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV,
-                                        ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) {
-                        dbg("Baud rate requested not supported by device");
-                        baud = tty_termios_baud_rate(old_termios);
-                }
-        }
-        /* Report back the resulting baud rate */
-        tty_encode_baud_rate(tty, baud, baud);
+
+        if (tty->termios->c_ospeed != old_termios->c_ospeed)
+                cp210x_change_speed(tty, port, old_termios);
 
         /* If the number of data bits is to be updated */
         if ((cflag & CSIZE) != (old_cflag & CSIZE)) {
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 01b6404df395..ad654f8208ef 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -797,6 +797,7 @@ static struct usb_device_id id_table_combined [] = {
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+        { USB_DEVICE(HORNBY_VID, HORNBY_ELITE_PID) },
         { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
         { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
@@ -805,6 +806,8 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
         { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+        { USB_DEVICE(FTDI_VID, TI_XDS100V2_PID),
+                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
         { USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) },
         { USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) },
@@ -841,6 +844,7 @@ static struct usb_device_id id_table_combined [] = {
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(ST_VID, ST_STMCLT1030_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk },
+        { USB_DEVICE(FTDI_VID, FTDI_RF_R106) },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };
@@ -1333,8 +1337,7 @@ static int set_serial_info(struct tty_struct *tty,
                 goto check_and_exit;
         }
 
-        if ((new_serial.baud_base != priv->baud_base) &&
-            (new_serial.baud_base < 9600)) {
+        if (new_serial.baud_base != priv->baud_base) {
                 mutex_unlock(&priv->cfg_lock);
                 return -EINVAL;
         }
@@ -1824,6 +1827,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port)
 
 static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
+        struct ktermios dummy;
         struct usb_device *dev = port->serial->dev;
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         int result;
@@ -1842,8 +1846,10 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
            This is same behaviour as serial.c/rs_open() - Kuba */
 
         /* ftdi_set_termios  will send usb control messages */
-        if (tty)
-                ftdi_set_termios(tty, port, tty->termios);
+        if (tty) {
+                memset(&dummy, 0, sizeof(dummy));
+                ftdi_set_termios(tty, port, &dummy);
+        }
 
         /* Start reading from the device */
         result = usb_serial_generic_open(tty, port);
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index df1d7da933ec..f994503df2dd 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -39,6 +39,13 @@
 /* www.candapter.com Ewert Energy Systems CANdapter device */
 #define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */
 
+/*
+ * Texas Instruments XDS100v2 JTAG / BeagleBone A3
+ * http://processors.wiki.ti.com/index.php/XDS100
+ * http://beagleboard.org/bone
+ */
+#define TI_XDS100V2_PID         0xa6d0
+
 #define FTDI_NXTCAM_PID         0xABB8 /* NXTCam for Mindstorms NXT */
 
 /* US Interface Navigator (http://www.usinterface.com/) */
@@ -525,6 +532,12 @@
 #define ADI_GNICEPLUS_PID       0xF001
 
 /*
+ * Hornby Elite
+ */
+#define HORNBY_VID              0x04D8
+#define HORNBY_ELITE_PID        0x000A
+
+/*
  * RATOC REX-USB60F
  */
 #define RATOC_VENDOR_ID         0x0584
@@ -1168,3 +1181,9 @@
  */
 /* TagTracer MIFARE*/
 #define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID    0xF7C0
+
+/*
+ * Rainforest Automation
+ */
+/* ZigBee controller */
+#define FTDI_RF_R106            0x8A28
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 65bf06aa591a..5818bfc3261e 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2657,15 +2657,7 @@ cleanup:
 
 static void edge_disconnect(struct usb_serial *serial)
 {
-        int i;
-        struct edgeport_port *edge_port;
-
         dbg("%s", __func__);
-
-        for (i = 0; i < serial->num_ports; ++i) {
-                edge_port = usb_get_serial_port_data(serial->port[i]);
-                edge_remove_sysfs_attrs(edge_port->port);
-        }
 }
 
 static void edge_release(struct usb_serial *serial)
@@ -2744,6 +2736,7 @@ static struct usb_serial_driver edgeport_1port_device = {
         .disconnect             = edge_disconnect,
         .release                = edge_release,
         .port_probe             = edge_create_sysfs_attrs,
+        .port_remove            = edge_remove_sysfs_attrs,
         .ioctl                  = edge_ioctl,
         .set_termios            = edge_set_termios,
         .tiocmget               = edge_tiocmget,
@@ -2775,6 +2768,7 @@ static struct usb_serial_driver edgeport_2port_device = {
         .disconnect             = edge_disconnect,
         .release                = edge_release,
         .port_probe             = edge_create_sysfs_attrs,
+        .port_remove            = edge_remove_sysfs_attrs,
         .ioctl                  = edge_ioctl,
         .set_termios            = edge_set_termios,
         .tiocmget               = edge_tiocmget,
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 5d3beeeb5fd9..a92a3efb507b 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -38,7 +38,7 @@
 #include <linux/ioctl.h>
 #include "kobil_sct.h"
 
-static int debug;
+static bool debug;
 
 /* Version Information */
 #define DRIVER_VERSION "21/05/2004"
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 420d9857394a..ea126a4490cd 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -480,6 +480,10 @@ static void option_instat_callback(struct urb *urb);
 #define ZD_VENDOR_ID                            0x0685
 #define ZD_PRODUCT_7000                         0x7000
 
+/* LG products */
+#define LG_VENDOR_ID                            0x1004
+#define LG_PRODUCT_L02C                         0x618f
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
                 OPTION_BLACKLIST_NONE = 0,
@@ -1183,6 +1187,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU526) },
         { 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 */
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c
index 30b73e68a904..a34819884c1a 100644
--- a/drivers/usb/serial/qcaux.c
+++ b/drivers/usb/serial/qcaux.c
@@ -36,6 +36,7 @@
 #define UTSTARCOM_PRODUCT_UM175_V1              0x3712
 #define UTSTARCOM_PRODUCT_UM175_V2              0x3714
 #define UTSTARCOM_PRODUCT_UM175_ALLTEL          0x3715
+#define PANTECH_PRODUCT_UML190_VZW              0x3716
 #define PANTECH_PRODUCT_UML290_VZW              0x3718
 
 /* CMOTECH devices */
@@ -67,7 +68,11 @@ static struct usb_device_id id_table[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(LG_VENDOR_ID, LG_PRODUCT_VX4400_6000, 0xff, 0xff, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(SANYO_VENDOR_ID, SANYO_PRODUCT_KATANA_LX, 0xff, 0xff, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_U520, 0xff, 0x00, 0x00) },
-        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xfe, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfd, 0xff) },  /* NMEA */
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfe, 0xff) },  /* WMC */
+        { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) },  /* DIAG */
         { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 1f62723ef1a8..d32f72061c09 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -789,7 +789,7 @@ static void rts51x_suspend_timer_fn(unsigned long data)
                         rts51x_set_stat(chip, RTS51X_STAT_SS);
                         /* ignore mass storage interface's children */
                         pm_suspend_ignore_children(&us->pusb_intf->dev, true);
-                        usb_autopm_put_interface(us->pusb_intf);
+                        usb_autopm_put_interface_async(us->pusb_intf);
                         US_DEBUGP("%s: RTS51X_STAT_SS 01,"
                                 "intf->pm_usage_cnt:%d, power.usage:%d\n",
                                 __func__,
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index 8efeae24764f..b4a71679c933 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -27,8 +27,6 @@
 #define USB_SKEL_VENDOR_ID      0xfff0
 #define USB_SKEL_PRODUCT_ID     0xfff0
 
-static DEFINE_MUTEX(skel_mutex);
-
 /* table of devices that work with this driver */
 static const struct usb_device_id skel_table[] = {
         { USB_DEVICE(USB_SKEL_VENDOR_ID, USB_SKEL_PRODUCT_ID) },
@@ -101,25 +99,18 @@ static int skel_open(struct inode *inode, struct file *file)
                 goto exit;
         }
 
-        mutex_lock(&skel_mutex);
         dev = usb_get_intfdata(interface);
         if (!dev) {
-                mutex_unlock(&skel_mutex);
                 retval = -ENODEV;
                 goto exit;
         }
 
         /* increment our usage count for the device */
         kref_get(&dev->kref);
-        mutex_unlock(&skel_mutex);
 
         /* lock the device to allow correctly handling errors
          * in resumption */
         mutex_lock(&dev->io_mutex);
-        if (!dev->interface) {
-                retval = -ENODEV;
-                goto out_err;
-        }
 
         retval = usb_autopm_get_interface(interface);
         if (retval)
@@ -127,11 +118,7 @@ static int skel_open(struct inode *inode, struct file *file)
 
         /* save our object in the file's private structure */
         file->private_data = dev;
-
-out_err:
         mutex_unlock(&dev->io_mutex);
-        if (retval)
-                kref_put(&dev->kref, skel_delete);
 
 exit:
         return retval;
@@ -611,6 +598,7 @@ static void skel_disconnect(struct usb_interface *interface)
         int minor = interface->minor;
 
         dev = usb_get_intfdata(interface);
+        usb_set_intfdata(interface, NULL);
 
         /* give back our minor */
         usb_deregister_dev(interface, &skel_class);
@@ -622,12 +610,8 @@ static void skel_disconnect(struct usb_interface *interface)
 
         usb_kill_anchored_urbs(&dev->submitted);
 
-        mutex_lock(&skel_mutex);
-        usb_set_intfdata(interface, NULL);
-
         /* decrement our usage count */
         kref_put(&dev->kref, skel_delete);
-        mutex_unlock(&skel_mutex);
 
         dev_info(&interface->dev, "USB Skeleton #%d now disconnected", minor);
 }
diff --git a/drivers/usb/wusbcore/Kconfig b/drivers/usb/wusbcore/Kconfig
index 0ead8826ec79..f29fdd7f6d75 100644
--- a/drivers/usb/wusbcore/Kconfig
+++ b/drivers/usb/wusbcore/Kconfig
@@ -6,7 +6,7 @@ config USB_WUSB
         depends on EXPERIMENTAL
         depends on USB
         depends on PCI
-        select UWB
+        depends on UWB
         select CRYPTO
         select CRYPTO_BLKCIPHER
         select CRYPTO_CBC
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
index 501043e8966c..3de7a32cadbe 100644
--- a/fs/logfs/dir.c
+++ b/fs/logfs/dir.c
@@ -71,7 +71,7 @@ static int write_dir(struct inode *dir, struct logfs_disk_dentry *dd,
 
 static int write_inode(struct inode *inode)
 {
-        return __logfs_write_inode(inode, WF_LOCK);
+        return __logfs_write_inode(inode, NULL, WF_LOCK);
 }
 
 static s64 dir_seek_data(struct inode *inode, s64 pos)
diff --git a/fs/logfs/file.c b/fs/logfs/file.c
index b548c87a86f1..3886cded283c 100644
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@ -230,7 +230,9 @@ int logfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
                 return ret;
 
         mutex_lock(&inode->i_mutex);
+        logfs_get_wblocks(sb, NULL, WF_LOCK);
         logfs_write_anchor(sb);
+        logfs_put_wblocks(sb, NULL, WF_LOCK);
         mutex_unlock(&inode->i_mutex);
 
         return 0;
diff --git a/fs/logfs/gc.c b/fs/logfs/gc.c
index caa4419285dc..d4efb061bdc5 100644
--- a/fs/logfs/gc.c
+++ b/fs/logfs/gc.c
@@ -367,7 +367,7 @@ static struct gc_candidate *get_candidate(struct super_block *sb)
         int i, max_dist;
         struct gc_candidate *cand = NULL, *this;
 
-        max_dist = min(no_free_segments(sb), LOGFS_NO_AREAS);
+        max_dist = min(no_free_segments(sb), LOGFS_NO_AREAS - 1);
 
         for (i = max_dist; i >= 0; i--) {
                 this = first_in_list(&super->s_low_list[i]);
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c
index 388df1aa35e5..a422f42238b2 100644
--- a/fs/logfs/inode.c
+++ b/fs/logfs/inode.c
@@ -286,7 +286,7 @@ static int logfs_write_inode(struct inode *inode, struct writeback_control *wbc)
         if (logfs_inode(inode)->li_flags & LOGFS_IF_STILLBORN)
                 return 0;
 
-        ret = __logfs_write_inode(inode, flags);
+        ret = __logfs_write_inode(inode, NULL, flags);
         LOGFS_BUG_ON(ret, inode->i_sb);
         return ret;
 }
@@ -363,7 +363,9 @@ static void logfs_init_once(void *_li)
 
 static int logfs_sync_fs(struct super_block *sb, int wait)
 {
+        logfs_get_wblocks(sb, NULL, WF_LOCK);
         logfs_write_anchor(sb);
+        logfs_put_wblocks(sb, NULL, WF_LOCK);
         return 0;
 }
 
diff --git a/fs/logfs/journal.c b/fs/logfs/journal.c
index 9da29706f91c..1e1c369df22b 100644
--- a/fs/logfs/journal.c
+++ b/fs/logfs/journal.c
@@ -612,7 +612,6 @@ static size_t __logfs_write_je(struct super_block *sb, void *buf, u16 type,
         if (len == 0)
                 return logfs_write_header(super, header, 0, type);
 
-        BUG_ON(len > sb->s_blocksize);
         compr_len = logfs_compress(buf, data, len, sb->s_blocksize);
         if (compr_len < 0 || type == JE_ANCHOR) {
                 memcpy(data, buf, len);
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h
index 926373866a55..5f0937609465 100644
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@ -528,7 +528,7 @@ void logfs_destroy_inode_cache(void);
 void logfs_set_blocks(struct inode *inode, u64 no);
 /* these logically belong into inode.c but actually reside in readwrite.c */
 int logfs_read_inode(struct inode *inode);
-int __logfs_write_inode(struct inode *inode, long flags);
+int __logfs_write_inode(struct inode *inode, struct page *, long flags);
 void logfs_evict_inode(struct inode *inode);
 
 /* journal.c */
@@ -577,6 +577,8 @@ void initialize_block_counters(struct page *page, struct logfs_block *block,
                 __be64 *array, int page_is_empty);
 int logfs_exist_block(struct inode *inode, u64 bix);
 int get_page_reserve(struct inode *inode, struct page *page);
+void logfs_get_wblocks(struct super_block *sb, struct page *page, int lock);
+void logfs_put_wblocks(struct super_block *sb, struct page *page, int lock);
 extern struct logfs_block_ops indirect_block_ops;
 
 /* segment.c */
@@ -594,6 +596,7 @@ int logfs_init_mapping(struct super_block *sb);
 void logfs_sync_area(struct logfs_area *area);
 void logfs_sync_segments(struct super_block *sb);
 void freeseg(struct super_block *sb, u32 segno);
+void free_areas(struct super_block *sb);
 
 /* area handling */
 int logfs_init_areas(struct super_block *sb);
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index 2ac4217b7901..4153e65b0148 100644
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -244,8 +244,7 @@ static void preunlock_page(struct super_block *sb, struct page *page, int lock)
  * is waiting for s_write_mutex.  We annotate this fact by setting PG_pre_locked
  * in addition to PG_locked.
  */
-static void logfs_get_wblocks(struct super_block *sb, struct page *page,
-                int lock)
+void logfs_get_wblocks(struct super_block *sb, struct page *page, int lock)
 {
         struct logfs_super *super = logfs_super(sb);
 
@@ -260,8 +259,7 @@ static void logfs_get_wblocks(struct super_block *sb, struct page *page,
         }
 }
 
-static void logfs_put_wblocks(struct super_block *sb, struct page *page,
-                int lock)
+void logfs_put_wblocks(struct super_block *sb, struct page *page, int lock)
 {
         struct logfs_super *super = logfs_super(sb);
 
@@ -424,7 +422,7 @@ static void inode_write_block(struct logfs_block *block)
         if (inode->i_ino == LOGFS_INO_MASTER)
                 logfs_write_anchor(inode->i_sb);
         else {
-                ret = __logfs_write_inode(inode, 0);
+                ret = __logfs_write_inode(inode, NULL, 0);
                 /* see indirect_write_block comment */
                 BUG_ON(ret);
         }
@@ -560,8 +558,13 @@ static void inode_free_block(struct super_block *sb, struct logfs_block *block)
 static void indirect_free_block(struct super_block *sb,
                 struct logfs_block *block)
 {
-        ClearPagePrivate(block->page);
-        block->page->private = 0;
+        struct page *page = block->page;
+
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                page_cache_release(page);
+                set_page_private(page, 0);
+        }
         __free_block(sb, block);
 }
 
@@ -650,8 +653,11 @@ static void alloc_data_block(struct inode *inode, struct page *page)
         logfs_unpack_index(page->index, &bix, &level);
         block = __alloc_block(inode->i_sb, inode->i_ino, bix, level);
         block->page = page;
+
         SetPagePrivate(page);
-        page->private = (unsigned long)block;
+        page_cache_get(page);
+        set_page_private(page, (unsigned long) block);
+
         block->ops = &indirect_block_ops;
 }
 
@@ -1570,11 +1576,15 @@ int logfs_write_buf(struct inode *inode, struct page *page, long flags)
 static int __logfs_delete(struct inode *inode, struct page *page)
 {
         long flags = WF_DELETE;
+        int err;
 
         inode->i_ctime = inode->i_mtime = CURRENT_TIME;
 
         if (page->index < I0_BLOCKS)
                 return logfs_write_direct(inode, page, flags);
+        err = grow_inode(inode, page->index, 0);
+        if (err)
+                return err;
         return logfs_write_rec(inode, page, page->index, 0, flags);
 }
 
@@ -1623,7 +1633,7 @@ int logfs_rewrite_block(struct inode *inode, u64 bix, u64 ofs,
                         if (inode->i_ino == LOGFS_INO_MASTER)
                                 logfs_write_anchor(inode->i_sb);
                         else {
-                                err = __logfs_write_inode(inode, flags);
+                                err = __logfs_write_inode(inode, page, flags);
                         }
                 }
         }
@@ -1873,7 +1883,7 @@ int logfs_truncate(struct inode *inode, u64 target)
                 logfs_get_wblocks(sb, NULL, 1);
                 err = __logfs_truncate(inode, size);
                 if (!err)
-                        err = __logfs_write_inode(inode, 0);
+                        err = __logfs_write_inode(inode, NULL, 0);
                 logfs_put_wblocks(sb, NULL, 1);
         }
 
@@ -1901,8 +1911,11 @@ static void move_page_to_inode(struct inode *inode, struct page *page)
         li->li_block = block;
 
         block->page = NULL;
-        page->private = 0;
-        ClearPagePrivate(page);
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                page_cache_release(page);
+                set_page_private(page, 0);
+        }
 }
 
 static void move_inode_to_page(struct page *page, struct inode *inode)
@@ -1918,8 +1931,12 @@ static void move_inode_to_page(struct page *page, struct inode *inode)
         BUG_ON(PagePrivate(page));
         block->ops = &indirect_block_ops;
         block->page = page;
-        page->private = (unsigned long)block;
-        SetPagePrivate(page);
+
+        if (!PagePrivate(page)) {
+                SetPagePrivate(page);
+                page_cache_get(page);
+                set_page_private(page, (unsigned long) block);
+        }
 
         block->inode = NULL;
         li->li_block = NULL;
@@ -2106,14 +2123,14 @@ void logfs_set_segment_unreserved(struct super_block *sb, u32 segno, u32 ec)
                         ec_level);
 }
 
-int __logfs_write_inode(struct inode *inode, long flags)
+int __logfs_write_inode(struct inode *inode, struct page *page, long flags)
 {
         struct super_block *sb = inode->i_sb;
         int ret;
 
-        logfs_get_wblocks(sb, NULL, flags & WF_LOCK);
+        logfs_get_wblocks(sb, page, flags & WF_LOCK);
         ret = do_write_inode(inode);
-        logfs_put_wblocks(sb, NULL, flags & WF_LOCK);
+        logfs_put_wblocks(sb, page, flags & WF_LOCK);
         return ret;
 }
 
diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c
index 9d5187353255..ab798ed1cc88 100644
--- a/fs/logfs/segment.c
+++ b/fs/logfs/segment.c
@@ -86,7 +86,11 @@ int __logfs_buf_write(struct logfs_area *area, u64 ofs, void *buf, size_t len,
                 BUG_ON(!page); /* FIXME: reserve a pool */
                 SetPageUptodate(page);
                 memcpy(page_address(page) + offset, buf, copylen);
-                SetPagePrivate(page);
+
+                if (!PagePrivate(page)) {
+                        SetPagePrivate(page);
+                        page_cache_get(page);
+                }
                 page_cache_release(page);
 
                 buf += copylen;
@@ -110,7 +114,10 @@ static void pad_partial_page(struct logfs_area *area)
                 page = get_mapping_page(sb, index, 0);
                 BUG_ON(!page); /* FIXME: reserve a pool */
                 memset(page_address(page) + offset, 0xff, len);
-                SetPagePrivate(page);
+                if (!PagePrivate(page)) {
+                        SetPagePrivate(page);
+                        page_cache_get(page);
+                }
                 page_cache_release(page);
         }
 }
@@ -130,7 +137,10 @@ static void pad_full_pages(struct logfs_area *area)
                 BUG_ON(!page); /* FIXME: reserve a pool */
                 SetPageUptodate(page);
                 memset(page_address(page), 0xff, PAGE_CACHE_SIZE);
-                SetPagePrivate(page);
+                if (!PagePrivate(page)) {
+                        SetPagePrivate(page);
+                        page_cache_get(page);
+                }
                 page_cache_release(page);
                 index++;
                 no_indizes--;
@@ -485,8 +495,12 @@ static void move_btree_to_page(struct inode *inode, struct page *page,
                 mempool_free(item, super->s_alias_pool);
         }
         block->page = page;
-        SetPagePrivate(page);
-        page->private = (unsigned long)block;
+
+        if (!PagePrivate(page)) {
+                SetPagePrivate(page);
+                page_cache_get(page);
+                set_page_private(page, (unsigned long) block);
+        }
         block->ops = &indirect_block_ops;
         initialize_block_counters(page, block, data, 0);
 }
@@ -536,8 +550,12 @@ void move_page_to_btree(struct page *page)
                 list_add(&item->list, &block->item_list);
         }
         block->page = NULL;
-        ClearPagePrivate(page);
-        page->private = 0;
+
+        if (PagePrivate(page)) {
+                ClearPagePrivate(page);
+                page_cache_release(page);
+                set_page_private(page, 0);
+        }
         block->ops = &btree_block_ops;
         err = alias_tree_insert(block->sb, block->ino, block->bix, block->level,
                         block);
@@ -702,7 +720,10 @@ void freeseg(struct super_block *sb, u32 segno)
                 page = find_get_page(mapping, ofs >> PAGE_SHIFT);
                 if (!page)
                         continue;
-                ClearPagePrivate(page);
+                if (PagePrivate(page)) {
+                        ClearPagePrivate(page);
+                        page_cache_release(page);
+                }
                 page_cache_release(page);
         }
 }
@@ -841,6 +862,16 @@ static void free_area(struct logfs_area *area)
         kfree(area);
 }
 
+void free_areas(struct super_block *sb)
+{
+        struct logfs_super *super = logfs_super(sb);
+        int i;
+
+        for_each_area(i)
+                free_area(super->s_area[i]);
+        free_area(super->s_journal_area);
+}
+
 static struct logfs_area *alloc_area(struct super_block *sb)
 {
         struct logfs_area *area;
@@ -923,10 +954,6 @@ err:
 void logfs_cleanup_areas(struct super_block *sb)
 {
         struct logfs_super *super = logfs_super(sb);
-        int i;
 
         btree_grim_visitor128(&super->s_object_alias_tree, 0, kill_alias);
-        for_each_area(i)
-                free_area(super->s_area[i]);
-        free_area(super->s_journal_area);
 }
diff --git a/fs/logfs/super.c b/fs/logfs/super.c
index e795c234ea33..c9ee7f5d1caf 100644
--- a/fs/logfs/super.c
+++ b/fs/logfs/super.c
@@ -486,14 +486,15 @@ static void logfs_kill_sb(struct super_block *sb)
         /* Alias entries slow down mount, so evict as many as possible */
         sync_filesystem(sb);
         logfs_write_anchor(sb);
+        free_areas(sb);
 
         /*
          * From this point on alias entries are simply dropped - and any
          * writes to the object store are considered bugs.
          */
-        super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN;
         log_super("LogFS: Now in shutdown\n");
         generic_shutdown_super(sb);
+        super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN;
 
         BUG_ON(super->s_dirty_used_bytes || super->s_dirty_free_bytes);
 
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 1a81fde8f333..221295208fd0 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -441,7 +441,7 @@ static inline void mtd_resume(struct mtd_info *mtd)
 static inline int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs)
 {
         if (!mtd->block_isbad)
-                return -EOPNOTSUPP;
+                return 0;
         return mtd->block_isbad(mtd, ofs);
 }
 
@@ -489,7 +489,7 @@ static inline int mtd_has_oob(const struct mtd_info *mtd)
 
 static inline int mtd_can_have_bb(const struct mtd_info *mtd)
 {
-        return !!mtd->block_isbad;
+        return 0;
 }
 
         /* Kernel-side ioctl definitions */
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
index e5bbcbaa6f57..4d99e4e6ef83 100644
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
@@ -110,7 +110,19 @@ static inline void pm_qos_remove_request(struct pm_qos_request *req)
                         { return; }
 
 static inline int pm_qos_request(int pm_qos_class)
-                        { return 0; }
+{
+        switch (pm_qos_class) {
+        case PM_QOS_CPU_DMA_LATENCY:
+                return PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
+        case PM_QOS_NETWORK_LATENCY:
+                return PM_QOS_NETWORK_LAT_DEFAULT_VALUE;
+        case PM_QOS_NETWORK_THROUGHPUT:
+                return PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE;
+        default:
+                return PM_QOS_DEFAULT_VALUE;
+        }
+}
+
 static inline int pm_qos_add_notifier(int pm_qos_class,
                                       struct notifier_block *notifier)
                         { return 0; }
diff --git a/include/linux/usb/langwell_otg.h b/include/linux/usb/langwell_otg.h
deleted file mode 100644
index 51f17b16d312..000000000000
--- a/include/linux/usb/langwell_otg.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Intel Langwell USB OTG transceiver driver
- * Copyright (C) 2008 - 2010, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef __LANGWELL_OTG_H
-#define __LANGWELL_OTG_H
-
-#include <linux/usb/intel_mid_otg.h>
-
-#define CI_USBCMD               0x30
-#       define USBCMD_RST               BIT(1)
-#       define USBCMD_RS                BIT(0)
-#define CI_USBSTS               0x34
-#       define USBSTS_SLI               BIT(8)
-#       define USBSTS_URI               BIT(6)
-#       define USBSTS_PCI               BIT(2)
-#define CI_PORTSC1              0x74
-#       define PORTSC_PP                BIT(12)
-#       define PORTSC_LS                (BIT(11) | BIT(10))
-#       define PORTSC_SUSP              BIT(7)
-#       define PORTSC_CCS               BIT(0)
-#define CI_HOSTPC1              0xb4
-#       define HOSTPC1_PHCD             BIT(22)
-#define CI_OTGSC                0xf4
-#       define OTGSC_DPIE               BIT(30)
-#       define OTGSC_1MSE               BIT(29)
-#       define OTGSC_BSEIE              BIT(28)
-#       define OTGSC_BSVIE              BIT(27)
-#       define OTGSC_ASVIE              BIT(26)
-#       define OTGSC_AVVIE              BIT(25)
-#       define OTGSC_IDIE               BIT(24)
-#       define OTGSC_DPIS               BIT(22)
-#       define OTGSC_1MSS               BIT(21)
-#       define OTGSC_BSEIS              BIT(20)
-#       define OTGSC_BSVIS              BIT(19)
-#       define OTGSC_ASVIS              BIT(18)
-#       define OTGSC_AVVIS              BIT(17)
-#       define OTGSC_IDIS               BIT(16)
-#       define OTGSC_DPS                BIT(14)
-#       define OTGSC_1MST               BIT(13)
-#       define OTGSC_BSE                BIT(12)
-#       define OTGSC_BSV                BIT(11)
-#       define OTGSC_ASV                BIT(10)
-#       define OTGSC_AVV                BIT(9)
-#       define OTGSC_ID                 BIT(8)
-#       define OTGSC_HABA               BIT(7)
-#       define OTGSC_HADP               BIT(6)
-#       define OTGSC_IDPU               BIT(5)
-#       define OTGSC_DP                 BIT(4)
-#       define OTGSC_OT                 BIT(3)
-#       define OTGSC_HAAR               BIT(2)
-#       define OTGSC_VC                 BIT(1)
-#       define OTGSC_VD                 BIT(0)
-#       define OTGSC_INTEN_MASK         (0x7f << 24)
-#       define OTGSC_INT_MASK           (0x5f << 24)
-#       define OTGSC_INTSTS_MASK        (0x7f << 16)
-#define CI_USBMODE              0xf8
-#       define USBMODE_CM               (BIT(1) | BIT(0))
-#       define USBMODE_IDLE             0
-#       define USBMODE_DEVICE           0x2
-#       define USBMODE_HOST             0x3
-#define USBCFG_ADDR                     0xff10801c
-#define USBCFG_LEN                      4
-#       define USBCFG_VBUSVAL           BIT(14)
-#       define USBCFG_AVALID            BIT(13)
-#       define USBCFG_BVALID            BIT(12)
-#       define USBCFG_SESEND            BIT(11)
-
-#define INTR_DUMMY_MASK (USBSTS_SLI | USBSTS_URI | USBSTS_PCI)
-
-enum langwell_otg_timer_type {
-        TA_WAIT_VRISE_TMR,
-        TA_WAIT_BCON_TMR,
-        TA_AIDL_BDIS_TMR,
-        TB_ASE0_BRST_TMR,
-        TB_SE0_SRP_TMR,
-        TB_SRP_INIT_TMR,
-        TB_SRP_FAIL_TMR,
-        TB_BUS_SUSPEND_TMR
-};
-
-#define TA_WAIT_VRISE   100
-#define TA_WAIT_BCON    30000
-#define TA_AIDL_BDIS    15000
-#define TB_ASE0_BRST    5000
-#define TB_SE0_SRP      2
-#define TB_SRP_INIT     100
-#define TB_SRP_FAIL     5500
-#define TB_BUS_SUSPEND  500
-
-struct langwell_otg_timer {
-        unsigned long expires;  /* Number of count increase to timeout */
-        unsigned long count;    /* Tick counter */
-        void (*function)(unsigned long);        /* Timeout function */
-        unsigned long data;     /* Data passed to function */
-        struct list_head list;
-};
-
-struct langwell_otg {
-        struct intel_mid_otg_xceiv      iotg;
-        struct device                   *dev;
-
-        void __iomem                    *usbcfg;        /* SCCBUSB config Reg */
-
-        unsigned                        region;
-        unsigned                        cfg_region;
-
-        struct work_struct              work;
-        struct workqueue_struct         *qwork;
-        struct timer_list               hsm_timer;
-
-        spinlock_t                      lock;
-        spinlock_t                      wq_lock;
-
-        struct notifier_block           iotg_notifier;
-};
-
-static inline
-struct langwell_otg *mid_xceiv_to_lnw(struct intel_mid_otg_xceiv *iotg)
-{
-        return container_of(iotg, struct langwell_otg, iotg);
-}
-
-#endif /* __LANGWELL_OTG_H__ */
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index 3419bf5cd154..d55f43443335 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -41,6 +41,7 @@ static inline void *net_generic(const struct net *net, int id)
         ptr = ng->ptr[id - 1];
         rcu_read_unlock();
 
+        BUG_ON(!ptr);
         return ptr;
 }
 #endif
diff --git a/include/net/sock.h b/include/net/sock.h
index 4c69ac165e6b..91c1c8baf020 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -55,6 +55,7 @@
 #include <linux/uaccess.h>
 #include <linux/memcontrol.h>
 #include <linux/res_counter.h>
+#include <linux/jump_label.h>
 
 #include <linux/filter.h>
 #include <linux/rculist_nulls.h>
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 0118ea999f67..d49db0113a06 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -311,6 +311,8 @@ extern struct proto tcp_prot;
 #define TCP_ADD_STATS_USER(net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val)
 #define TCP_ADD_STATS(net, field, val)  SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val)
 
+extern void tcp_init_mem(struct net *net);
+
 extern void tcp_v4_err(struct sk_buff *skb, u32);
 
 extern void tcp_shutdown (struct sock *sk, int how);
diff --git a/kernel/power/power.h b/kernel/power/power.h
index 0c4defe6d3b8..21724eee5206 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -231,8 +231,28 @@ extern int pm_test_level;
 #ifdef CONFIG_SUSPEND_FREEZER
 static inline int suspend_freeze_processes(void)
 {
-        int error = freeze_processes();
-        return error ? : freeze_kernel_threads();
+        int error;
+
+        error = freeze_processes();
+
+        /*
+         * freeze_processes() automatically thaws every task if freezing
+         * fails. So we need not do anything extra upon error.
+         */
+        if (error)
+                goto Finish;
+
+        error = freeze_kernel_threads();
+
+        /*
+         * freeze_kernel_threads() thaws only kernel threads upon freezing
+         * failure. So we have to thaw the userspace tasks ourselves.
+         */
+        if (error)
+                thaw_processes();
+
+ Finish:
+        return error;
 }
 
 static inline void suspend_thaw_processes(void)
diff --git a/kernel/power/process.c b/kernel/power/process.c
index eeca00311f39..7e426459e60a 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -143,7 +143,10 @@ int freeze_processes(void)
 /**
  * freeze_kernel_threads - Make freezable kernel threads go to the refrigerator.
  *
- * On success, returns 0.  On failure, -errno and system is fully thawed.
+ * On success, returns 0.  On failure, -errno and only the kernel threads are
+ * thawed, so as to give a chance to the caller to do additional cleanups
+ * (if any) before thawing the userspace tasks. So, it is the responsibility
+ * of the caller to thaw the userspace tasks, when the time is right.
  */
 int freeze_kernel_threads(void)
 {
@@ -159,7 +162,7 @@ int freeze_kernel_threads(void)
         BUG_ON(in_atomic());
 
         if (error)
-                thaw_processes();
+                thaw_kernel_threads();
         return error;
 }
 
diff --git a/kernel/power/user.c b/kernel/power/user.c
index e5a21a857302..3e100075b13c 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -249,13 +249,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                 }
                 pm_restore_gfp_mask();
                 error = hibernation_snapshot(data->platform_support);
-                if (!error) {
+                if (error) {
+                        thaw_kernel_threads();
+                } else {
                         error = put_user(in_suspend, (int __user *)arg);
                         if (!error && !freezer_test_done)
                                 data->ready = 1;
                         if (freezer_test_done) {
                                 freezer_test_done = false;
-                                thaw_processes();
+                                thaw_kernel_threads();
                         }
                 }
                 break;
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 673728add60b..82c57069415f 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -59,8 +59,6 @@ struct cfcnfg *get_cfcnfg(struct net *net)
 {
         struct caif_net *caifn;
         caifn = net_generic(net, caif_net_id);
-        if (!caifn)
-                return NULL;
         return caifn->cfg;
 }
 EXPORT_SYMBOL(get_cfcnfg);
@@ -69,8 +67,6 @@ static struct caif_device_entry_list *caif_device_list(struct net *net)
 {
         struct caif_net *caifn;
         caifn = net_generic(net, caif_net_id);
-        if (!caifn)
-                return NULL;
         return &caifn->caifdevs;
 }
 
@@ -99,8 +95,6 @@ static struct caif_device_entry *caif_device_alloc(struct net_device *dev)
         struct caif_device_entry *caifd;
 
         caifdevs = caif_device_list(dev_net(dev));
-        if (!caifdevs)
-                return NULL;
 
         caifd = kzalloc(sizeof(*caifd), GFP_KERNEL);
         if (!caifd)
@@ -120,8 +114,6 @@ static struct caif_device_entry *caif_get(struct net_device *dev)
         struct caif_device_entry_list *caifdevs =
             caif_device_list(dev_net(dev));
         struct caif_device_entry *caifd;
-        if (!caifdevs)
-                return NULL;
 
         list_for_each_entry_rcu(caifd, &caifdevs->list, list) {
                 if (caifd->netdev == dev)
@@ -321,8 +313,6 @@ void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,
         struct caif_device_entry_list *caifdevs;
 
         caifdevs = caif_device_list(dev_net(dev));
-        if (!cfg || !caifdevs)
-                return;
         caifd = caif_device_alloc(dev);
         if (!caifd)
                 return;
@@ -374,8 +364,6 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
 
         cfg = get_cfcnfg(dev_net(dev));
         caifdevs = caif_device_list(dev_net(dev));
-        if (!cfg || !caifdevs)
-                return 0;
 
         caifd = caif_get(dev);
         if (caifd == NULL && dev->type != ARPHRD_CAIF)
@@ -507,9 +495,6 @@ static struct notifier_block caif_device_notifier = {
 static int caif_init_net(struct net *net)
 {
         struct caif_net *caifn = net_generic(net, caif_net_id);
-        if (WARN_ON(!caifn))
-                return -EINVAL;
-
         INIT_LIST_HEAD(&caifn->caifdevs.list);
         mutex_init(&caifn->caifdevs.lock);
 
@@ -527,9 +512,6 @@ static void caif_exit_net(struct net *net)
             caif_device_list(net);
         struct cfcnfg *cfg =  get_cfcnfg(net);
 
-        if (!cfg || !caifdevs)
-                return;
-
         rtnl_lock();
         mutex_lock(&caifdevs->lock);
 
@@ -569,7 +551,7 @@ static int __init caif_device_init(void)
 {
         int result;
 
-        result = register_pernet_device(&caif_net_ops);
+        result = register_pernet_subsys(&caif_net_ops);
 
         if (result)
                 return result;
@@ -582,7 +564,7 @@ static int __init caif_device_init(void)
 
 static void __exit caif_device_exit(void)
 {
-        unregister_pernet_device(&caif_net_ops);
+        unregister_pernet_subsys(&caif_net_ops);
         unregister_netdevice_notifier(&caif_device_notifier);
         dev_remove_pack(&caif_packet_type);
 }
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c
index 598aafb4cb51..ba9cfd47778a 100644
--- a/net/caif/cfcnfg.c
+++ b/net/caif/cfcnfg.c
@@ -309,7 +309,6 @@ int caif_connect_client(struct net *net, struct caif_connect_request *conn_req,
         int err;
         struct cfctrl_link_param param;
         struct cfcnfg *cfg = get_cfcnfg(net);
-        caif_assert(cfg != NULL);
 
         rcu_read_lock();
         err = caif_connect_req_to_link_param(cfg, conn_req, &param);
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index aefcd7acbffa..0e950fda9a0a 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -30,6 +30,20 @@ EXPORT_SYMBOL(init_net);
 
 #define INITIAL_NET_GEN_PTRS    13 /* +1 for len +2 for rcu_head */
 
+static unsigned int max_gen_ptrs = INITIAL_NET_GEN_PTRS;
+
+static struct net_generic *net_alloc_generic(void)
+{
+        struct net_generic *ng;
+        size_t generic_size = offsetof(struct net_generic, ptr[max_gen_ptrs]);
+
+        ng = kzalloc(generic_size, GFP_KERNEL);
+        if (ng)
+                ng->len = max_gen_ptrs;
+
+        return ng;
+}
+
 static int net_assign_generic(struct net *net, int id, void *data)
 {
         struct net_generic *ng, *old_ng;
@@ -43,8 +57,7 @@ static int net_assign_generic(struct net *net, int id, void *data)
         if (old_ng->len >= id)
                 goto assign;
 
-        ng = kzalloc(sizeof(struct net_generic) +
-                        id * sizeof(void *), GFP_KERNEL);
+        ng = net_alloc_generic();
         if (ng == NULL)
                 return -ENOMEM;
 
@@ -59,7 +72,6 @@ static int net_assign_generic(struct net *net, int id, void *data)
          * the old copy for kfree after a grace period.
          */
 
-        ng->len = id;
         memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*));
 
         rcu_assign_pointer(net->gen, ng);
@@ -161,18 +173,6 @@ out_undo:
         goto out;
 }
 
-static struct net_generic *net_alloc_generic(void)
-{
-        struct net_generic *ng;
-        size_t generic_size = sizeof(struct net_generic) +
-                INITIAL_NET_GEN_PTRS * sizeof(void *);
-
-        ng = kzalloc(generic_size, GFP_KERNEL);
-        if (ng)
-                ng->len = INITIAL_NET_GEN_PTRS;
-
-        return ng;
-}
 
 #ifdef CONFIG_NET_NS
 static struct kmem_cache *net_cachep;
@@ -483,6 +483,7 @@ again:
                         }
                         return error;
                 }
+                max_gen_ptrs = max_t(unsigned int, max_gen_ptrs, *ops->id);
         }
         error = __register_pernet_operations(list, ops);
         if (error) {
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index f16444bc6cbb..65aebd450027 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1509,6 +1509,9 @@ errout:
 
         if (send_addr_notify)
                 call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
+        min_ifinfo_dump_size = max_t(u16, if_nlmsg_size(dev),
+                                     min_ifinfo_dump_size);
+
         return err;
 }
 
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 2e4e24476c4c..19d66cefd7d3 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -123,11 +123,14 @@ again:
                                                 smallest_size = tb->num_owners;
                                                 smallest_rover = rover;
                                                 if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) {
-                                                        spin_unlock(&head->lock);
                                                         snum = smallest_rover;
-                                                        goto have_snum;
+                                                        goto tb_found;
                                                 }
                                         }
+                                        if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) {
+                                                snum = rover;
+                                                goto tb_found;
+                                        }
                                         goto next;
                                 }
                         break;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 2b53a1f7abf6..6b3ca5ba4450 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -422,6 +422,10 @@ static struct ip_tunnel *ipgre_tunnel_locate(struct net *net,
         if (register_netdevice(dev) < 0)
                 goto failed_free;
 
+        /* Can use a lockless transmit, unless we generate output sequences */
+        if (!(nt->parms.o_flags & GRE_SEQ))
+                dev->features |= NETIF_F_LLTX;
+
         dev_hold(dev);
         ipgre_tunnel_link(ign, nt);
         return nt;
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 4aa7e9dc0cbb..4cb9cd2f2c39 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -814,6 +814,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
 
         net->ipv4.sysctl_rt_cache_rebuild_count = 4;
 
+        tcp_init_mem(net);
         limit = nr_free_buffer_pages() / 8;
         limit = max(limit, 128UL);
         net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 9bcdec3ad772..06373b4a449a 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3216,6 +3216,16 @@ static int __init set_thash_entries(char *str)
 }
 __setup("thash_entries=", set_thash_entries);
 
+void tcp_init_mem(struct net *net)
+{
+        /* Set per-socket limits to no more than 1/128 the pressure threshold */
+        unsigned long limit = nr_free_buffer_pages() / 8;
+        limit = max(limit, 128UL);
+        net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3;
+        net->ipv4.sysctl_tcp_mem[1] = limit;
+        net->ipv4.sysctl_tcp_mem[2] = net->ipv4.sysctl_tcp_mem[0] * 2;
+}
+
 void __init tcp_init(void)
 {
         struct sk_buff *skb = NULL;
@@ -3276,9 +3286,9 @@ void __init tcp_init(void)
         sysctl_tcp_max_orphans = cnt / 2;
         sysctl_max_syn_backlog = max(128, cnt / 256);
 
-        /* Set per-socket limits to no more than 1/128 the pressure threshold */
-        limit = ((unsigned long)init_net.ipv4.sysctl_tcp_mem[1])
-                << (PAGE_SHIFT - 7);
+        tcp_init_mem(&init_net);
+        limit = nr_free_buffer_pages() / 8;
+        limit = max(limit, 128UL);
         max_share = min(4UL*1024*1024, limit);
 
         sysctl_tcp_wmem[0] = SK_MEM_QUANTUM;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8c8de2780c7a..4ff3b6dc74fc 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1141,11 +1141,9 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len)
         sk_mem_uncharge(sk, len);
         sock_set_flag(sk, SOCK_QUEUE_SHRUNK);
 
-        /* Any change of skb->len requires recalculation of tso
-         * factor and mss.
-         */
+        /* Any change of skb->len requires recalculation of tso factor. */
         if (tcp_skb_pcount(skb) > 1)
-                tcp_set_skb_tso_segs(sk, skb, tcp_current_mss(sk));
+                tcp_set_skb_tso_segs(sk, skb, tcp_skb_mss(skb));
 
         return 0;
 }
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index d21e7ebd91ca..55670ec3cd0f 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -393,11 +393,6 @@ static int l2tp_ip_backlog_recv(struct sock *sk, struct sk_buff *skb)
 {
         int rc;
 
-        if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
-                goto drop;
-
-        nf_reset(skb);
-
         /* Charge it to the socket, dropping if the queue is full. */
         rc = sock_queue_rcv_skb(sk, skb);
         if (rc < 0)
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index b3d76b756cd5..a4643969a13b 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -106,6 +106,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 
         sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
 
+        local->oper_channel = chan;
         channel_type = ifibss->channel_type;
         if (channel_type > NL80211_CHAN_HT20 &&
             !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index e47768cb8cb3..01a21c2f6ab3 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1314,6 +1314,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
                         continue;
                 }
                 /* count everything else */
+                sdata->vif.bss_conf.idle = false;
                 count++;
         }
 
diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c
index 1426ec3d0a53..75762f346975 100644
--- a/net/sunrpc/auth_generic.c
+++ b/net/sunrpc/auth_generic.c
@@ -92,6 +92,7 @@ generic_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
         if (gcred->acred.group_info != NULL)
                 get_group_info(gcred->acred.group_info);
         gcred->acred.machine_cred = acred->machine_cred;
+        gcred->acred.principal = acred->principal;
 
         dprintk("RPC:       allocated %s cred %p for uid %d gid %d\n",
                         gcred->acred.machine_cred ? "machine" : "generic",
@@ -123,6 +124,17 @@ generic_destroy_cred(struct rpc_cred *cred)
         call_rcu(&cred->cr_rcu, generic_free_cred_callback);
 }
 
+static int
+machine_cred_match(struct auth_cred *acred, struct generic_cred *gcred, int flags)
+{
+        if (!gcred->acred.machine_cred ||
+            gcred->acred.principal != acred->principal ||
+            gcred->acred.uid != acred->uid ||
+            gcred->acred.gid != acred->gid)
+                return 0;
+        return 1;
+}
+
 /*
  * Match credentials against current process creds.
  */
@@ -132,9 +144,12 @@ generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags)
         struct generic_cred *gcred = container_of(cred, struct generic_cred, gc_base);
         int i;
 
+        if (acred->machine_cred)
+                return machine_cred_match(acred, gcred, flags);
+
         if (gcred->acred.uid != acred->uid ||
             gcred->acred.gid != acred->gid ||
-            gcred->acred.machine_cred != acred->machine_cred)
+            gcred->acred.machine_cred != 0)
                 goto out_nomatch;
 
         /* Optimisation in the case where pointers are identical... */
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index aad8fb699989..85d3bb7490aa 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1918,7 +1918,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                 struct sk_buff *skb;
 
                 unix_state_lock(sk);
-                skb = skb_dequeue(&sk->sk_receive_queue);
+                skb = skb_peek(&sk->sk_receive_queue);
                 if (skb == NULL) {
                         unix_sk(sk)->recursion_level = 0;
                         if (copied >= target)
@@ -1958,11 +1958,8 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                 if (check_creds) {
                         /* Never glue messages from different writers */
                         if ((UNIXCB(skb).pid  != siocb->scm->pid) ||
-                            (UNIXCB(skb).cred != siocb->scm->cred)) {
-                                skb_queue_head(&sk->sk_receive_queue, skb);
-                                sk->sk_data_ready(sk, skb->len);
+                            (UNIXCB(skb).cred != siocb->scm->cred))
                                 break;
-                        }
                 } else {
                         /* Copy credentials */
                         scm_set_cred(siocb->scm, UNIXCB(skb).pid, UNIXCB(skb).cred);
@@ -1977,8 +1974,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
 
                 chunk = min_t(unsigned int, skb->len, size);
                 if (memcpy_toiovec(msg->msg_iov, skb->data, chunk)) {
-                        skb_queue_head(&sk->sk_receive_queue, skb);
-                        sk->sk_data_ready(sk, skb->len);
                         if (copied == 0)
                                 copied = -EFAULT;
                         break;
@@ -1993,13 +1988,10 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                         if (UNIXCB(skb).fp)
                                 unix_detach_fds(siocb->scm, skb);
 
-                        /* put the skb back if we didn't use it up.. */
-                        if (skb->len) {
-                                skb_queue_head(&sk->sk_receive_queue, skb);
-                                sk->sk_data_ready(sk, skb->len);
+                        if (skb->len)
                                 break;
-                        }
 
+                        skb_unlink(skb, &sk->sk_receive_queue);
                         consume_skb(skb);
 
                         if (siocb->scm->fp)
@@ -2010,9 +2002,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                         if (UNIXCB(skb).fp)
                                 siocb->scm->fp = scm_fp_dup(UNIXCB(skb).fp);
 
-                        /* put message back and return */
-                        skb_queue_head(&sk->sk_receive_queue, skb);
-                        sk->sk_data_ready(sk, skb->len);
                         break;
                 }
         } while (size);