139 files changed, 2557 insertions, 1168 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 3ff267861541..bd22f8667eed 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -250,7 +250,7 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
                return acpi_rsdp;
 #endif
-        if (efi_enabled) {
+        if (efi_enabled(EFI_CONFIG_TABLES)) {
                if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
                        return efi.acpi20;
                else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index b00000e8aef6..33c9a44a9678 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -77,10 +77,15 @@ static struct usb_device_id ath3k_table[] = {
        { USB_DEVICE(0x0CF3, 0x311D) },
        { USB_DEVICE(0x13d3, 0x3375) },
        { USB_DEVICE(0x04CA, 0x3005) },
+        { USB_DEVICE(0x04CA, 0x3006) },
+        { USB_DEVICE(0x04CA, 0x3008) },
        { USB_DEVICE(0x13d3, 0x3362) },
        { USB_DEVICE(0x0CF3, 0xE004) },
        { USB_DEVICE(0x0930, 0x0219) },
        { USB_DEVICE(0x0489, 0xe057) },
+        { USB_DEVICE(0x13d3, 0x3393) },
+        { USB_DEVICE(0x0489, 0xe04e) },
+        { USB_DEVICE(0x0489, 0xe056) },
        /* Atheros AR5BBU12 with sflash firmware */
        { USB_DEVICE(0x0489, 0xE02C) },
@@ -104,10 +109,15 @@ static struct usb_device_id ath3k_blist_tbl[] = {
        { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
        /* Atheros AR5BBU22 with sflash firmware */
        { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index a1d4ede5b892..7e351e345476 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -135,10 +135,15 @@ static struct usb_device_id blacklist_table[] = {
        { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
        /* Atheros AR5BBU12 with sflash firmware */
        { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 281f566a5513..d1e9eb191f2b 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -340,7 +340,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
        /*
         * Alocate and fill the csrow/channels structs
         */
-        mci->csrows = kcalloc(sizeof(*mci->csrows), tot_csrows, GFP_KERNEL);
+        mci->csrows = kcalloc(tot_csrows, sizeof(*mci->csrows), GFP_KERNEL);
        if (!mci->csrows)
                goto error;
        for (row = 0; row < tot_csrows; row++) {
@@ -351,7 +351,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
                csr->csrow_idx = row;
                csr->mci = mci;
                csr->nr_channels = tot_channels;
-                csr->channels = kcalloc(sizeof(*csr->channels), tot_channels,
+                csr->channels = kcalloc(tot_channels, sizeof(*csr->channels),
                                        GFP_KERNEL);
                if (!csr->channels)
                        goto error;
@@ -369,7 +369,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
        /*
         * Allocate and fill the dimm structs
         */
-        mci->dimms  = kcalloc(sizeof(*mci->dimms), tot_dimms, GFP_KERNEL);
+        mci->dimms  = kcalloc(tot_dimms, sizeof(*mci->dimms), GFP_KERNEL);
        if (!mci->dimms)
                goto error;
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
index dc6e905ee1a5..0056c4dae9d5 100644
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -256,7 +256,7 @@ static ssize_t edac_pci_dev_store(struct kobject *kobj,
        struct edac_pci_dev_attribute *edac_pci_dev;
        edac_pci_dev = (struct edac_pci_dev_attribute *)attr;
-        if (edac_pci_dev->show)
+        if (edac_pci_dev->store)
                return edac_pci_dev->store(edac_pci_dev->value, buffer, count);
        return -EIO;
 }
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index fd3ae6290d71..982f1f5f5742 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -471,7 +471,7 @@ void __init dmi_scan_machine(void)
        char __iomem *p, *q;
        int rc;
-        if (efi_enabled) {
+        if (efi_enabled(EFI_CONFIG_TABLES)) {
                if (efi.smbios == EFI_INVALID_TABLE_ADDR)
                        goto error;
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 7b1c37497c9a..f5596db0cf58 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -674,7 +674,7 @@ static int efi_status_to_err(efi_status_t status)
                err = -EACCES;
                break;
        case EFI_NOT_FOUND:
-                err = -ENOENT;
+                err = -EIO;
                break;
        default:
                err = -EINVAL;
@@ -793,6 +793,7 @@ static ssize_t efivarfs_file_write(struct file *file,
                spin_unlock(&efivars->lock);
                efivar_unregister(var);
                drop_nlink(inode);
+                d_delete(file->f_dentry);
                dput(file->f_dentry);
        } else {
@@ -994,7 +995,7 @@ static int efivarfs_unlink(struct inode *dir, struct dentry *dentry)
                list_del(&var->list);
                spin_unlock(&efivars->lock);
                efivar_unregister(var);
-                drop_nlink(dir);
+                drop_nlink(dentry->d_inode);
                dput(dentry);
                return 0;
        }
@@ -1782,7 +1783,7 @@ efivars_init(void)
        printk(KERN_INFO "EFI Variables Facility v%s %s\n", EFIVARS_VERSION,
               EFIVARS_DATE);
-        if (!efi_enabled)
+        if (!efi_enabled(EFI_RUNTIME_SERVICES))
                return 0;
        /* For now we'll register the efi directory at /sys/firmware/efi */
@@ -1822,7 +1823,7 @@ err_put:
 static void __exit
 efivars_exit(void)
 {
-        if (efi_enabled) {
+        if (efi_enabled(EFI_RUNTIME_SERVICES)) {
                unregister_efivars(&__efivars);
                kobject_put(efi_kobj);
        }
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index 4da4eb9ae926..2224f1dc074b 100644
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -99,7 +99,7 @@ unsigned long __init find_ibft_region(unsigned long *sizep)
        /* iBFT 1.03 section 1.4.3.1 mandates that UEFI machines will
         * only use ACPI for this */
-        if (!efi_enabled)
+        if (!efi_enabled(EFI_BOOT))
                find_ibft_in_mem();
        if (ibft_addr) {
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 682de754d63f..40a0ec3b7c40 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -663,6 +663,13 @@ config GPIO_AB8500
        help
          Select this to enable the AB8500 IC GPIO driver
+config GPIO_PALMAS
+        bool "TI PALMAS series PMICs GPIO"
+        depends on MFD_PALMAS
+        help
+          Select this option to enable GPIO driver for the TI PALMAS
+          series chip family.
 config GPIO_TPS6586X
        bool "TPS6586X GPIO"
        depends on MFD_TPS6586X
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index c5aebd008dde..8962c5f7b026 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -69,6 +69,7 @@ obj-$(CONFIG_GPIO_TC3589X)	+= gpio-tc3589x.o
 obj-$(CONFIG_ARCH_TEGRA)        += gpio-tegra.o
 obj-$(CONFIG_GPIO_TIMBERDALE)   += gpio-timberdale.o
 obj-$(CONFIG_ARCH_DAVINCI_TNETV107X) += gpio-tnetv107x.o
+obj-$(CONFIG_GPIO_PALMAS)       += gpio-palmas.o
 obj-$(CONFIG_GPIO_TPS6586X)     += gpio-tps6586x.o
 obj-$(CONFIG_GPIO_TPS65910)     += gpio-tps65910.o
 obj-$(CONFIG_GPIO_TPS65912)     += gpio-tps65912.o
diff --git a/drivers/gpio/gpio-palmas.c b/drivers/gpio/gpio-palmas.c
new file mode 100644
index 000000000000..e3a4e56f5a42
--- /dev/null
+++ b/drivers/gpio/gpio-palmas.c
@@ -0,0 +1,184 @@
+/*
+ * TI Palma series PMIC's GPIO driver.
+ *
+ * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Author: Laxman Dewangan <ldewangan@nvidia.com>
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/gpio.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mfd/palmas.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+struct palmas_gpio {
+        struct gpio_chip gpio_chip;
+        struct palmas *palmas;
+};
+static inline struct palmas_gpio *to_palmas_gpio(struct gpio_chip *chip)
+{
+        return container_of(chip, struct palmas_gpio, gpio_chip);
+}
+static int palmas_gpio_get(struct gpio_chip *gc, unsigned offset)
+{
+        struct palmas_gpio *pg = to_palmas_gpio(gc);
+        struct palmas *palmas = pg->palmas;
+        unsigned int val;
+        int ret;
+        ret = palmas_read(palmas, PALMAS_GPIO_BASE, PALMAS_GPIO_DATA_IN, &val);
+        if (ret < 0) {
+                dev_err(gc->dev, "GPIO_DATA_IN read failed, err = %d\n", ret);
+                return ret;
+        }
+        return !!(val & BIT(offset));
+}
+static void palmas_gpio_set(struct gpio_chip *gc, unsigned offset,
+                        int value)
+{
+        struct palmas_gpio *pg = to_palmas_gpio(gc);
+        struct palmas *palmas = pg->palmas;
+        int ret;
+        if (value)
+                ret = palmas_write(palmas, PALMAS_GPIO_BASE,
+                                PALMAS_GPIO_SET_DATA_OUT, BIT(offset));
+        else
+                ret = palmas_write(palmas, PALMAS_GPIO_BASE,
+                                PALMAS_GPIO_CLEAR_DATA_OUT, BIT(offset));
+        if (ret < 0)
+                dev_err(gc->dev, "%s write failed, err = %d\n",
+                        (value) ? "GPIO_SET_DATA_OUT" : "GPIO_CLEAR_DATA_OUT",
+                        ret);
+}
+static int palmas_gpio_output(struct gpio_chip *gc, unsigned offset,
+                                int value)
+{
+        struct palmas_gpio *pg = to_palmas_gpio(gc);
+        struct palmas *palmas = pg->palmas;
+        int ret;
+        /* Set the initial value */
+        palmas_gpio_set(gc, offset, value);
+        ret = palmas_update_bits(palmas, PALMAS_GPIO_BASE,
+                PALMAS_GPIO_DATA_DIR, BIT(offset), BIT(offset));
+        if (ret < 0)
+                dev_err(gc->dev, "GPIO_DATA_DIR write failed, err = %d\n", ret);
+        return ret;
+}
+static int palmas_gpio_input(struct gpio_chip *gc, unsigned offset)
+{
+        struct palmas_gpio *pg = to_palmas_gpio(gc);
+        struct palmas *palmas = pg->palmas;
+        int ret;
+        ret = palmas_update_bits(palmas, PALMAS_GPIO_BASE,
+                PALMAS_GPIO_DATA_DIR, BIT(offset), 0);
+        if (ret < 0)
+                dev_err(gc->dev, "GPIO_DATA_DIR write failed, err = %d\n", ret);
+        return ret;
+}
+static int palmas_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
+{
+        struct palmas_gpio *pg = to_palmas_gpio(gc);
+        struct palmas *palmas = pg->palmas;
+        return palmas_irq_get_virq(palmas, PALMAS_GPIO_0_IRQ + offset);
+}
+static int palmas_gpio_probe(struct platform_device *pdev)
+{
+        struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
+        struct palmas_platform_data *palmas_pdata;
+        struct palmas_gpio *palmas_gpio;
+        int ret;
+        palmas_gpio = devm_kzalloc(&pdev->dev,
+                                sizeof(*palmas_gpio), GFP_KERNEL);
+        if (!palmas_gpio) {
+                dev_err(&pdev->dev, "Could not allocate palmas_gpio\n");
+                return -ENOMEM;
+        }
+        palmas_gpio->palmas = palmas;
+        palmas_gpio->gpio_chip.owner = THIS_MODULE;
+        palmas_gpio->gpio_chip.label = dev_name(&pdev->dev);
+        palmas_gpio->gpio_chip.ngpio = 8;
+        palmas_gpio->gpio_chip.can_sleep = 1;
+        palmas_gpio->gpio_chip.direction_input = palmas_gpio_input;
+        palmas_gpio->gpio_chip.direction_output = palmas_gpio_output;
+        palmas_gpio->gpio_chip.to_irq = palmas_gpio_to_irq;
+        palmas_gpio->gpio_chip.set      = palmas_gpio_set;
+        palmas_gpio->gpio_chip.get      = palmas_gpio_get;
+        palmas_gpio->gpio_chip.dev = &pdev->dev;
+#ifdef CONFIG_OF_GPIO
+        palmas_gpio->gpio_chip.of_node = palmas->dev->of_node;
+#endif
+        palmas_pdata = dev_get_platdata(palmas->dev);
+        if (palmas_pdata && palmas_pdata->gpio_base)
+                palmas_gpio->gpio_chip.base = palmas_pdata->gpio_base;
+        else
+                palmas_gpio->gpio_chip.base = -1;
+        ret = gpiochip_add(&palmas_gpio->gpio_chip);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
+                return ret;
+        }
+        platform_set_drvdata(pdev, palmas_gpio);
+        return ret;
+}
+static int palmas_gpio_remove(struct platform_device *pdev)
+{
+        struct palmas_gpio *palmas_gpio = platform_get_drvdata(pdev);
+        return gpiochip_remove(&palmas_gpio->gpio_chip);
+}
+static struct platform_driver palmas_gpio_driver = {
+        .driver.name    = "palmas-gpio",
+        .driver.owner   = THIS_MODULE,
+        .probe          = palmas_gpio_probe,
+        .remove         = palmas_gpio_remove,
+};
+static int __init palmas_gpio_init(void)
+{
+        return platform_driver_register(&palmas_gpio_driver);
+}
+subsys_initcall(palmas_gpio_init);
+static void __exit palmas_gpio_exit(void)
+{
+        platform_driver_unregister(&palmas_gpio_driver);
+}
+module_exit(palmas_gpio_exit);
+MODULE_ALIAS("platform:palmas-gpio");
+MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
+MODULE_DESCRIPTION("GPIO driver for TI Palmas series PMICs");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index 1d1f1e5e33f0..046bcda36abe 100644
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -24,7 +24,7 @@ config DRM_EXYNOS_DMABUF
 config DRM_EXYNOS_FIMD
        bool "Exynos DRM FIMD"
-        depends on DRM_EXYNOS && !FB_S3C
+        depends on DRM_EXYNOS && !FB_S3C && !ARCH_MULTIPLATFORM
        help
          Choose this option if you want to use Exynos FIMD for DRM.
@@ -48,7 +48,7 @@ config DRM_EXYNOS_G2D
 config DRM_EXYNOS_IPP
        bool "Exynos DRM IPP"
-        depends on DRM_EXYNOS
+        depends on DRM_EXYNOS && !ARCH_MULTIPLATFORM
        help
          Choose this option if you want to use IPP feature for DRM.
diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c
index ab37437bad8a..4c5b6859c9ea 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_connector.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c
@@ -18,7 +18,6 @@
 #include "exynos_drm_drv.h"
 #include "exynos_drm_encoder.h"
-#define MAX_EDID 256
 #define to_exynos_connector(x)  container_of(x, struct exynos_drm_connector,\
                                drm_connector)
@@ -96,7 +95,9 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector)
                                        to_exynos_connector(connector);
        struct exynos_drm_manager *manager = exynos_connector->manager;
        struct exynos_drm_display_ops *display_ops = manager->display_ops;
-        unsigned int count;
+        struct edid *edid = NULL;
+        unsigned int count = 0;
+        int ret;
        DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -114,27 +115,21 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector)
         * because lcd panel has only one mode.
         */
        if (display_ops->get_edid) {
-                int ret;
+                edid = display_ops->get_edid(manager->dev, connector);
-                void *edid;
+                if (IS_ERR_OR_NULL(edid)) {
+                        ret = PTR_ERR(edid);
-                edid = kzalloc(MAX_EDID, GFP_KERNEL);
+                        edid = NULL;
-                if (!edid) {
+                        DRM_ERROR("Panel operation get_edid failed %d\n", ret);
-                        DRM_ERROR("failed to allocate edid\n");
+                        goto out;
-                        return 0;
                }
-                ret = display_ops->get_edid(manager->dev, connector,
+                count = drm_add_edid_modes(connector, edid);
-                                                edid, MAX_EDID);
+                if (count < 0) {
-                if (ret < 0) {
+                        DRM_ERROR("Add edid modes failed %d\n", count);
-                        DRM_ERROR("failed to get edid data.\n");
+                        goto out;
-                        kfree(edid);
-                        edid = NULL;
-                        return 0;
                }
                drm_mode_connector_update_edid_property(connector, edid);
-                count = drm_add_edid_modes(connector, edid);
-                kfree(edid);
        } else {
                struct exynos_drm_panel_info *panel;
                struct drm_display_mode *mode = drm_mode_create(connector->dev);
@@ -161,6 +156,8 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector)
                count = 1;
        }
+out:
+        kfree(edid);
        return count;
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
index 9df97714b6c0..ba0a3aa78547 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
@@ -19,6 +19,7 @@
 struct exynos_drm_dmabuf_attachment {
        struct sg_table sgt;
        enum dma_data_direction dir;
+        bool is_mapped;
 };
 static int exynos_gem_attach_dma_buf(struct dma_buf *dmabuf,
@@ -72,17 +73,10 @@ static struct sg_table *
        DRM_DEBUG_PRIME("%s\n", __FILE__);
-        if (WARN_ON(dir == DMA_NONE))
-                return ERR_PTR(-EINVAL);
        /* just return current sgt if already requested. */
-        if (exynos_attach->dir == dir)
+        if (exynos_attach->dir == dir && exynos_attach->is_mapped)
                return &exynos_attach->sgt;
-        /* reattaching is not allowed. */
-        if (WARN_ON(exynos_attach->dir != DMA_NONE))
-                return ERR_PTR(-EBUSY);
        buf = gem_obj->buffer;
        if (!buf) {
                DRM_ERROR("buffer is null.\n");
@@ -107,13 +101,17 @@ static struct sg_table *
                wr = sg_next(wr);
        }
-        nents = dma_map_sg(attach->dev, sgt->sgl, sgt->orig_nents, dir);
+        if (dir != DMA_NONE) {
-        if (!nents) {
+                nents = dma_map_sg(attach->dev, sgt->sgl, sgt->orig_nents, dir);
-                DRM_ERROR("failed to map sgl with iommu.\n");
+                if (!nents) {
-                sgt = ERR_PTR(-EIO);
+                        DRM_ERROR("failed to map sgl with iommu.\n");
-                goto err_unlock;
+                        sg_free_table(sgt);
+                        sgt = ERR_PTR(-EIO);
+                        goto err_unlock;
+                }
        }
+        exynos_attach->is_mapped = true;
        exynos_attach->dir = dir;
        attach->priv = exynos_attach;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index b9e51bc09e81..4606fac7241a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -148,8 +148,8 @@ struct exynos_drm_overlay {
 struct exynos_drm_display_ops {
        enum exynos_drm_output_type type;
        bool (*is_connected)(struct device *dev);
-        int (*get_edid)(struct device *dev, struct drm_connector *connector,
+        struct edid *(*get_edid)(struct device *dev,
-                                u8 *edid, int len);
+                        struct drm_connector *connector);
        void *(*get_panel)(struct device *dev);
        int (*check_timing)(struct device *dev, void *timing);
        int (*power_on)(struct device *dev, int mode);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 36c3905536a6..9a4c08e7453c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -324,7 +324,7 @@ out:
        g2d_userptr = NULL;
 }
-dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev,
+static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev,
                                        unsigned long userptr,
                                        unsigned long size,
                                        struct drm_file *filp,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
index 850e9950b7da..28644539b305 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c
@@ -108,18 +108,17 @@ static bool drm_hdmi_is_connected(struct device *dev)
        return false;
 }
-static int drm_hdmi_get_edid(struct device *dev,
+static struct edid *drm_hdmi_get_edid(struct device *dev,
-                struct drm_connector *connector, u8 *edid, int len)
+                        struct drm_connector *connector)
 {
        struct drm_hdmi_context *ctx = to_context(dev);
        DRM_DEBUG_KMS("%s\n", __FILE__);
        if (hdmi_ops && hdmi_ops->get_edid)
-                return hdmi_ops->get_edid(ctx->hdmi_ctx->ctx, connector, edid,
+                return hdmi_ops->get_edid(ctx->hdmi_ctx->ctx, connector);
-                                          len);
-        return 0;
+        return NULL;
 }
 static int drm_hdmi_check_timing(struct device *dev, void *timing)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h
index 784a7e9a766c..d80516fc9ed7 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h
@@ -30,8 +30,8 @@ struct exynos_drm_hdmi_context {
 struct exynos_hdmi_ops {
        /* display */
        bool (*is_connected)(void *ctx);
-        int (*get_edid)(void *ctx, struct drm_connector *connector,
+        struct edid *(*get_edid)(void *ctx,
-                        u8 *edid, int len);
+                        struct drm_connector *connector);
        int (*check_timing)(void *ctx, void *timing);
        int (*power_on)(void *ctx, int mode);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 0bda96454a02..1a556354e92f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -869,7 +869,7 @@ static void ipp_put_event(struct drm_exynos_ipp_cmd_node *c_node,
        }
 }
-void ipp_handle_cmd_work(struct device *dev,
+static void ipp_handle_cmd_work(struct device *dev,
                struct exynos_drm_ippdrv *ippdrv,
                struct drm_exynos_ipp_cmd_work *cmd_work,
                struct drm_exynos_ipp_cmd_node *c_node)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
index e9e83ef688f0..f976e29def6e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c
@@ -734,7 +734,7 @@ static int rotator_remove(struct platform_device *pdev)
        return 0;
 }
-struct rot_limit_table rot_limit_tbl = {
+static struct rot_limit_table rot_limit_tbl = {
        .ycbcr420_2p = {
                .min_w = 32,
                .min_h = 32,
@@ -751,7 +751,7 @@ struct rot_limit_table rot_limit_tbl = {
        },
 };
-struct platform_device_id rotator_driver_ids[] = {
+static struct platform_device_id rotator_driver_ids[] = {
        {
                .name           = "exynos-rot",
                .driver_data    = (unsigned long)&rot_limit_tbl,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index d0ca3c4e06c6..13ccbd4bcfaa 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -98,10 +98,12 @@ static bool vidi_display_is_connected(struct device *dev)
        return ctx->connected ? true : false;
 }
-static int vidi_get_edid(struct device *dev, struct drm_connector *connector,
+static struct edid *vidi_get_edid(struct device *dev,
-                                u8 *edid, int len)
+                        struct drm_connector *connector)
 {
        struct vidi_context *ctx = get_vidi_context(dev);
+        struct edid *edid;
+        int edid_len;
        DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -111,13 +113,18 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector,
         */
        if (!ctx->raw_edid) {
                DRM_DEBUG_KMS("raw_edid is null.\n");
-                return -EFAULT;
+                return ERR_PTR(-EFAULT);
        }
-        memcpy(edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions)
+        edid_len = (1 + ctx->raw_edid->extensions) * EDID_LENGTH;
-                                        * EDID_LENGTH, len));
+        edid = kzalloc(edid_len, GFP_KERNEL);
+        if (!edid) {
+                DRM_DEBUG_KMS("failed to allocate edid\n");
+                return ERR_PTR(-ENOMEM);
+        }
-        return 0;
+        memcpy(edid, ctx->raw_edid, edid_len);
+        return edid;
 }
 static void *vidi_get_panel(struct device *dev)
@@ -514,7 +521,6 @@ int vidi_connection_ioctl(struct drm_device *drm_dev, void *data,
        struct exynos_drm_manager *manager;
        struct exynos_drm_display_ops *display_ops;
        struct drm_exynos_vidi_connection *vidi = data;
-        struct edid *raw_edid;
        int edid_len;
        DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -551,11 +557,11 @@ int vidi_connection_ioctl(struct drm_device *drm_dev, void *data,
        }
        if (vidi->connection) {
-                if (!vidi->edid) {
+                struct edid *raw_edid  = (struct edid *)(uint32_t)vidi->edid;
-                        DRM_DEBUG_KMS("edid data is null.\n");
+                if (!drm_edid_is_valid(raw_edid)) {
+                        DRM_DEBUG_KMS("edid data is invalid.\n");
                        return -EINVAL;
                }
-                raw_edid = (struct edid *)(uint32_t)vidi->edid;
                edid_len = (1 + raw_edid->extensions) * EDID_LENGTH;
                ctx->raw_edid = kzalloc(edid_len, GFP_KERNEL);
                if (!ctx->raw_edid) {
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 41ff79d8ac8e..fbab3c468603 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -34,7 +34,6 @@
 #include <linux/regulator/consumer.h>
 #include <linux/io.h>
 #include <linux/of_gpio.h>
-#include <plat/gpio-cfg.h>
 #include <drm/exynos_drm.h>
@@ -98,8 +97,7 @@ struct hdmi_context {
        void __iomem                    *regs;
        void                            *parent_ctx;
-        int                             external_irq;
+        int                             irq;
-        int                             internal_irq;
        struct i2c_client               *ddc_port;
        struct i2c_client               *hdmiphy_port;
@@ -1391,8 +1389,7 @@ static bool hdmi_is_connected(void *ctx)
        return hdata->hpd;
 }
-static int hdmi_get_edid(void *ctx, struct drm_connector *connector,
+static struct edid *hdmi_get_edid(void *ctx, struct drm_connector *connector)
-                                u8 *edid, int len)
 {
        struct edid *raw_edid;
        struct hdmi_context *hdata = ctx;
@@ -1400,22 +1397,18 @@ static int hdmi_get_edid(void *ctx, struct drm_connector *connector,
        DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);
        if (!hdata->ddc_port)
-                return -ENODEV;
+                return ERR_PTR(-ENODEV);
        raw_edid = drm_get_edid(connector, hdata->ddc_port->adapter);
-        if (raw_edid) {
+        if (!raw_edid)
-                hdata->dvi_mode = !drm_detect_hdmi_monitor(raw_edid);
+                return ERR_PTR(-ENODEV);
-                memcpy(edid, raw_edid, min((1 + raw_edid->extensions)
-                                        * EDID_LENGTH, len));
-                DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n",
-                        (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
-                        raw_edid->width_cm, raw_edid->height_cm);
-                kfree(raw_edid);
-        } else {
-                return -ENODEV;
-        }
-        return 0;
+        hdata->dvi_mode = !drm_detect_hdmi_monitor(raw_edid);
+        DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n",
+                (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
+                raw_edid->width_cm, raw_edid->height_cm);
+        return raw_edid;
 }
 static int hdmi_v13_check_timing(struct fb_videomode *check_timing)
@@ -1652,16 +1645,16 @@ static void hdmi_conf_reset(struct hdmi_context *hdata)
        /* resetting HDMI core */
        hdmi_reg_writemask(hdata, reg,  0, HDMI_CORE_SW_RSTOUT);
-        mdelay(10);
+        usleep_range(10000, 12000);
        hdmi_reg_writemask(hdata, reg, ~0, HDMI_CORE_SW_RSTOUT);
-        mdelay(10);
+        usleep_range(10000, 12000);
 }
 static void hdmi_conf_init(struct hdmi_context *hdata)
 {
        struct hdmi_infoframe infoframe;
-        /* disable HPD interrupts */
+        /* disable HPD interrupts from HDMI IP block, use GPIO instead */
        hdmi_reg_writemask(hdata, HDMI_INTC_CON, 0, HDMI_INTC_EN_GLOBAL |
                HDMI_INTC_EN_HPD_PLUG | HDMI_INTC_EN_HPD_UNPLUG);
@@ -1779,7 +1772,7 @@ static void hdmi_v13_timing_apply(struct hdmi_context *hdata)
                u32 val = hdmi_reg_read(hdata, HDMI_V13_PHY_STATUS);
                if (val & HDMI_PHY_STATUS_READY)
                        break;
-                mdelay(1);
+                usleep_range(1000, 2000);
        }
        /* steady state not achieved */
        if (tries == 0) {
@@ -1946,7 +1939,7 @@ static void hdmi_v14_timing_apply(struct hdmi_context *hdata)
                u32 val = hdmi_reg_read(hdata, HDMI_PHY_STATUS_0);
                if (val & HDMI_PHY_STATUS_READY)
                        break;
-                mdelay(1);
+                usleep_range(1000, 2000);
        }
        /* steady state not achieved */
        if (tries == 0) {
@@ -1998,9 +1991,9 @@ static void hdmiphy_conf_reset(struct hdmi_context *hdata)
        /* reset hdmiphy */
        hdmi_reg_writemask(hdata, reg, ~0, HDMI_PHY_SW_RSTOUT);
-        mdelay(10);
+        usleep_range(10000, 12000);
        hdmi_reg_writemask(hdata, reg,  0, HDMI_PHY_SW_RSTOUT);
-        mdelay(10);
+        usleep_range(10000, 12000);
 }
 static void hdmiphy_poweron(struct hdmi_context *hdata)
@@ -2048,7 +2041,7 @@ static void hdmiphy_conf_apply(struct hdmi_context *hdata)
                return;
        }
-        mdelay(10);
+        usleep_range(10000, 12000);
        /* operation mode */
        operation[0] = 0x1f;
@@ -2170,6 +2163,13 @@ static void hdmi_commit(void *ctx)
        DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);
+        mutex_lock(&hdata->hdmi_mutex);
+        if (!hdata->powered) {
+                mutex_unlock(&hdata->hdmi_mutex);
+                return;
+        }
+        mutex_unlock(&hdata->hdmi_mutex);
        hdmi_conf_apply(hdata);
 }
@@ -2265,7 +2265,7 @@ static struct exynos_hdmi_ops hdmi_ops = {
        .dpms           = hdmi_dpms,
 };
-static irqreturn_t hdmi_external_irq_thread(int irq, void *arg)
+static irqreturn_t hdmi_irq_thread(int irq, void *arg)
 {
        struct exynos_drm_hdmi_context *ctx = arg;
        struct hdmi_context *hdata = ctx->ctx;
@@ -2280,31 +2280,6 @@ static irqreturn_t hdmi_external_irq_thread(int irq, void *arg)
        return IRQ_HANDLED;
 }
-static irqreturn_t hdmi_internal_irq_thread(int irq, void *arg)
-{
-        struct exynos_drm_hdmi_context *ctx = arg;
-        struct hdmi_context *hdata = ctx->ctx;
-        u32 intc_flag;
-        intc_flag = hdmi_reg_read(hdata, HDMI_INTC_FLAG);
-        /* clearing flags for HPD plug/unplug */
-        if (intc_flag & HDMI_INTC_FLAG_HPD_UNPLUG) {
-                DRM_DEBUG_KMS("unplugged\n");
-                hdmi_reg_writemask(hdata, HDMI_INTC_FLAG, ~0,
-                        HDMI_INTC_FLAG_HPD_UNPLUG);
-        }
-        if (intc_flag & HDMI_INTC_FLAG_HPD_PLUG) {
-                DRM_DEBUG_KMS("plugged\n");
-                hdmi_reg_writemask(hdata, HDMI_INTC_FLAG, ~0,
-                        HDMI_INTC_FLAG_HPD_PLUG);
-        }
-        if (ctx->drm_dev)
-                drm_helper_hpd_irq_event(ctx->drm_dev);
-        return IRQ_HANDLED;
-}
 static int hdmi_resources_init(struct hdmi_context *hdata)
 {
        struct device *dev = hdata->dev;
@@ -2555,39 +2530,24 @@ static int hdmi_probe(struct platform_device *pdev)
        hdata->hdmiphy_port = hdmi_hdmiphy;
-        hdata->external_irq = gpio_to_irq(hdata->hpd_gpio);
+        hdata->irq = gpio_to_irq(hdata->hpd_gpio);
-        if (hdata->external_irq < 0) {
+        if (hdata->irq < 0) {
-                DRM_ERROR("failed to get GPIO external irq\n");
+                DRM_ERROR("failed to get GPIO irq\n");
-                ret = hdata->external_irq;
+                ret = hdata->irq;
-                goto err_hdmiphy;
-        }
-        hdata->internal_irq = platform_get_irq(pdev, 0);
-        if (hdata->internal_irq < 0) {
-                DRM_ERROR("failed to get platform internal irq\n");
-                ret = hdata->internal_irq;
                goto err_hdmiphy;
        }
        hdata->hpd = gpio_get_value(hdata->hpd_gpio);
-        ret = request_threaded_irq(hdata->external_irq, NULL,
+        ret = request_threaded_irq(hdata->irq, NULL,
-                        hdmi_external_irq_thread, IRQF_TRIGGER_RISING |
+                        hdmi_irq_thread, IRQF_TRIGGER_RISING |
                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                        "hdmi_external", drm_hdmi_ctx);
+                        "hdmi", drm_hdmi_ctx);
        if (ret) {
-                DRM_ERROR("failed to register hdmi external interrupt\n");
+                DRM_ERROR("failed to register hdmi interrupt\n");
                goto err_hdmiphy;
        }
-        ret = request_threaded_irq(hdata->internal_irq, NULL,
-                        hdmi_internal_irq_thread, IRQF_ONESHOT,
-                        "hdmi_internal", drm_hdmi_ctx);
-        if (ret) {
-                DRM_ERROR("failed to register hdmi internal interrupt\n");
-                goto err_free_irq;
-        }
        /* Attach HDMI Driver to common hdmi. */
        exynos_hdmi_drv_attach(drm_hdmi_ctx);
@@ -2598,8 +2558,6 @@ static int hdmi_probe(struct platform_device *pdev)
        return 0;
-err_free_irq:
-        free_irq(hdata->external_irq, drm_hdmi_ctx);
 err_hdmiphy:
        i2c_del_driver(&hdmiphy_driver);
 err_ddc:
@@ -2617,8 +2575,7 @@ static int hdmi_remove(struct platform_device *pdev)
        pm_runtime_disable(dev);
-        free_irq(hdata->internal_irq, hdata);
+        free_irq(hdata->irq, hdata);
-        free_irq(hdata->external_irq, hdata);
        /* hdmiphy i2c driver */
@@ -2637,8 +2594,7 @@ static int hdmi_suspend(struct device *dev)
        DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);
-        disable_irq(hdata->internal_irq);
+        disable_irq(hdata->irq);
-        disable_irq(hdata->external_irq);
        hdata->hpd = false;
        if (ctx->drm_dev)
@@ -2663,8 +2619,7 @@ static int hdmi_resume(struct device *dev)
        hdata->hpd = gpio_get_value(hdata->hpd_gpio);
-        enable_irq(hdata->external_irq);
+        enable_irq(hdata->irq);
-        enable_irq(hdata->internal_irq);
        if (!pm_runtime_suspended(dev)) {
                DRM_DEBUG_KMS("%s : Already resumed\n", __func__);
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index c187ea33b748..c414584bfbae 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -600,7 +600,7 @@ static void vp_win_reset(struct mixer_context *ctx)
                /* waiting until VP_SRESET_PROCESSING is 0 */
                if (~vp_reg_read(res, VP_SRESET) & VP_SRESET_PROCESSING)
                        break;
-                mdelay(10);
+                usleep_range(10000, 12000);
        }
        WARN(tries == 0, "failed to reset Video Processor\n");
 }
@@ -776,6 +776,13 @@ static void mixer_win_commit(void *ctx, int win)
        DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win);
+        mutex_lock(&mixer_ctx->mixer_mutex);
+        if (!mixer_ctx->powered) {
+                mutex_unlock(&mixer_ctx->mixer_mutex);
+                return;
+        }
+        mutex_unlock(&mixer_ctx->mixer_mutex);
        if (win > 1 && mixer_ctx->vp_enabled)
                vp_video_buffer(mixer_ctx, win);
        else
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 7944d301518a..9d4a2c2adf0e 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -30,6 +30,7 @@
 #include <linux/debugfs.h>
 #include <linux/slab.h>
 #include <linux/export.h>
+#include <generated/utsrelease.h>
 #include <drm/drmP.h>
 #include "intel_drv.h"
 #include "intel_ringbuffer.h"
@@ -690,6 +691,7 @@ static int i915_error_state(struct seq_file *m, void *unused)
        seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
                   error->time.tv_usec);
+        seq_printf(m, "Kernel: " UTS_RELEASE);
        seq_printf(m, "PCI ID: 0x%04x\n", dev->pci_device);
        seq_printf(m, "EIR: 0x%08x\n", error->eir);
        seq_printf(m, "IER: 0x%08x\n", error->ier);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index b401788e1791..59afb7eb6db6 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -533,6 +533,7 @@
 #define MI_MODE         0x0209c
 # define VS_TIMER_DISPATCH                              (1 << 6)
 # define MI_FLUSH_ENABLE                                (1 << 12)
+# define ASYNC_FLIP_PERF_DISABLE                        (1 << 14)
 #define GEN6_GT_MODE    0x20d0
 #define   GEN6_GT_MODE_HI                               (1 << 9)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index ae253e04c391..42ff97d667d2 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -505,13 +505,25 @@ static int init_render_ring(struct intel_ring_buffer *ring)
        struct drm_i915_private *dev_priv = dev->dev_private;
        int ret = init_ring_common(ring);
-        if (INTEL_INFO(dev)->gen > 3) {
+        if (INTEL_INFO(dev)->gen > 3)
                I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(VS_TIMER_DISPATCH));
-                if (IS_GEN7(dev))
-                        I915_WRITE(GFX_MODE_GEN7,
+        /* We need to disable the AsyncFlip performance optimisations in order
-                                   _MASKED_BIT_DISABLE(GFX_TLB_INVALIDATE_ALWAYS) |
+         * to use MI_WAIT_FOR_EVENT within the CS. It should already be
-                                   _MASKED_BIT_ENABLE(GFX_REPLAY_MODE));
+         * programmed to '1' on all products.
-        }
+         */
+        if (INTEL_INFO(dev)->gen >= 6)
+                I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE));
+        /* Required for the hardware to program scanline values for waiting */
+        if (INTEL_INFO(dev)->gen == 6)
+                I915_WRITE(GFX_MODE,
+                           _MASKED_BIT_ENABLE(GFX_TLB_INVALIDATE_ALWAYS));
+        if (IS_GEN7(dev))
+                I915_WRITE(GFX_MODE_GEN7,
+                           _MASKED_BIT_DISABLE(GFX_TLB_INVALIDATE_ALWAYS) |
+                           _MASKED_BIT_ENABLE(GFX_REPLAY_MODE));
        if (INTEL_INFO(dev)->gen >= 5) {
                ret = init_pipe_control(ring);
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 59acabb45c9b..835992d8d067 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1216,7 +1216,7 @@ void cayman_dma_stop(struct radeon_device *rdev)
 int cayman_dma_resume(struct radeon_device *rdev)
 {
        struct radeon_ring *ring;
-        u32 rb_cntl, dma_cntl;
+        u32 rb_cntl, dma_cntl, ib_cntl;
        u32 rb_bufsz;
        u32 reg_offset, wb_offset;
        int i, r;
@@ -1265,7 +1265,11 @@ int cayman_dma_resume(struct radeon_device *rdev)
                WREG32(DMA_RB_BASE + reg_offset, ring->gpu_addr >> 8);
                /* enable DMA IBs */
-                WREG32(DMA_IB_CNTL + reg_offset, DMA_IB_ENABLE | CMD_VMID_FORCE);
+                ib_cntl = DMA_IB_ENABLE | CMD_VMID_FORCE;
+#ifdef __BIG_ENDIAN
+                ib_cntl |= DMA_IB_SWAP_ENABLE;
+#endif
+                WREG32(DMA_IB_CNTL + reg_offset, ib_cntl);
                dma_cntl = RREG32(DMA_CNTL + reg_offset);
                dma_cntl &= ~CTXEMPTY_INT_ENABLE;
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 3cb9d6089373..bc2540b17c5e 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2313,7 +2313,7 @@ void r600_dma_stop(struct radeon_device *rdev)
 int r600_dma_resume(struct radeon_device *rdev)
 {
        struct radeon_ring *ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX];
-        u32 rb_cntl, dma_cntl;
+        u32 rb_cntl, dma_cntl, ib_cntl;
        u32 rb_bufsz;
        int r;
@@ -2353,7 +2353,11 @@ int r600_dma_resume(struct radeon_device *rdev)
        WREG32(DMA_RB_BASE, ring->gpu_addr >> 8);
        /* enable DMA IBs */
-        WREG32(DMA_IB_CNTL, DMA_IB_ENABLE);
+        ib_cntl = DMA_IB_ENABLE;
+#ifdef __BIG_ENDIAN
+        ib_cntl |= DMA_IB_SWAP_ENABLE;
+#endif
+        WREG32(DMA_IB_CNTL, ib_cntl);
        dma_cntl = RREG32(DMA_CNTL);
        dma_cntl &= ~CTXEMPTY_INT_ENABLE;
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 469661fd1903..5407459e56d2 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -286,6 +286,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)
                            p->chunks[p->chunk_ib_idx].kpage[1] == NULL) {
                                kfree(p->chunks[p->chunk_ib_idx].kpage[0]);
                                kfree(p->chunks[p->chunk_ib_idx].kpage[1]);
+                                p->chunks[p->chunk_ib_idx].kpage[0] = NULL;
+                                p->chunks[p->chunk_ib_idx].kpage[1] = NULL;
                                return -ENOMEM;
                        }
                }
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
index ad6df625e8b8..0d67674b64b1 100644
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
@@ -241,7 +241,8 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,
                y = 0;
        }
-        if (ASIC_IS_AVIVO(rdev)) {
+        /* fixed on DCE6 and newer */
+        if (ASIC_IS_AVIVO(rdev) && !ASIC_IS_DCE6(rdev)) {
                int i = 0;
                struct drm_crtc *crtc_p;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index edfc54e41842..0d6562bb0c93 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -429,7 +429,8 @@ bool radeon_card_posted(struct radeon_device *rdev)
 {
        uint32_t reg;
-        if (efi_enabled && rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE)
+        if (efi_enabled(EFI_BOOT) &&
+            rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE)
                return false;
        /* first check CRTCs */
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 1da2386d7cf7..ff3def784619 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1122,7 +1122,7 @@ radeon_user_framebuffer_create(struct drm_device *dev,
        if (ret) {
                kfree(radeon_fb);
                drm_gem_object_unreference_unlocked(obj);
-                return NULL;
+                return ERR_PTR(ret);
        }
        return &radeon_fb->base;
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 4dfa605e2d14..34e25471aeaa 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -306,6 +306,9 @@
 #define USB_VENDOR_ID_EZKEY             0x0518
 #define USB_DEVICE_ID_BTC_8193          0x0002
+#define USB_VENDOR_ID_FORMOSA          0x147a
+#define USB_DEVICE_ID_FORMOSA_IR_RECEIVER      0xe03e
 #define USB_VENDOR_ID_FREESCALE         0x15A2
 #define USB_DEVICE_ID_FREESCALE_MX28    0x004F
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index 12e4fdc810bf..e766b5614ef5 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -540,13 +540,24 @@ static int i2c_hid_output_raw_report(struct hid_device *hid, __u8 *buf,
 {
        struct i2c_client *client = hid->driver_data;
        int report_id = buf[0];
+        int ret;
        if (report_type == HID_INPUT_REPORT)
                return -EINVAL;
-        return i2c_hid_set_report(client,
+        if (report_id) {
+                buf++;
+                count--;
+        }
+        ret = i2c_hid_set_report(client,
                                report_type == HID_FEATURE_REPORT ? 0x03 : 0x02,
                                report_id, buf, count);
+        if (report_id && ret >= 0)
+                ret++; /* add report_id to the number of transfered bytes */
+        return ret;
 }
 static int i2c_hid_parse(struct hid_device *hid)
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index ac9e35228254..e0e6abf1cd3b 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -70,6 +70,7 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS },
diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c
index 369a39de4ff3..f9179b2585a9 100644
--- a/drivers/input/misc/max8925_onkey.c
+++ b/drivers/input/misc/max8925_onkey.c
@@ -100,9 +100,6 @@ static int max8925_onkey_probe(struct platform_device *pdev)
        input->dev.parent = &pdev->dev;
        input_set_capability(input, EV_KEY, KEY_POWER);
-        irq[0] += chip->irq_base;
-        irq[1] += chip->irq_base;
        error = request_threaded_irq(irq[0], NULL, max8925_onkey_handler,
                                     IRQF_ONESHOT, "onkey-down", info);
        if (error < 0) {
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 81837b0710a9..faf10ba1ed9a 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -975,6 +975,38 @@ static void __init free_iommu_all(void)
 }
 /*
+ * Family15h Model 10h-1fh erratum 746 (IOMMU Logging May Stall Translations)
+ * Workaround:
+ *     BIOS should disable L2B micellaneous clock gating by setting
+ *     L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b
+ */
+static void __init amd_iommu_erratum_746_workaround(struct amd_iommu *iommu)
+{
+        u32 value;
+        if ((boot_cpu_data.x86 != 0x15) ||
+            (boot_cpu_data.x86_model < 0x10) ||
+            (boot_cpu_data.x86_model > 0x1f))
+                return;
+        pci_write_config_dword(iommu->dev, 0xf0, 0x90);
+        pci_read_config_dword(iommu->dev, 0xf4, &value);
+        if (value & BIT(2))
+                return;
+        /* Select NB indirect register 0x90 and enable writing */
+        pci_write_config_dword(iommu->dev, 0xf0, 0x90 | (1 << 8));
+        pci_write_config_dword(iommu->dev, 0xf4, value | 0x4);
+        pr_info("AMD-Vi: Applying erratum 746 workaround for IOMMU at %s\n",
+                dev_name(&iommu->dev->dev));
+        /* Clear the enable writing bit */
+        pci_write_config_dword(iommu->dev, 0xf0, 0x90);
+}
+/*
 * This function clues the initialization function for one IOMMU
 * together and also allocates the command buffer and programs the
 * hardware. It does NOT enable the IOMMU. This is done afterwards.
@@ -1172,6 +1204,8 @@ static int iommu_init_pci(struct amd_iommu *iommu)
                        iommu->stored_l2[i] = iommu_read_l2(iommu, i);
        }
+        amd_iommu_erratum_746_workaround(iommu);
        return pci_enable_device(iommu->dev);
 }
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index b9d091157884..eca28014ef3e 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4234,6 +4234,21 @@ static struct iommu_ops intel_iommu_ops = {
        .pgsize_bitmap  = INTEL_IOMMU_PGSIZES,
 };
+static void quirk_iommu_g4x_gfx(struct pci_dev *dev)
+{
+        /* G4x/GM45 integrated gfx dmar support is totally busted. */
+        printk(KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n");
+        dmar_map_gfx = 0;
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_g4x_gfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_g4x_gfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e10, quirk_iommu_g4x_gfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e20, quirk_iommu_g4x_gfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e30, quirk_iommu_g4x_gfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e40, quirk_iommu_g4x_gfx);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e90, quirk_iommu_g4x_gfx);
 static void quirk_iommu_rwbf(struct pci_dev *dev)
 {
        /*
@@ -4242,12 +4257,6 @@ static void quirk_iommu_rwbf(struct pci_dev *dev)
         */
        printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n");
        rwbf_quirk = 1;
-        /* https://bugzilla.redhat.com/show_bug.cgi?id=538163 */
-        if (dev->revision == 0x07) {
-                printk(KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n");
-                dmar_map_gfx = 0;
-        }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index 68452b768da2..03a0a01a4054 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -248,6 +248,8 @@ static inline void dump_rawmsg(enum debuglevel level, const char *tag,
                CAPIMSG_APPID(data), CAPIMSG_MSGID(data), l,
                CAPIMSG_CONTROL(data));
        l -= 12;
+        if (l <= 0)
+                return;
        dbgline = kmalloc(3 * l, GFP_ATOMIC);
        if (!dbgline)
                return;
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 3d8984edeff7..9e58dbd8d8cb 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -340,24 +340,22 @@ static int validate_region_size(struct raid_set *rs, unsigned long region_size)
 }
 /*
- * validate_rebuild_devices
+ * validate_raid_redundancy
 * @rs
 *
- * Determine if the devices specified for rebuild can result in a valid
+ * Determine if there are enough devices in the array that haven't
- * usable array that is capable of rebuilding the given devices.
+ * failed (or are being rebuilt) to form a usable array.
 *
 * Returns: 0 on success, -EINVAL on failure.
 */
-static int validate_rebuild_devices(struct raid_set *rs)
+static int validate_raid_redundancy(struct raid_set *rs)
 {
        unsigned i, rebuild_cnt = 0;
        unsigned rebuilds_per_group, copies, d;
-        if (!(rs->print_flags & DMPF_REBUILD))
-                return 0;
        for (i = 0; i < rs->md.raid_disks; i++)
-                if (!test_bit(In_sync, &rs->dev[i].rdev.flags))
+                if (!test_bit(In_sync, &rs->dev[i].rdev.flags) ||
+                    !rs->dev[i].rdev.sb_page)
                        rebuild_cnt++;
        switch (rs->raid_type->level) {
@@ -393,27 +391,24 @@ static int validate_rebuild_devices(struct raid_set *rs)
                 *          A    A    B    B    C
                 *          C    D    D    E    E
                 */
-                rebuilds_per_group = 0;
                for (i = 0; i < rs->md.raid_disks * copies; i++) {
+                        if (!(i % copies))
+                                rebuilds_per_group = 0;
                        d = i % rs->md.raid_disks;
-                        if (!test_bit(In_sync, &rs->dev[d].rdev.flags) &&
+                        if ((!rs->dev[d].rdev.sb_page ||
+                             !test_bit(In_sync, &rs->dev[d].rdev.flags)) &&
                            (++rebuilds_per_group >= copies))
                                goto too_many;
-                        if (!((i + 1) % copies))
-                                rebuilds_per_group = 0;
                }
                break;
        default:
-                DMERR("The rebuild parameter is not supported for %s",
+                if (rebuild_cnt)
-                      rs->raid_type->name);
+                        return -EINVAL;
-                rs->ti->error = "Rebuild not supported for this RAID type";
-                return -EINVAL;
        }
        return 0;
 too_many:
-        rs->ti->error = "Too many rebuild devices specified";
        return -EINVAL;
 }
@@ -664,9 +659,6 @@ static int parse_raid_params(struct raid_set *rs, char **argv,
        }
        rs->md.dev_sectors = sectors_per_dev;
-        if (validate_rebuild_devices(rs))
-                return -EINVAL;
        /* Assume there are no metadata devices until the drives are parsed */
        rs->md.persistent = 0;
        rs->md.external = 1;
@@ -995,28 +987,10 @@ static int super_validate(struct mddev *mddev, struct md_rdev *rdev)
 static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs)
 {
        int ret;
-        unsigned redundancy = 0;
        struct raid_dev *dev;
        struct md_rdev *rdev, *tmp, *freshest;
        struct mddev *mddev = &rs->md;
-        switch (rs->raid_type->level) {
-        case 1:
-                redundancy = rs->md.raid_disks - 1;
-                break;
-        case 4:
-        case 5:
-        case 6:
-                redundancy = rs->raid_type->parity_devs;
-                break;
-        case 10:
-                redundancy = raid10_md_layout_to_copies(mddev->layout) - 1;
-                break;
-        default:
-                ti->error = "Unknown RAID type";
-                return -EINVAL;
-        }
        freshest = NULL;
        rdev_for_each_safe(rdev, tmp, mddev) {
                /*
@@ -1045,44 +1019,43 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs)
                        break;
                default:
                        dev = container_of(rdev, struct raid_dev, rdev);
-                        if (redundancy--) {
+                        if (dev->meta_dev)
-                                if (dev->meta_dev)
+                                dm_put_device(ti, dev->meta_dev);
-                                        dm_put_device(ti, dev->meta_dev);
-                                dev->meta_dev = NULL;
-                                rdev->meta_bdev = NULL;
-                                if (rdev->sb_page)
+                        dev->meta_dev = NULL;
-                                        put_page(rdev->sb_page);
+                        rdev->meta_bdev = NULL;
-                                rdev->sb_page = NULL;
+                        if (rdev->sb_page)
+                                put_page(rdev->sb_page);
-                                rdev->sb_loaded = 0;
+                        rdev->sb_page = NULL;
-                                /*
+                        rdev->sb_loaded = 0;
-                                 * We might be able to salvage the data device
-                                 * even though the meta device has failed.  For
-                                 * now, we behave as though '- -' had been
-                                 * set for this device in the table.
-                                 */
-                                if (dev->data_dev)
-                                        dm_put_device(ti, dev->data_dev);
-                                dev->data_dev = NULL;
+                        /*
-                                rdev->bdev = NULL;
+                         * We might be able to salvage the data device
+                         * even though the meta device has failed.  For
+                         * now, we behave as though '- -' had been
+                         * set for this device in the table.
+                         */
+                        if (dev->data_dev)
+                                dm_put_device(ti, dev->data_dev);
-                                list_del(&rdev->same_set);
+                        dev->data_dev = NULL;
+                        rdev->bdev = NULL;
-                                continue;
+                        list_del(&rdev->same_set);
-                        }
-                        ti->error = "Failed to load superblock";
-                        return ret;
                }
        }
        if (!freshest)
                return 0;
+        if (validate_raid_redundancy(rs)) {
+                rs->ti->error = "Insufficient redundancy to activate array";
+                return -EINVAL;
+        }
        /*
         * Validation of the freshest device provides the source of
         * validation for the remaining devices.
@@ -1432,7 +1405,7 @@ static void raid_resume(struct dm_target *ti)
 static struct target_type raid_target = {
        .name = "raid",
-        .version = {1, 4, 0},
+        .version = {1, 4, 1},
        .module = THIS_MODULE,
        .ctr = raid_ctr,
        .dtr = raid_dtr,
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 675ae5274016..5409607d4875 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -2746,19 +2746,9 @@ static int thin_iterate_devices(struct dm_target *ti,
        return 0;
 }
-/*
- * A thin device always inherits its queue limits from its pool.
- */
-static void thin_io_hints(struct dm_target *ti, struct queue_limits *limits)
-{
-        struct thin_c *tc = ti->private;
-        *limits = bdev_get_queue(tc->pool_dev->bdev)->limits;
-}
 static struct target_type thin_target = {
        .name = "thin",
-        .version = {1, 6, 0},
+        .version = {1, 7, 0},
        .module = THIS_MODULE,
        .ctr = thin_ctr,
        .dtr = thin_dtr,
@@ -2767,7 +2757,6 @@ static struct target_type thin_target = {
        .postsuspend = thin_postsuspend,
        .status = thin_status,
        .iterate_devices = thin_iterate_devices,
-        .io_hints = thin_io_hints,
 };
 /*----------------------------------------------------------------*/
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index c72e4d5a9617..314a0e2faf79 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1188,6 +1188,7 @@ static int __clone_and_map_changing_extent_only(struct clone_info *ci,
 {
        struct dm_target *ti;
        sector_t len;
+        unsigned num_requests;
        do {
                ti = dm_table_find_target(ci->map, ci->sector);
@@ -1200,7 +1201,8 @@ static int __clone_and_map_changing_extent_only(struct clone_info *ci,
                 * reconfiguration might also have changed that since the
                 * check was performed.
                 */
-                if (!get_num_requests || !get_num_requests(ti))
+                num_requests = get_num_requests ? get_num_requests(ti) : 0;
+                if (!num_requests)
                        return -EOPNOTSUPP;
                if (is_split_required && !is_split_required(ti))
@@ -1208,7 +1210,7 @@ static int __clone_and_map_changing_extent_only(struct clone_info *ci,
                else
                        len = min(ci->sector_count, max_io_len(ci->sector, ti));
-                __issue_target_requests(ci, ti, ti->num_discard_requests, len);
+                __issue_target_requests(ci, ti, num_requests, len);
                ci->sector += len;
        } while (ci->sector_count -= len);
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index 391e23e6a647..582bda543520 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -531,7 +531,7 @@ static int pm800_probe(struct i2c_client *client,
        ret = device_800_init(chip, pdata);
        if (ret) {
                dev_err(chip->dev, "%s id 0x%x failed!\n", __func__, chip->id);
-                goto err_800_init;
+                goto err_subchip_alloc;
        }
        ret = pm800_pages_init(chip);
@@ -546,10 +546,8 @@ static int pm800_probe(struct i2c_client *client,
 err_page_init:
        mfd_remove_devices(chip->dev);
        device_irq_exit_800(chip);
-err_800_init:
-        devm_kfree(&client->dev, subchip);
 err_subchip_alloc:
-        pm80x_deinit(client);
+        pm80x_deinit();
 out_init:
        return ret;
 }
@@ -562,9 +560,7 @@ static int pm800_remove(struct i2c_client *client)
        device_irq_exit_800(chip);
        pm800_pages_exit(chip);
-        devm_kfree(&client->dev, chip->subchip);
+        pm80x_deinit();
-        pm80x_deinit(client);
        return 0;
 }
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index e671230be2b1..65d7ac099b20 100644
--- a/drivers/mfd/88pm805.c
+++ b/drivers/mfd/88pm805.c
@@ -257,7 +257,7 @@ static int pm805_probe(struct i2c_client *client,
                pdata->plat_config(chip, pdata);
 err_805_init:
-        pm80x_deinit(client);
+        pm80x_deinit();
 out_init:
        return ret;
 }
@@ -269,7 +269,7 @@ static int pm805_remove(struct i2c_client *client)
        mfd_remove_devices(chip->dev);
        device_irq_exit_805(chip);
-        pm80x_deinit(client);
+        pm80x_deinit();
        return 0;
 }
diff --git a/drivers/mfd/88pm80x.c b/drivers/mfd/88pm80x.c
index 1adb355d86d1..f736a46eb8c0 100644
--- a/drivers/mfd/88pm80x.c
+++ b/drivers/mfd/88pm80x.c
@@ -48,14 +48,12 @@ int pm80x_init(struct i2c_client *client,
                ret = PTR_ERR(map);
                dev_err(&client->dev, "Failed to allocate register map: %d\n",
                        ret);
-                goto err_regmap_init;
+                return ret;
        }
        chip->id = id->driver_data;
-        if (chip->id < CHIP_PM800 || chip->id > CHIP_PM805) {
+        if (chip->id < CHIP_PM800 || chip->id > CHIP_PM805)
-                ret = -EINVAL;
+                return -EINVAL;
-                goto err_chip_id;
-        }
        chip->client = client;
        chip->regmap = map;
@@ -82,19 +80,11 @@ int pm80x_init(struct i2c_client *client,
        }
        return 0;
-err_chip_id:
-        regmap_exit(map);
-err_regmap_init:
-        devm_kfree(&client->dev, chip);
-        return ret;
 }
 EXPORT_SYMBOL_GPL(pm80x_init);
-int pm80x_deinit(struct i2c_client *client)
+int pm80x_deinit(void)
 {
-        struct pm80x_chip *chip = i2c_get_clientdata(client);
        /*
         * workaround: clear the dependency between pm800 and pm805.
         * would remove it after HW chip fixes the issue.
@@ -103,10 +93,6 @@ int pm80x_deinit(struct i2c_client *client)
                g_pm80x_chip->companion = NULL;
        else
                g_pm80x_chip = NULL;
-        regmap_exit(chip->regmap);
-        devm_kfree(&client->dev, chip);
        return 0;
 }
 EXPORT_SYMBOL_GPL(pm80x_deinit);
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 47ad4e270877..ff553babf455 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -237,6 +237,7 @@ config MFD_TPS65910
        depends on I2C=y && GPIOLIB
        select MFD_CORE
        select REGMAP_I2C
+        select REGMAP_IRQ
        select IRQ_DOMAIN
        help
          if you say yes here you get support for the TPS65910 series of
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 8b977f8045ae..b90409c23664 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_MFD_88PM805)	+= 88pm805.o 88pm80x.o
 obj-$(CONFIG_MFD_SM501)         += sm501.o
 obj-$(CONFIG_MFD_ASIC3)         += asic3.o tmio_core.o
-rtsx_pci-objs                   := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o
+rtsx_pci-objs                   := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o
 obj-$(CONFIG_MFD_RTSX_PCI)      += rtsx_pci.o
 obj-$(CONFIG_HTC_EGPIO)         += htc-egpio.o
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 05a7af4b9768..104514228b74 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -19,6 +19,7 @@
 #include <linux/mfd/core.h>
 #include <linux/mfd/abx500.h>
 #include <linux/mfd/abx500/ab8500.h>
+#include <linux/mfd/abx500/ab8500-bm.h>
 #include <linux/mfd/dbx500-prcmu.h>
 #include <linux/regulator/ab8500.h>
 #include <linux/of.h>
@@ -924,7 +925,7 @@ static struct resource ab8505_iddet_resources[] = {
 static struct resource ab8500_temp_resources[] = {
        {
-                .name  = "AB8500_TEMP_WARM",
+                .name  = "ABX500_TEMP_WARM",
                .start = AB8500_INT_TEMP_WARM,
                .end   = AB8500_INT_TEMP_WARM,
                .flags = IORESOURCE_IRQ,
@@ -1000,8 +1001,8 @@ static struct mfd_cell abx500_common_devs[] = {
                .of_compatible = "stericsson,ab8500-denc",
        },
        {
-                .name = "ab8500-temp",
+                .name = "abx500-temp",
-                .of_compatible = "stericsson,ab8500-temp",
+                .of_compatible = "stericsson,abx500-temp",
                .num_resources = ARRAY_SIZE(ab8500_temp_resources),
                .resources = ab8500_temp_resources,
        },
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index bc8a3edb6bbf..b562c7bf8a46 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -115,7 +115,7 @@ static irqreturn_t arizona_underclocked(int irq, void *data)
        if (val & ARIZONA_ADC_UNDERCLOCKED_STS)
                dev_err(arizona->dev, "ADC underclocked\n");
        if (val & ARIZONA_MIXER_UNDERCLOCKED_STS)
-                dev_err(arizona->dev, "Mixer underclocked\n");
+                dev_err(arizona->dev, "Mixer dropped sample\n");
        return IRQ_HANDLED;
 }
@@ -239,7 +239,12 @@ static int arizona_runtime_resume(struct device *dev)
                return ret;
        }
-        regcache_sync(arizona->regmap);
+        ret = regcache_sync(arizona->regmap);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to restore register cache\n");
+                regulator_disable(arizona->dcvdd);
+                return ret;
+        }
        return 0;
 }
@@ -258,10 +263,36 @@ static int arizona_runtime_suspend(struct device *dev)
 }
 #endif
+#ifdef CONFIG_PM_SLEEP
+static int arizona_resume_noirq(struct device *dev)
+{
+        struct arizona *arizona = dev_get_drvdata(dev);
+        dev_dbg(arizona->dev, "Early resume, disabling IRQ\n");
+        disable_irq(arizona->irq);
+        return 0;
+}
+static int arizona_resume(struct device *dev)
+{
+        struct arizona *arizona = dev_get_drvdata(dev);
+        dev_dbg(arizona->dev, "Late resume, reenabling IRQ\n");
+        enable_irq(arizona->irq);
+        return 0;
+}
+#endif
 const struct dev_pm_ops arizona_pm_ops = {
        SET_RUNTIME_PM_OPS(arizona_runtime_suspend,
                           arizona_runtime_resume,
                           NULL)
+        SET_SYSTEM_SLEEP_PM_OPS(NULL, arizona_resume)
+#ifdef CONFIG_PM_SLEEP
+        .resume_noirq = arizona_resume_noirq,
+#endif
 };
 EXPORT_SYMBOL_GPL(arizona_pm_ops);
@@ -270,19 +301,19 @@ static struct mfd_cell early_devs[] = {
 };
 static struct mfd_cell wm5102_devs[] = {
+        { .name = "arizona-micsupp" },
        { .name = "arizona-extcon" },
        { .name = "arizona-gpio" },
        { .name = "arizona-haptics" },
-        { .name = "arizona-micsupp" },
        { .name = "arizona-pwm" },
        { .name = "wm5102-codec" },
 };
 static struct mfd_cell wm5110_devs[] = {
+        { .name = "arizona-micsupp" },
        { .name = "arizona-extcon" },
        { .name = "arizona-gpio" },
        { .name = "arizona-haptics" },
-        { .name = "arizona-micsupp" },
        { .name = "arizona-pwm" },
        { .name = "wm5110-codec" },
 };
@@ -479,6 +510,29 @@ int arizona_dev_init(struct arizona *arizona)
                goto err_reset;
        }
+        for (i = 0; i < ARIZONA_MAX_MICBIAS; i++) {
+                if (!arizona->pdata.micbias[i].mV)
+                        continue;
+                val = (arizona->pdata.micbias[i].mV - 1500) / 100;
+                val <<= ARIZONA_MICB1_LVL_SHIFT;
+                if (arizona->pdata.micbias[i].ext_cap)
+                        val |= ARIZONA_MICB1_EXT_CAP;
+                if (arizona->pdata.micbias[i].discharge)
+                        val |= ARIZONA_MICB1_DISCH;
+                if (arizona->pdata.micbias[i].fast_start)
+                        val |= ARIZONA_MICB1_RATE;
+                regmap_update_bits(arizona->regmap,
+                                   ARIZONA_MIC_BIAS_CTRL_1 + i,
+                                   ARIZONA_MICB1_LVL_MASK |
+                                   ARIZONA_MICB1_DISCH |
+                                   ARIZONA_MICB1_RATE, val);
+        }
        for (i = 0; i < ARIZONA_MAX_INPUT; i++) {
                /* Default for both is 0 so noop with defaults */
                val = arizona->pdata.dmic_ref[i]
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
index 74713bf5371f..2bec5f0db3ee 100644
--- a/drivers/mfd/arizona-irq.c
+++ b/drivers/mfd/arizona-irq.c
@@ -176,14 +176,7 @@ int arizona_irq_init(struct arizona *arizona)
                aod = &wm5102_aod;
                irq = &wm5102_irq;
-                switch (arizona->rev) {
+                ctrlif_error = false;
-                case 0:
-                case 1:
-                        ctrlif_error = false;
-                        break;
-                default:
-                        break;
-                }
                break;
 #endif
 #ifdef CONFIG_MFD_WM5110
@@ -191,14 +184,7 @@ int arizona_irq_init(struct arizona *arizona)
                aod = &wm5110_aod;
                irq = &wm5110_irq;
-                switch (arizona->rev) {
+                ctrlif_error = false;
-                case 0:
-                case 1:
-                        ctrlif_error = false;
-                        break;
-                default:
-                        break;
-                }
                break;
 #endif
        default:
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index ac74a4d1daea..885e56780358 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -27,6 +27,66 @@
 #include <linux/of_device.h>
 #endif
+/* I2C safe register check */
+static inline bool i2c_safe_reg(unsigned char reg)
+{
+        switch (reg) {
+        case DA9052_STATUS_A_REG:
+        case DA9052_STATUS_B_REG:
+        case DA9052_STATUS_C_REG:
+        case DA9052_STATUS_D_REG:
+        case DA9052_ADC_RES_L_REG:
+        case DA9052_ADC_RES_H_REG:
+        case DA9052_VDD_RES_REG:
+        case DA9052_ICHG_AV_REG:
+        case DA9052_TBAT_RES_REG:
+        case DA9052_ADCIN4_RES_REG:
+        case DA9052_ADCIN5_RES_REG:
+        case DA9052_ADCIN6_RES_REG:
+        case DA9052_TJUNC_RES_REG:
+        case DA9052_TSI_X_MSB_REG:
+        case DA9052_TSI_Y_MSB_REG:
+        case DA9052_TSI_LSB_REG:
+        case DA9052_TSI_Z_MSB_REG:
+                return true;
+        default:
+                return false;
+        }
+}
+/*
+ * There is an issue with DA9052 and DA9053_AA/BA/BB PMIC where the PMIC
+ * gets lockup up or fails to respond following a system reset.
+ * This fix is to follow any read or write with a dummy read to a safe
+ * register.
+ */
+int da9052_i2c_fix(struct da9052 *da9052, unsigned char reg)
+{
+        int val;
+        switch (da9052->chip_id) {
+        case DA9052:
+        case DA9053_AA:
+        case DA9053_BA:
+        case DA9053_BB:
+                /* A dummy read to a safe register address. */
+        if (!i2c_safe_reg(reg))
+                        return regmap_read(da9052->regmap,
+                                           DA9052_PARK_REGISTER,
+                                           &val);
+                break;
+        default:
+                /*
+                 * For other chips parking of I2C register
+                 * to a safe place is not required.
+                 */
+                break;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(da9052_i2c_fix);
 static int da9052_i2c_enable_multiwrite(struct da9052 *da9052)
 {
        int reg_val, ret;
@@ -83,6 +143,7 @@ static int da9052_i2c_probe(struct i2c_client *client,
        da9052->dev = &client->dev;
        da9052->chip_irq = client->irq;
+        da9052->fix_io = da9052_i2c_fix;
        i2c_set_clientdata(client, da9052);
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index dc8826d8d69d..e42a417adc5f 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -32,6 +32,7 @@
 #include <linux/regulator/db8500-prcmu.h>
 #include <linux/regulator/machine.h>
 #include <linux/cpufreq.h>
+#include <linux/platform_data/ux500_wdt.h>
 #include <asm/hardware/gic.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>
@@ -2212,21 +2213,25 @@ int db8500_prcmu_config_a9wdog(u8 num, bool sleep_auto_off)
                            sleep_auto_off ? A9WDOG_AUTO_OFF_EN :
                            A9WDOG_AUTO_OFF_DIS);
 }
+EXPORT_SYMBOL(db8500_prcmu_config_a9wdog);
 int db8500_prcmu_enable_a9wdog(u8 id)
 {
        return prcmu_a9wdog(MB4H_A9WDOG_EN, id, 0, 0, 0);
 }
+EXPORT_SYMBOL(db8500_prcmu_enable_a9wdog);
 int db8500_prcmu_disable_a9wdog(u8 id)
 {
        return prcmu_a9wdog(MB4H_A9WDOG_DIS, id, 0, 0, 0);
 }
+EXPORT_SYMBOL(db8500_prcmu_disable_a9wdog);
 int db8500_prcmu_kick_a9wdog(u8 id)
 {
        return prcmu_a9wdog(MB4H_A9WDOG_KICK, id, 0, 0, 0);
 }
+EXPORT_SYMBOL(db8500_prcmu_kick_a9wdog);
 /*
 * timeout is 28 bit, in ms.
@@ -2244,6 +2249,7 @@ int db8500_prcmu_load_a9wdog(u8 id, u32 timeout)
                            (u8)((timeout >> 12) & 0xff),
                            (u8)((timeout >> 20) & 0xff));
 }
+EXPORT_SYMBOL(db8500_prcmu_load_a9wdog);
 /**
 * prcmu_abb_read() - Read register value(s) from the ABB.
@@ -2524,7 +2530,7 @@ static bool read_mailbox_0(void)
                for (n = 0; n < NUM_PRCMU_WAKEUPS; n++) {
                        if (ev & prcmu_irq_bit[n])
-                                generic_handle_irq(IRQ_PRCMU_BASE + n);
+                                generic_handle_irq(irq_find_mapping(db8500_irq_domain, n));
                }
                r = true;
                break;
@@ -2737,13 +2743,14 @@ static int db8500_irq_map(struct irq_domain *d, unsigned int virq,
 }
 static struct irq_domain_ops db8500_irq_ops = {
-        .map    = db8500_irq_map,
+        .map    = db8500_irq_map,
-        .xlate  = irq_domain_xlate_twocell,
+        .xlate  = irq_domain_xlate_twocell,
 };
 static int db8500_irq_init(struct device_node *np)
 {
-        int irq_base = -1;
+        int irq_base = 0;
+        int i;
        /* In the device tree case, just take some IRQs */
        if (!np)
@@ -2758,6 +2765,10 @@ static int db8500_irq_init(struct device_node *np)
                return -ENOSYS;
        }
+        /* All wakeups will be used, so create mappings for all */
+        for (i = 0; i < NUM_PRCMU_WAKEUPS; i++)
+                irq_create_mapping(db8500_irq_domain, i);
        return 0;
 }
@@ -3064,6 +3075,11 @@ static struct resource ab8500_resources[] = {
        }
 };
+static struct ux500_wdt_data db8500_wdt_pdata = {
+        .timeout = 600, /* 10 minutes */
+        .has_28_bits_resolution = true,
+};
 static struct mfd_cell db8500_prcmu_devs[] = {
        {
                .name = "db8500-prcmu-regulators",
@@ -3078,6 +3094,12 @@ static struct mfd_cell db8500_prcmu_devs[] = {
                .pdata_size = sizeof(db8500_cpufreq_table),
        },
        {
+                .name = "ux500_wdt",
+                .platform_data = &db8500_wdt_pdata,
+                .pdata_size = sizeof(db8500_wdt_pdata),
+                .id = -1,
+        },
+        {
                .name = "ab8500-core",
                .of_compatible = "stericsson,ab8500",
                .num_resources = ARRAY_SIZE(ab8500_resources),
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index d9d930302e98..a0cfdf980748 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -75,8 +75,10 @@
 #define ACPIBASE_GCS_OFF        0x3410
 #define ACPIBASE_GCS_END        0x3414
-#define GPIOBASE                0x48
+#define GPIOBASE_ICH0           0x58
-#define GPIOCTRL                0x4C
+#define GPIOCTRL_ICH0           0x5C
+#define GPIOBASE_ICH6           0x48
+#define GPIOCTRL_ICH6           0x4C
 #define RCBABASE                0xf0
@@ -84,8 +86,17 @@
 #define wdt_mem_res(i) wdt_res(ICH_RES_MEM_OFF, i)
 #define wdt_res(b, i) (&wdt_ich_res[(b) + (i)])
-static int lpc_ich_acpi_save = -1;
+struct lpc_ich_cfg {
-static int lpc_ich_gpio_save = -1;
+        int base;
+        int ctrl;
+        int save;
+};
+struct lpc_ich_priv {
+        int chipset;
+        struct lpc_ich_cfg acpi;
+        struct lpc_ich_cfg gpio;
+};
 static struct resource wdt_ich_res[] = {
        /* ACPI - TCO */
@@ -661,39 +672,44 @@ MODULE_DEVICE_TABLE(pci, lpc_ich_ids);
 static void lpc_ich_restore_config_space(struct pci_dev *dev)
 {
-        if (lpc_ich_acpi_save >= 0) {
+        struct lpc_ich_priv *priv = pci_get_drvdata(dev);
-                pci_write_config_byte(dev, ACPICTRL, lpc_ich_acpi_save);
-                lpc_ich_acpi_save = -1;
+        if (priv->acpi.save >= 0) {
+                pci_write_config_byte(dev, priv->acpi.ctrl, priv->acpi.save);
+                priv->acpi.save = -1;
        }
-        if (lpc_ich_gpio_save >= 0) {
+        if (priv->gpio.save >= 0) {
-                pci_write_config_byte(dev, GPIOCTRL, lpc_ich_gpio_save);
+                pci_write_config_byte(dev, priv->gpio.ctrl, priv->gpio.save);
-                lpc_ich_gpio_save = -1;
+                priv->gpio.save = -1;
        }
 }
 static void lpc_ich_enable_acpi_space(struct pci_dev *dev)
 {
+        struct lpc_ich_priv *priv = pci_get_drvdata(dev);
        u8 reg_save;
-        pci_read_config_byte(dev, ACPICTRL, &reg_save);
+        pci_read_config_byte(dev, priv->acpi.ctrl, &reg_save);
-        pci_write_config_byte(dev, ACPICTRL, reg_save | 0x10);
+        pci_write_config_byte(dev, priv->acpi.ctrl, reg_save | 0x10);
-        lpc_ich_acpi_save = reg_save;
+        priv->acpi.save = reg_save;
 }
 static void lpc_ich_enable_gpio_space(struct pci_dev *dev)
 {
+        struct lpc_ich_priv *priv = pci_get_drvdata(dev);
        u8 reg_save;
-        pci_read_config_byte(dev, GPIOCTRL, &reg_save);
+        pci_read_config_byte(dev, priv->gpio.ctrl, &reg_save);
-        pci_write_config_byte(dev, GPIOCTRL, reg_save | 0x10);
+        pci_write_config_byte(dev, priv->gpio.ctrl, reg_save | 0x10);
-        lpc_ich_gpio_save = reg_save;
+        priv->gpio.save = reg_save;
 }
-static void lpc_ich_finalize_cell(struct mfd_cell *cell,
+static void lpc_ich_finalize_cell(struct pci_dev *dev, struct mfd_cell *cell)
-                                        const struct pci_device_id *id)
 {
-        cell->platform_data = &lpc_chipset_info[id->driver_data];
+        struct lpc_ich_priv *priv = pci_get_drvdata(dev);
+        cell->platform_data = &lpc_chipset_info[priv->chipset];
        cell->pdata_size = sizeof(struct lpc_ich_info);
 }
@@ -721,9 +737,9 @@ static int lpc_ich_check_conflict_gpio(struct resource *res)
        return use_gpio ? use_gpio : ret;
 }
-static int lpc_ich_init_gpio(struct pci_dev *dev,
+static int lpc_ich_init_gpio(struct pci_dev *dev)
-                                const struct pci_device_id *id)
 {
+        struct lpc_ich_priv *priv = pci_get_drvdata(dev);
        u32 base_addr_cfg;
        u32 base_addr;
        int ret;
@@ -731,7 +747,7 @@ static int lpc_ich_init_gpio(struct pci_dev *dev,
        struct resource *res;
        /* Setup power management base register */
-        pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg);
+        pci_read_config_dword(dev, priv->acpi.base, &base_addr_cfg);
        base_addr = base_addr_cfg & 0x0000ff80;
        if (!base_addr) {
                dev_notice(&dev->dev, "I/O space for ACPI uninitialized\n");
@@ -757,7 +773,7 @@ static int lpc_ich_init_gpio(struct pci_dev *dev,
 gpe0_done:
        /* Setup GPIO base register */
-        pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg);
+        pci_read_config_dword(dev, priv->gpio.base, &base_addr_cfg);
        base_addr = base_addr_cfg & 0x0000ff80;
        if (!base_addr) {
                dev_notice(&dev->dev, "I/O space for GPIO uninitialized\n");
@@ -768,7 +784,7 @@ gpe0_done:
        /* Older devices provide fewer GPIO and have a smaller resource size. */
        res = &gpio_ich_res[ICH_RES_GPIO];
        res->start = base_addr;
-        switch (lpc_chipset_info[id->driver_data].gpio_version) {
+        switch (lpc_chipset_info[priv->chipset].gpio_version) {
        case ICH_V5_GPIO:
        case ICH_V10CORP_GPIO:
                res->end = res->start + 128 - 1;
@@ -784,10 +800,10 @@ gpe0_done:
                acpi_conflict = true;
                goto gpio_done;
        }
-        lpc_chipset_info[id->driver_data].use_gpio = ret;
+        lpc_chipset_info[priv->chipset].use_gpio = ret;
        lpc_ich_enable_gpio_space(dev);
-        lpc_ich_finalize_cell(&lpc_ich_cells[LPC_GPIO], id);
+        lpc_ich_finalize_cell(dev, &lpc_ich_cells[LPC_GPIO]);
        ret = mfd_add_devices(&dev->dev, -1, &lpc_ich_cells[LPC_GPIO],
                              1, NULL, 0, NULL);
@@ -798,16 +814,16 @@ gpio_done:
        return ret;
 }
-static int lpc_ich_init_wdt(struct pci_dev *dev,
+static int lpc_ich_init_wdt(struct pci_dev *dev)
-                                const struct pci_device_id *id)
 {
+        struct lpc_ich_priv *priv = pci_get_drvdata(dev);
        u32 base_addr_cfg;
        u32 base_addr;
        int ret;
        struct resource *res;
        /* Setup power management base register */
-        pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg);
+        pci_read_config_dword(dev, priv->acpi.base, &base_addr_cfg);
        base_addr = base_addr_cfg & 0x0000ff80;
        if (!base_addr) {
                dev_notice(&dev->dev, "I/O space for ACPI uninitialized\n");
@@ -830,7 +846,7 @@ static int lpc_ich_init_wdt(struct pci_dev *dev,
         * we have to read RCBA from PCI Config space 0xf0 and use
         * it as base. GCS = RCBA + ICH6_GCS(0x3410).
         */
-        if (lpc_chipset_info[id->driver_data].iTCO_version == 1) {
+        if (lpc_chipset_info[priv->chipset].iTCO_version == 1) {
                /* Don't register iomem for TCO ver 1 */
                lpc_ich_cells[LPC_WDT].num_resources--;
        } else {
@@ -847,7 +863,7 @@ static int lpc_ich_init_wdt(struct pci_dev *dev,
                res->end = base_addr + ACPIBASE_GCS_END;
        }
-        lpc_ich_finalize_cell(&lpc_ich_cells[LPC_WDT], id);
+        lpc_ich_finalize_cell(dev, &lpc_ich_cells[LPC_WDT]);
        ret = mfd_add_devices(&dev->dev, -1, &lpc_ich_cells[LPC_WDT],
                              1, NULL, 0, NULL);
@@ -858,14 +874,35 @@ wdt_done:
 static int lpc_ich_probe(struct pci_dev *dev,
                                const struct pci_device_id *id)
 {
+        struct lpc_ich_priv *priv;
        int ret;
        bool cell_added = false;
-        ret = lpc_ich_init_wdt(dev, id);
+        priv = kmalloc(GFP_KERNEL, sizeof(struct lpc_ich_priv));
+        if (!priv)
+                return -ENOMEM;
+        priv->chipset = id->driver_data;
+        priv->acpi.save = -1;
+        priv->acpi.base = ACPIBASE;
+        priv->acpi.ctrl = ACPICTRL;
+        priv->gpio.save = -1;
+        if (priv->chipset <= LPC_ICH5) {
+                priv->gpio.base = GPIOBASE_ICH0;
+                priv->gpio.ctrl = GPIOCTRL_ICH0;
+        } else {
+                priv->gpio.base = GPIOBASE_ICH6;
+                priv->gpio.ctrl = GPIOCTRL_ICH6;
+        }
+        pci_set_drvdata(dev, priv);
+        ret = lpc_ich_init_wdt(dev);
        if (!ret)
                cell_added = true;
-        ret = lpc_ich_init_gpio(dev, id);
+        ret = lpc_ich_init_gpio(dev);
        if (!ret)
                cell_added = true;
@@ -876,6 +913,8 @@ static int lpc_ich_probe(struct pci_dev *dev,
        if (!cell_added) {
                dev_warn(&dev->dev, "No MFD cells added\n");
                lpc_ich_restore_config_space(dev);
+                pci_set_drvdata(dev, NULL);
+                kfree(priv);
                return -ENODEV;
        }
@@ -884,8 +923,12 @@ static int lpc_ich_probe(struct pci_dev *dev,
 static void lpc_ich_remove(struct pci_dev *dev)
 {
+        void *priv = pci_get_drvdata(dev);
        mfd_remove_devices(&dev->dev);
        lpc_ich_restore_config_space(dev);
+        pci_set_drvdata(dev, NULL);
+        kfree(priv);
 }
 static struct pci_driver lpc_ich_driver = {
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index f6878f8db57d..4d73963cd8f0 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -93,15 +93,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
        if (max77686 == NULL)
                return -ENOMEM;
-        max77686->regmap = regmap_init_i2c(i2c, &max77686_regmap_config);
-        if (IS_ERR(max77686->regmap)) {
-                ret = PTR_ERR(max77686->regmap);
-                dev_err(max77686->dev, "Failed to allocate register map: %d\n",
-                                ret);
-                kfree(max77686);
-                return ret;
-        }
        i2c_set_clientdata(i2c, max77686);
        max77686->dev = &i2c->dev;
        max77686->i2c = i2c;
@@ -111,6 +102,15 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
        max77686->irq_gpio = pdata->irq_gpio;
        max77686->irq = i2c->irq;
+        max77686->regmap = regmap_init_i2c(i2c, &max77686_regmap_config);
+        if (IS_ERR(max77686->regmap)) {
+                ret = PTR_ERR(max77686->regmap);
+                dev_err(max77686->dev, "Failed to allocate register map: %d\n",
+                                ret);
+                kfree(max77686);
+                return ret;
+        }
        if (regmap_read(max77686->regmap,
                         MAX77686_REG_DEVICE_ID, &data) < 0) {
                dev_err(max77686->dev,
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index cc5155e20494..9e60fed5ff82 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -114,35 +114,37 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
        u8 reg_data;
        int ret = 0;
+        if (!pdata) {
+                dev_err(&i2c->dev, "No platform data found.\n");
+                return -EINVAL;
+        }
        max77693 = devm_kzalloc(&i2c->dev,
                        sizeof(struct max77693_dev), GFP_KERNEL);
        if (max77693 == NULL)
                return -ENOMEM;
-        max77693->regmap = devm_regmap_init_i2c(i2c, &max77693_regmap_config);
-        if (IS_ERR(max77693->regmap)) {
-                ret = PTR_ERR(max77693->regmap);
-                dev_err(max77693->dev,"failed to allocate register map: %d\n",
-                                ret);
-                goto err_regmap;
-        }
        i2c_set_clientdata(i2c, max77693);
        max77693->dev = &i2c->dev;
        max77693->i2c = i2c;
        max77693->irq = i2c->irq;
        max77693->type = id->driver_data;
-        if (!pdata)
+        max77693->regmap = devm_regmap_init_i2c(i2c, &max77693_regmap_config);
-                goto err_regmap;
+        if (IS_ERR(max77693->regmap)) {
+                ret = PTR_ERR(max77693->regmap);
+                dev_err(max77693->dev, "failed to allocate register map: %d\n",
+                                ret);
+                return ret;
+        }
        max77693->wakeup = pdata->wakeup;
-        if (max77693_read_reg(max77693->regmap,
+        ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2,
-                                MAX77693_PMIC_REG_PMIC_ID2, &reg_data) < 0) {
+                                &reg_data);
+        if (ret < 0) {
                dev_err(max77693->dev, "device not found on this channel\n");
-                ret = -ENODEV;
+                return ret;
-                goto err_regmap;
        } else
                dev_info(max77693->dev, "device ID: 0x%x\n", reg_data);
@@ -163,7 +165,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
                ret = PTR_ERR(max77693->regmap_muic);
                dev_err(max77693->dev,
                        "failed to allocate register map: %d\n", ret);
-                goto err_regmap;
+                goto err_regmap_muic;
        }
        ret = max77693_irq_init(max77693);
@@ -184,9 +186,9 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
 err_mfd:
        max77693_irq_exit(max77693);
 err_irq:
+err_regmap_muic:
        i2c_unregister_device(max77693->muic);
        i2c_unregister_device(max77693->haptic);
-err_regmap:
        return ret;
 }
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index e32466e865b9..f0cc40296d8c 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -14,10 +14,13 @@
 #include <linux/i2c.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/irqdomain.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/machine.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/max8925.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
 static struct resource bk_resources[] = {
        { 0x84, 0x84, "mode control", IORESOURCE_REG, },
@@ -639,17 +642,33 @@ static struct irq_chip max8925_irq_chip = {
        .irq_disable    = max8925_irq_disable,
 };
+static int max8925_irq_domain_map(struct irq_domain *d, unsigned int virq,
+                                 irq_hw_number_t hw)
+{
+        irq_set_chip_data(virq, d->host_data);
+        irq_set_chip_and_handler(virq, &max8925_irq_chip, handle_edge_irq);
+        irq_set_nested_thread(virq, 1);
+#ifdef CONFIG_ARM
+        set_irq_flags(virq, IRQF_VALID);
+#else
+        irq_set_noprobe(virq);
+#endif
+        return 0;
+}
+static struct irq_domain_ops max8925_irq_domain_ops = {
+        .map    = max8925_irq_domain_map,
+        .xlate  = irq_domain_xlate_onetwocell,
+};
 static int max8925_irq_init(struct max8925_chip *chip, int irq,
                            struct max8925_platform_data *pdata)
 {
        unsigned long flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
-        int i, ret;
+        int ret;
-        int __irq;
+        struct device_node *node = chip->dev->of_node;
-        if (!pdata || !pdata->irq_base) {
-                dev_warn(chip->dev, "No interrupt support on IRQ base\n");
-                return -EINVAL;
-        }
        /* clear all interrupts */
        max8925_reg_read(chip->i2c, MAX8925_CHG_IRQ1);
        max8925_reg_read(chip->i2c, MAX8925_CHG_IRQ2);
@@ -667,35 +686,30 @@ static int max8925_irq_init(struct max8925_chip *chip, int irq,
        max8925_reg_write(chip->rtc, MAX8925_RTC_IRQ_MASK, 0xff);
        mutex_init(&chip->irq_lock);
-        chip->core_irq = irq;
+        chip->irq_base = irq_alloc_descs(-1, 0, MAX8925_NR_IRQS, 0);
-        chip->irq_base = pdata->irq_base;
+        if (chip->irq_base < 0) {
+                dev_err(chip->dev, "Failed to allocate interrupts, ret:%d\n",
-        /* register with genirq */
+                        chip->irq_base);
-        for (i = 0; i < ARRAY_SIZE(max8925_irqs); i++) {
+                return -EBUSY;
-                __irq = i + chip->irq_base;
-                irq_set_chip_data(__irq, chip);
-                irq_set_chip_and_handler(__irq, &max8925_irq_chip,
-                                         handle_edge_irq);
-                irq_set_nested_thread(__irq, 1);
-#ifdef CONFIG_ARM
-                set_irq_flags(__irq, IRQF_VALID);
-#else
-                irq_set_noprobe(__irq);
-#endif
-        }
-        if (!irq) {
-                dev_warn(chip->dev, "No interrupt support on core IRQ\n");
-                goto tsc_irq;
        }
+        irq_domain_add_legacy(node, MAX8925_NR_IRQS, chip->irq_base, 0,
+                              &max8925_irq_domain_ops, chip);
+        /* request irq handler for pmic main irq*/
+        chip->core_irq = irq;
+        if (!chip->core_irq)
+                return -EBUSY;
        ret = request_threaded_irq(irq, NULL, max8925_irq, flags | IRQF_ONESHOT,
                                   "max8925", chip);
        if (ret) {
                dev_err(chip->dev, "Failed to request core IRQ: %d\n", ret);
                chip->core_irq = 0;
+                return -EBUSY;
        }
-tsc_irq:
+        /* request irq handler for pmic tsc irq*/
        /* mask TSC interrupt */
        max8925_reg_write(chip->adc, MAX8925_TSC_IRQ_MASK, 0x0f);
@@ -704,7 +718,6 @@ tsc_irq:
                return 0;
        }
        chip->tsc_irq = pdata->tsc_irq;
        ret = request_threaded_irq(chip->tsc_irq, NULL, max8925_tsc_irq,
                                   flags | IRQF_ONESHOT, "max8925-tsc", chip);
        if (ret) {
@@ -846,7 +859,7 @@ int max8925_device_init(struct max8925_chip *chip,
        ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],
                              ARRAY_SIZE(rtc_devs),
-                              &rtc_resources[0], chip->irq_base, NULL);
+                              NULL, chip->irq_base, NULL);
        if (ret < 0) {
                dev_err(chip->dev, "Failed to add rtc subdev\n");
                goto out;
@@ -854,7 +867,7 @@ int max8925_device_init(struct max8925_chip *chip,
        ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0],
                              ARRAY_SIZE(onkey_devs),
-                              &onkey_resources[0], 0, NULL);
+                              NULL, chip->irq_base, NULL);
        if (ret < 0) {
                dev_err(chip->dev, "Failed to add onkey subdev\n");
                goto out_dev;
@@ -873,21 +886,19 @@ int max8925_device_init(struct max8925_chip *chip,
                goto out_dev;
        }
-        if (pdata && pdata->power) {
+        ret = mfd_add_devices(chip->dev, 0, &power_devs[0],
-                ret = mfd_add_devices(chip->dev, 0, &power_devs[0],
+                              ARRAY_SIZE(power_devs),
-                                        ARRAY_SIZE(power_devs),
+                              NULL, 0, NULL);
-                                      &power_supply_resources[0], 0, NULL);
+        if (ret < 0) {
-                if (ret < 0) {
+                dev_err(chip->dev,
-                        dev_err(chip->dev, "Failed to add power supply "
+                        "Failed to add power supply subdev, err = %d\n", ret);
-                                "subdev\n");
+                goto out_dev;
-                        goto out_dev;
-                }
        }
        if (pdata && pdata->touch) {
                ret = mfd_add_devices(chip->dev, 0, &touch_devs[0],
                                      ARRAY_SIZE(touch_devs),
-                                      &touch_resources[0], 0, NULL);
+                                      NULL, chip->tsc_irq, NULL);
                if (ret < 0) {
                        dev_err(chip->dev, "Failed to add touch subdev\n");
                        goto out_dev;
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
index 00b5b456063d..92bbebd31598 100644
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
@@ -135,13 +135,37 @@ static const struct i2c_device_id max8925_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, max8925_id_table);
+static int max8925_dt_init(struct device_node *np, struct device *dev,
+                           struct max8925_platform_data *pdata)
+{
+        int ret;
+        ret = of_property_read_u32(np, "maxim,tsc-irq", &pdata->tsc_irq);
+        if (ret) {
+                dev_err(dev, "Not found maxim,tsc-irq property\n");
+                return -EINVAL;
+        }
+        return 0;
+}
 static int max8925_probe(struct i2c_client *client,
                                   const struct i2c_device_id *id)
 {
        struct max8925_platform_data *pdata = client->dev.platform_data;
        static struct max8925_chip *chip;
+        struct device_node *node = client->dev.of_node;
-        if (!pdata) {
+        if (node && !pdata) {
+                /* parse DT to get platform data */
+                pdata = devm_kzalloc(&client->dev,
+                                     sizeof(struct max8925_platform_data),
+                                     GFP_KERNEL);
+                if (!pdata)
+                        return -ENOMEM;
+                if (max8925_dt_init(node, &client->dev, pdata))
+                        return -EINVAL;
+        } else if (!pdata) {
                pr_info("%s: platform data is missing\n", __func__);
                return -EINVAL;
        }
@@ -203,11 +227,18 @@ static int max8925_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(max8925_pm_ops, max8925_suspend, max8925_resume);
+static const struct of_device_id max8925_dt_ids[] = {
+        { .compatible = "maxim,max8925", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, max8925_dt_ids);
 static struct i2c_driver max8925_driver = {
        .driver = {
                .name   = "max8925",
                .owner  = THIS_MODULE,
                .pm     = &max8925_pm_ops,
+                .of_match_table = of_match_ptr(max8925_dt_ids),
        },
        .probe          = max8925_probe,
        .remove         = max8925_remove,
@@ -217,7 +248,6 @@ static struct i2c_driver max8925_driver = {
 static int __init max8925_i2c_init(void)
 {
        int ret;
        ret = i2c_add_driver(&max8925_driver);
        if (ret != 0)
                pr_err("Failed to register MAX8925 I2C driver: %d\n", ret);
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 6ffd7a2affdc..bbdbc50a3cca 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -39,6 +39,14 @@ enum palmas_ids {
        PALMAS_USB_ID,
 };
+static struct resource palmas_rtc_resources[] = {
+        {
+                .start  = PALMAS_RTC_ALARM_IRQ,
+                .end    = PALMAS_RTC_ALARM_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
 static const struct mfd_cell palmas_children[] = {
        {
                .name = "palmas-pmic",
@@ -59,6 +67,8 @@ static const struct mfd_cell palmas_children[] = {
        {
                .name = "palmas-rtc",
                .id = PALMAS_RTC_ID,
+                .resources = &palmas_rtc_resources[0],
+                .num_resources = ARRAY_SIZE(palmas_rtc_resources),
        },
        {
                .name = "palmas-pwrbutton",
@@ -456,8 +466,8 @@ static int palmas_i2c_probe(struct i2c_client *i2c,
        ret = mfd_add_devices(palmas->dev, -1,
                              children, ARRAY_SIZE(palmas_children),
-                              NULL, regmap_irq_chip_get_base(palmas->irq_data),
+                              NULL, 0,
-                              NULL);
+                              regmap_irq_get_domain(palmas->irq_data));
        kfree(children);
        if (ret < 0)
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c
index 64803f13bcec..d11567307fbe 100644
--- a/drivers/mfd/pcf50633-core.c
+++ b/drivers/mfd/pcf50633-core.c
@@ -208,6 +208,8 @@ static int pcf50633_probe(struct i2c_client *client,
        if (!pcf)
                return -ENOMEM;
+        i2c_set_clientdata(client, pcf);
+        pcf->dev = &client->dev;
        pcf->pdata = pdata;
        mutex_init(&pcf->lock);
@@ -219,9 +221,6 @@ static int pcf50633_probe(struct i2c_client *client,
                return ret;
        }
-        i2c_set_clientdata(client, pcf);
-        pcf->dev = &client->dev;
        version = pcf50633_reg_read(pcf, 0);
        variant = pcf50633_reg_read(pcf, 1);
        if (version < 0 || variant < 0) {
diff --git a/drivers/mfd/rtl8411.c b/drivers/mfd/rtl8411.c
index 89f046ca9e41..2a2d31687b72 100644
--- a/drivers/mfd/rtl8411.c
+++ b/drivers/mfd/rtl8411.c
@@ -112,6 +112,31 @@ static int rtl8411_card_power_off(struct rtsx_pcr *pcr, int card)
                        BPP_LDO_POWB, BPP_LDO_SUSPEND);
 }
+static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
+{
+        u8 mask, val;
+        int err;
+        mask = (BPP_REG_TUNED18 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_MASK;
+        if (voltage == OUTPUT_3V3) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);
+                if (err < 0)
+                        return err;
+                val = (BPP_ASIC_3V3 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_3V3;
+        } else if (voltage == OUTPUT_1V8) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);
+                if (err < 0)
+                        return err;
+                val = (BPP_ASIC_1V8 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_1V8;
+        } else {
+                return -EINVAL;
+        }
+        return rtsx_pci_write_register(pcr, LDO_CTL, mask, val);
+}
 static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr)
 {
        unsigned int card_exist;
@@ -163,6 +188,18 @@ static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr)
        return card_exist;
 }
+static int rtl8411_conv_clk_and_div_n(int input, int dir)
+{
+        int output;
+        if (dir == CLK_TO_DIV_N)
+                output = input * 4 / 5 - 2;
+        else
+                output = (input + 2) * 5 / 4;
+        return output;
+}
 static const struct pcr_ops rtl8411_pcr_ops = {
        .extra_init_hw = rtl8411_extra_init_hw,
        .optimize_phy = NULL,
@@ -172,7 +209,9 @@ static const struct pcr_ops rtl8411_pcr_ops = {
        .disable_auto_blink = rtl8411_disable_auto_blink,
        .card_power_on = rtl8411_card_power_on,
        .card_power_off = rtl8411_card_power_off,
+        .switch_output_voltage = rtl8411_switch_output_voltage,
        .cd_deglitch = rtl8411_cd_deglitch,
+        .conv_clk_and_div_n = rtl8411_conv_clk_and_div_n,
 };
 /* SD Pull Control Enable:
diff --git a/drivers/mfd/rts5209.c b/drivers/mfd/rts5209.c
index 283a4f148084..ec78d9fb0879 100644
--- a/drivers/mfd/rts5209.c
+++ b/drivers/mfd/rts5209.c
@@ -144,6 +144,33 @@ static int rts5209_card_power_off(struct rtsx_pcr *pcr, int card)
        return rtsx_pci_send_cmd(pcr, 100);
 }
+static int rts5209_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
+{
+        int err;
+        if (voltage == OUTPUT_3V3) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);
+                if (err < 0)
+                        return err;
+                err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24);
+                if (err < 0)
+                        return err;
+        } else if (voltage == OUTPUT_1V8) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);
+                if (err < 0)
+                        return err;
+                err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24);
+                if (err < 0)
+                        return err;
+        } else {
+                return -EINVAL;
+        }
+        return 0;
+}
 static const struct pcr_ops rts5209_pcr_ops = {
        .extra_init_hw = rts5209_extra_init_hw,
        .optimize_phy = rts5209_optimize_phy,
@@ -153,7 +180,9 @@ static const struct pcr_ops rts5209_pcr_ops = {
        .disable_auto_blink = rts5209_disable_auto_blink,
        .card_power_on = rts5209_card_power_on,
        .card_power_off = rts5209_card_power_off,
+        .switch_output_voltage = rts5209_switch_output_voltage,
        .cd_deglitch = NULL,
+        .conv_clk_and_div_n = NULL,
 };
 /* SD Pull Control Enable:
diff --git a/drivers/mfd/rts5227.c b/drivers/mfd/rts5227.c
new file mode 100644
index 000000000000..fc831dcb1480
--- /dev/null
+++ b/drivers/mfd/rts5227.c
@@ -0,0 +1,234 @@
+/* Driver for Realtek PCI-Express card reader
+ *
+ * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author:
+ *   Wei WANG <wei_wang@realsil.com.cn>
+ *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
+ *
+ *   Roger Tseng <rogerable@realtek.com>
+ *   No. 2, Innovation Road II, Hsinchu Science Park, Hsinchu 300, Taiwan
+ */
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/mfd/rtsx_pci.h>
+#include "rtsx_pcr.h"
+static int rts5227_extra_init_hw(struct rtsx_pcr *pcr)
+{
+        u16 cap;
+        rtsx_pci_init_cmd(pcr);
+        /* Configure GPIO as output */
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, GPIO_CTL, 0x02, 0x02);
+        /* Switch LDO3318 source from DV33 to card_3v3 */
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, LDO_PWR_SEL, 0x03, 0x00);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, LDO_PWR_SEL, 0x03, 0x01);
+        /* LED shine disabled, set initial shine cycle period */
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, OLT_LED_CTL, 0x0F, 0x02);
+        /* Configure LTR */
+        pcie_capability_read_word(pcr->pci, PCI_EXP_DEVCTL2, &cap);
+        if (cap & PCI_EXP_LTR_EN)
+                rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, LTR_CTL, 0xFF, 0xA3);
+        /* Configure OBFF */
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, OBFF_CFG, 0x03, 0x03);
+        /* Configure force_clock_req
+         * Maybe We should define 0xFF03 as some name
+         */
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, 0xFF03, 0x08, 0x08);
+        /* Correct driving */
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD,
+                        SD30_CLK_DRIVE_SEL, 0xFF, 0x96);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD,
+                        SD30_CMD_DRIVE_SEL, 0xFF, 0x96);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD,
+                        SD30_DAT_DRIVE_SEL, 0xFF, 0x96);
+        return rtsx_pci_send_cmd(pcr, 100);
+}
+static int rts5227_optimize_phy(struct rtsx_pcr *pcr)
+{
+        /* Optimize RX sensitivity */
+        return rtsx_pci_write_phy_register(pcr, 0x00, 0xBA42);
+}
+static int rts5227_turn_on_led(struct rtsx_pcr *pcr)
+{
+        return rtsx_pci_write_register(pcr, GPIO_CTL, 0x02, 0x02);
+}
+static int rts5227_turn_off_led(struct rtsx_pcr *pcr)
+{
+        return rtsx_pci_write_register(pcr, GPIO_CTL, 0x02, 0x00);
+}
+static int rts5227_enable_auto_blink(struct rtsx_pcr *pcr)
+{
+        return rtsx_pci_write_register(pcr, OLT_LED_CTL, 0x08, 0x08);
+}
+static int rts5227_disable_auto_blink(struct rtsx_pcr *pcr)
+{
+        return rtsx_pci_write_register(pcr, OLT_LED_CTL, 0x08, 0x00);
+}
+static int rts5227_card_power_on(struct rtsx_pcr *pcr, int card)
+{
+        int err;
+        rtsx_pci_init_cmd(pcr);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_PWR_CTL,
+                        SD_POWER_MASK, SD_PARTIAL_POWER_ON);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
+                        LDO3318_PWR_MASK, 0x02);
+        err = rtsx_pci_send_cmd(pcr, 100);
+        if (err < 0)
+                return err;
+        /* To avoid too large in-rush current */
+        udelay(150);
+        rtsx_pci_init_cmd(pcr);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_PWR_CTL,
+                        SD_POWER_MASK, SD_POWER_ON);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
+                        LDO3318_PWR_MASK, 0x06);
+        err = rtsx_pci_send_cmd(pcr, 100);
+        if (err < 0)
+                return err;
+        return 0;
+}
+static int rts5227_card_power_off(struct rtsx_pcr *pcr, int card)
+{
+        rtsx_pci_init_cmd(pcr);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_PWR_CTL,
+                        SD_POWER_MASK | PMOS_STRG_MASK,
+                        SD_POWER_OFF | PMOS_STRG_400mA);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
+                        LDO3318_PWR_MASK, 0X00);
+        return rtsx_pci_send_cmd(pcr, 100);
+}
+static int rts5227_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
+{
+        int err;
+        u8 drive_sel;
+        if (voltage == OUTPUT_3V3) {
+                err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24);
+                if (err < 0)
+                        return err;
+                drive_sel = 0x96;
+        } else if (voltage == OUTPUT_1V8) {
+                err = rtsx_pci_write_phy_register(pcr, 0x11, 0x3C02);
+                if (err < 0)
+                        return err;
+                err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C80 | 0x24);
+                if (err < 0)
+                        return err;
+                drive_sel = 0xB3;
+        } else {
+                return -EINVAL;
+        }
+        /* set pad drive */
+        rtsx_pci_init_cmd(pcr);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD30_CLK_DRIVE_SEL,
+                        0xFF, drive_sel);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD30_CMD_DRIVE_SEL,
+                        0xFF, drive_sel);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD30_DAT_DRIVE_SEL,
+                        0xFF, drive_sel);
+        return rtsx_pci_send_cmd(pcr, 100);
+}
+static const struct pcr_ops rts5227_pcr_ops = {
+        .extra_init_hw = rts5227_extra_init_hw,
+        .optimize_phy = rts5227_optimize_phy,
+        .turn_on_led = rts5227_turn_on_led,
+        .turn_off_led = rts5227_turn_off_led,
+        .enable_auto_blink = rts5227_enable_auto_blink,
+        .disable_auto_blink = rts5227_disable_auto_blink,
+        .card_power_on = rts5227_card_power_on,
+        .card_power_off = rts5227_card_power_off,
+        .switch_output_voltage = rts5227_switch_output_voltage,
+        .cd_deglitch = NULL,
+        .conv_clk_and_div_n = NULL,
+};
+/* SD Pull Control Enable:
+ *     SD_DAT[3:0] ==> pull up
+ *     SD_CD       ==> pull up
+ *     SD_WP       ==> pull up
+ *     SD_CMD      ==> pull up
+ *     SD_CLK      ==> pull down
+ */
+static const u32 rts5227_sd_pull_ctl_enable_tbl[] = {
+        RTSX_REG_PAIR(CARD_PULL_CTL2, 0xAA),
+        RTSX_REG_PAIR(CARD_PULL_CTL3, 0xE9),
+        0,
+};
+/* SD Pull Control Disable:
+ *     SD_DAT[3:0] ==> pull down
+ *     SD_CD       ==> pull up
+ *     SD_WP       ==> pull down
+ *     SD_CMD      ==> pull down
+ *     SD_CLK      ==> pull down
+ */
+static const u32 rts5227_sd_pull_ctl_disable_tbl[] = {
+        RTSX_REG_PAIR(CARD_PULL_CTL2, 0x55),
+        RTSX_REG_PAIR(CARD_PULL_CTL3, 0xD5),
+        0,
+};
+/* MS Pull Control Enable:
+ *     MS CD       ==> pull up
+ *     others      ==> pull down
+ */
+static const u32 rts5227_ms_pull_ctl_enable_tbl[] = {
+        RTSX_REG_PAIR(CARD_PULL_CTL5, 0x55),
+        RTSX_REG_PAIR(CARD_PULL_CTL6, 0x15),
+        0,
+};
+/* MS Pull Control Disable:
+ *     MS CD       ==> pull up
+ *     others      ==> pull down
+ */
+static const u32 rts5227_ms_pull_ctl_disable_tbl[] = {
+        RTSX_REG_PAIR(CARD_PULL_CTL5, 0x55),
+        RTSX_REG_PAIR(CARD_PULL_CTL6, 0x15),
+        0,
+};
+void rts5227_init_params(struct rtsx_pcr *pcr)
+{
+        pcr->extra_caps = EXTRA_CAPS_SD_SDR50 | EXTRA_CAPS_SD_SDR104;
+        pcr->num_slots = 2;
+        pcr->ops = &rts5227_pcr_ops;
+        pcr->sd_pull_ctl_enable_tbl = rts5227_sd_pull_ctl_enable_tbl;
+        pcr->sd_pull_ctl_disable_tbl = rts5227_sd_pull_ctl_disable_tbl;
+        pcr->ms_pull_ctl_enable_tbl = rts5227_ms_pull_ctl_enable_tbl;
+        pcr->ms_pull_ctl_disable_tbl = rts5227_ms_pull_ctl_disable_tbl;
+}
diff --git a/drivers/mfd/rts5229.c b/drivers/mfd/rts5229.c
index b9dbab266fda..58af4dbe3586 100644
--- a/drivers/mfd/rts5229.c
+++ b/drivers/mfd/rts5229.c
@@ -114,6 +114,33 @@ static int rts5229_card_power_off(struct rtsx_pcr *pcr, int card)
        return rtsx_pci_send_cmd(pcr, 100);
 }
+static int rts5229_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
+{
+        int err;
+        if (voltage == OUTPUT_3V3) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);
+                if (err < 0)
+                        return err;
+                err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24);
+                if (err < 0)
+                        return err;
+        } else if (voltage == OUTPUT_1V8) {
+                err = rtsx_pci_write_register(pcr,
+                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);
+                if (err < 0)
+                        return err;
+                err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24);
+                if (err < 0)
+                        return err;
+        } else {
+                return -EINVAL;
+        }
+        return 0;
+}
 static const struct pcr_ops rts5229_pcr_ops = {
        .extra_init_hw = rts5229_extra_init_hw,
        .optimize_phy = rts5229_optimize_phy,
@@ -123,7 +150,9 @@ static const struct pcr_ops rts5229_pcr_ops = {
        .disable_auto_blink = rts5229_disable_auto_blink,
        .card_power_on = rts5229_card_power_on,
        .card_power_off = rts5229_card_power_off,
+        .switch_output_voltage = rts5229_switch_output_voltage,
        .cd_deglitch = NULL,
+        .conv_clk_and_div_n = NULL,
 };
 /* SD Pull Control Enable:
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index 7a7b0bda4618..822237e322ba 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -55,6 +55,7 @@ static DEFINE_PCI_DEVICE_TABLE(rtsx_pci_ids) = {
        { PCI_DEVICE(0x10EC, 0x5209), PCI_CLASS_OTHERS << 16, 0xFF0000 },
        { PCI_DEVICE(0x10EC, 0x5229), PCI_CLASS_OTHERS << 16, 0xFF0000 },
        { PCI_DEVICE(0x10EC, 0x5289), PCI_CLASS_OTHERS << 16, 0xFF0000 },
+        { PCI_DEVICE(0x10EC, 0x5227), PCI_CLASS_OTHERS << 16, 0xFF0000 },
        { 0, }
 };
@@ -325,7 +326,6 @@ static void rtsx_pci_add_sg_tbl(struct rtsx_pcr *pcr,
        val = ((u64)addr << 32) | ((u64)len << 12) | option;
        put_unaligned_le64(val, ptr);
-        ptr++;
        pcr->sgi++;
 }
@@ -591,8 +591,7 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
                u8 ssc_depth, bool initial_mode, bool double_clk, bool vpclk)
 {
        int err, clk;
-        u8 N, min_N, max_N, clk_divider;
+        u8 n, clk_divider, mcu_cnt, div;
-        u8 mcu_cnt, div, max_div;
        u8 depth[] = {
                [RTSX_SSC_DEPTH_4M] = SSC_DEPTH_4M,
                [RTSX_SSC_DEPTH_2M] = SSC_DEPTH_2M,
@@ -616,10 +615,6 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
        card_clock /= 1000000;
        dev_dbg(&(pcr->pci->dev), "Switch card clock to %dMHz\n", card_clock);
-        min_N = 80;
-        max_N = 208;
-        max_div = CLK_DIV_8;
        clk = card_clock;
        if (!initial_mode && double_clk)
                clk = card_clock * 2;
@@ -630,21 +625,31 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
        if (clk == pcr->cur_clock)
                return 0;
-        N = (u8)(clk - 2);
+        if (pcr->ops->conv_clk_and_div_n)
-        if ((clk <= 2) || (N > max_N))
+                n = (u8)pcr->ops->conv_clk_and_div_n(clk, CLK_TO_DIV_N);
+        else
+                n = (u8)(clk - 2);
+        if ((clk <= 2) || (n > MAX_DIV_N_PCR))
                return -EINVAL;
        mcu_cnt = (u8)(125/clk + 3);
        if (mcu_cnt > 15)
                mcu_cnt = 15;
-        /* Make sure that the SSC clock div_n is equal or greater than min_N */
+        /* Make sure that the SSC clock div_n is not less than MIN_DIV_N_PCR */
        div = CLK_DIV_1;
-        while ((N < min_N) && (div < max_div)) {
+        while ((n < MIN_DIV_N_PCR) && (div < CLK_DIV_8)) {
-                N = (N + 2) * 2 - 2;
+                if (pcr->ops->conv_clk_and_div_n) {
+                        int dbl_clk = pcr->ops->conv_clk_and_div_n(n,
+                                        DIV_N_TO_CLK) * 2;
+                        n = (u8)pcr->ops->conv_clk_and_div_n(dbl_clk,
+                                        CLK_TO_DIV_N);
+                } else {
+                        n = (n + 2) * 2 - 2;
+                }
                div++;
        }
-        dev_dbg(&(pcr->pci->dev), "N = %d, div = %d\n", N, div);
+        dev_dbg(&(pcr->pci->dev), "n = %d, div = %d\n", n, div);
        ssc_depth = depth[ssc_depth];
        if (double_clk)
@@ -661,7 +666,7 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock,
        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SSC_CTL1, SSC_RSTB, 0);
        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SSC_CTL2,
                        SSC_DEPTH_MASK, ssc_depth);
-        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SSC_DIV_N_0, 0xFF, N);
+        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SSC_DIV_N_0, 0xFF, n);
        rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SSC_CTL1, SSC_RSTB, SSC_RSTB);
        if (vpclk) {
                rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, SD_VPCLK0_CTL,
@@ -703,6 +708,15 @@ int rtsx_pci_card_power_off(struct rtsx_pcr *pcr, int card)
 }
 EXPORT_SYMBOL_GPL(rtsx_pci_card_power_off);
+int rtsx_pci_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)
+{
+        if (pcr->ops->switch_output_voltage)
+                return pcr->ops->switch_output_voltage(pcr, voltage);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rtsx_pci_switch_output_voltage);
 unsigned int rtsx_pci_card_exist(struct rtsx_pcr *pcr)
 {
        unsigned int val;
@@ -739,7 +753,7 @@ static void rtsx_pci_card_detect(struct work_struct *work)
        struct delayed_work *dwork;
        struct rtsx_pcr *pcr;
        unsigned long flags;
-        unsigned int card_detect = 0;
+        unsigned int card_detect = 0, card_inserted, card_removed;
        u32 irq_status;
        dwork = to_delayed_work(work);
@@ -747,30 +761,37 @@ static void rtsx_pci_card_detect(struct work_struct *work)
        dev_dbg(&(pcr->pci->dev), "--> %s\n", __func__);
+        mutex_lock(&pcr->pcr_mutex);
        spin_lock_irqsave(&pcr->lock, flags);
        irq_status = rtsx_pci_readl(pcr, RTSX_BIPR);
        dev_dbg(&(pcr->pci->dev), "irq_status: 0x%08x\n", irq_status);
-        if (pcr->card_inserted || pcr->card_removed) {
+        irq_status &= CARD_EXIST;
+        card_inserted = pcr->card_inserted & irq_status;
+        card_removed = pcr->card_removed;
+        pcr->card_inserted = 0;
+        pcr->card_removed = 0;
+        spin_unlock_irqrestore(&pcr->lock, flags);
+        if (card_inserted || card_removed) {
                dev_dbg(&(pcr->pci->dev),
                                "card_inserted: 0x%x, card_removed: 0x%x\n",
-                                pcr->card_inserted, pcr->card_removed);
+                                card_inserted, card_removed);
                if (pcr->ops->cd_deglitch)
-                        pcr->card_inserted = pcr->ops->cd_deglitch(pcr);
+                        card_inserted = pcr->ops->cd_deglitch(pcr);
-                card_detect = pcr->card_inserted | pcr->card_removed;
+                card_detect = card_inserted | card_removed;
-                pcr->card_inserted = 0;
-                pcr->card_removed = 0;
        }
-        spin_unlock_irqrestore(&pcr->lock, flags);
+        mutex_unlock(&pcr->pcr_mutex);
-        if (card_detect & SD_EXIST)
+        if ((card_detect & SD_EXIST) && pcr->slots[RTSX_SD_CARD].card_event)
                pcr->slots[RTSX_SD_CARD].card_event(
                                pcr->slots[RTSX_SD_CARD].p_dev);
-        if (card_detect & MS_EXIST)
+        if ((card_detect & MS_EXIST) && pcr->slots[RTSX_MS_CARD].card_event)
                pcr->slots[RTSX_MS_CARD].card_event(
                                pcr->slots[RTSX_MS_CARD].p_dev);
 }
@@ -817,10 +838,6 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id)
                }
        }
-        if (pcr->card_inserted || pcr->card_removed)
-                schedule_delayed_work(&pcr->carddet_work,
-                                msecs_to_jiffies(200));
        if (int_reg & (NEED_COMPLETE_INT | DELINK_INT)) {
                if (int_reg & (TRANS_FAIL_INT | DELINK_INT)) {
                        pcr->trans_result = TRANS_RESULT_FAIL;
@@ -833,6 +850,10 @@ static irqreturn_t rtsx_pci_isr(int irq, void *dev_id)
                }
        }
+        if (pcr->card_inserted || pcr->card_removed)
+                schedule_delayed_work(&pcr->carddet_work,
+                                msecs_to_jiffies(200));
        spin_unlock(&pcr->lock);
        return IRQ_HANDLED;
 }
@@ -978,6 +999,10 @@ static int rtsx_pci_init_chip(struct rtsx_pcr *pcr)
        case 0x5289:
                rtl8411_init_params(pcr);
                break;
+        case 0x5227:
+                rts5227_init_params(pcr);
+                break;
        }
        dev_dbg(&(pcr->pci->dev), "PID: 0x%04x, IC version: 0x%02x\n",
@@ -1011,6 +1036,10 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
                pci_name(pcidev), (int)pcidev->vendor, (int)pcidev->device,
                (int)pcidev->revision);
+        ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32));
+        if (ret < 0)
+                return ret;
        ret = pci_enable_device(pcidev);
        if (ret)
                return ret;
diff --git a/drivers/mfd/rtsx_pcr.h b/drivers/mfd/rtsx_pcr.h
index 12462c1df1a9..2b3ab8a04823 100644
--- a/drivers/mfd/rtsx_pcr.h
+++ b/drivers/mfd/rtsx_pcr.h
@@ -25,8 +25,12 @@
 #include <linux/mfd/rtsx_pci.h>
+#define MIN_DIV_N_PCR           80
+#define MAX_DIV_N_PCR           208
 void rts5209_init_params(struct rtsx_pcr *pcr);
 void rts5229_init_params(struct rtsx_pcr *pcr);
 void rtl8411_init_params(struct rtsx_pcr *pcr);
+void rts5227_init_params(struct rtsx_pcr *pcr);
 #endif
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index a06d66b929b1..ecc092c7f745 100644
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -219,25 +219,18 @@ static void tc3589x_irq_unmap(struct irq_domain *d, unsigned int virq)
 }
 static struct irq_domain_ops tc3589x_irq_ops = {
-        .map    = tc3589x_irq_map,
+        .map    = tc3589x_irq_map,
        .unmap  = tc3589x_irq_unmap,
-        .xlate  = irq_domain_xlate_twocell,
+        .xlate  = irq_domain_xlate_twocell,
 };
 static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *np)
 {
        int base = tc3589x->irq_base;
-        if (base) {
+        tc3589x->domain = irq_domain_add_simple(
-                tc3589x->domain = irq_domain_add_legacy(
+                np, TC3589x_NR_INTERNAL_IRQS, base,
-                        NULL, TC3589x_NR_INTERNAL_IRQS, base,
+                &tc3589x_irq_ops, tc3589x);
-                        0, &tc3589x_irq_ops, tc3589x);
-        }
-        else {
-                tc3589x->domain = irq_domain_add_linear(
-                        np, TC3589x_NR_INTERNAL_IRQS,
-                        &tc3589x_irq_ops, tc3589x);
-        }
        if (!tc3589x->domain) {
                dev_err(tc3589x->dev, "Failed to create irqdomain\n");
diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c
index 409afa23d5dc..5ad4b772b097 100644
--- a/drivers/mfd/tps6507x.c
+++ b/drivers/mfd/tps6507x.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/of_device.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tps6507x.h>
@@ -116,11 +117,19 @@ static const struct i2c_device_id tps6507x_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tps6507x_i2c_id);
+#ifdef CONFIG_OF
+static struct of_device_id tps6507x_of_match[] = {
+        {.compatible = "ti,tps6507x", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, tps6507x_of_match);
+#endif
 static struct i2c_driver tps6507x_i2c_driver = {
        .driver = {
                   .name = "tps6507x",
                   .owner = THIS_MODULE,
+                   .of_match_table = of_match_ptr(tps6507x_of_match),
        },
        .probe = tps6507x_i2c_probe,
        .remove = tps6507x_i2c_remove,
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index 8d12a8e00d9c..98edb5be85c6 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -25,6 +25,8 @@
 #include <linux/i2c.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tps65090.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/err.h>
 #define NUM_INT_REG 2
@@ -148,18 +150,31 @@ static const struct regmap_config tps65090_regmap_config = {
        .volatile_reg = is_volatile_reg,
 };
+#ifdef CONFIG_OF
+static const struct of_device_id tps65090_of_match[] = {
+        { .compatible = "ti,tps65090",},
+        {},
+};
+MODULE_DEVICE_TABLE(of, tps65090_of_match);
+#endif
 static int tps65090_i2c_probe(struct i2c_client *client,
                                        const struct i2c_device_id *id)
 {
        struct tps65090_platform_data *pdata = client->dev.platform_data;
+        int irq_base = 0;
        struct tps65090 *tps65090;
        int ret;
-        if (!pdata) {
+        if (!pdata && !client->dev.of_node) {
-                dev_err(&client->dev, "tps65090 requires platform data\n");
+                dev_err(&client->dev,
+                        "tps65090 requires platform data or of_node\n");
                return -EINVAL;
        }
+        if (pdata)
+                irq_base = pdata->irq_base;
        tps65090 = devm_kzalloc(&client->dev, sizeof(*tps65090), GFP_KERNEL);
        if (!tps65090) {
                dev_err(&client->dev, "mem alloc for tps65090 failed\n");
@@ -178,7 +193,7 @@ static int tps65090_i2c_probe(struct i2c_client *client,
        if (client->irq) {
                ret = regmap_add_irq_chip(tps65090->rmap, client->irq,
-                        IRQF_ONESHOT | IRQF_TRIGGER_LOW, pdata->irq_base,
+                        IRQF_ONESHOT | IRQF_TRIGGER_LOW, irq_base,
                        &tps65090_irq_chip, &tps65090->irq_data);
                        if (ret) {
                                dev_err(&client->dev,
@@ -189,7 +204,7 @@ static int tps65090_i2c_probe(struct i2c_client *client,
        ret = mfd_add_devices(tps65090->dev, -1, tps65090s,
                ARRAY_SIZE(tps65090s), NULL,
-                regmap_irq_chip_get_base(tps65090->irq_data), NULL);
+                0, regmap_irq_get_domain(tps65090->irq_data));
        if (ret) {
                dev_err(&client->dev, "add mfd devices failed with err: %d\n",
                        ret);
@@ -215,28 +230,6 @@ static int tps65090_i2c_remove(struct i2c_client *client)
        return 0;
 }
-#ifdef CONFIG_PM_SLEEP
-static int tps65090_suspend(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        if (client->irq)
-                disable_irq(client->irq);
-        return 0;
-}
-static int tps65090_resume(struct device *dev)
-{
-        struct i2c_client *client = to_i2c_client(dev);
-        if (client->irq)
-                enable_irq(client->irq);
-        return 0;
-}
-#endif
-static const struct dev_pm_ops tps65090_pm_ops = {
-        SET_SYSTEM_SLEEP_PM_OPS(tps65090_suspend, tps65090_resume)
-};
 static const struct i2c_device_id tps65090_id_table[] = {
        { "tps65090", 0 },
        { },
@@ -247,7 +240,7 @@ static struct i2c_driver tps65090_driver = {
        .driver = {
                .name   = "tps65090",
                .owner  = THIS_MODULE,
-                .pm     = &tps65090_pm_ops,
+                .of_match_table = of_match_ptr(tps65090_of_match),
        },
        .probe          = tps65090_i2c_probe,
        .remove         = tps65090_i2c_remove,
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 4f3baadd0038..557f9ee5ec18 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -66,16 +66,6 @@
 /* Triton Core internal information (BEGIN) */
-#define TWL_NUM_SLAVES          4
-#define SUB_CHIP_ID0 0
-#define SUB_CHIP_ID1 1
-#define SUB_CHIP_ID2 2
-#define SUB_CHIP_ID3 3
-#define SUB_CHIP_ID_INVAL 0xff
-#define TWL_MODULE_LAST TWL4030_MODULE_LAST
 /* Base Address defns for twl4030_map[] */
 /* subchip/slave 0 - USB ID */
@@ -94,10 +84,7 @@
 #define TWL4030_BASEADD_MADC            0x0000
 #define TWL4030_BASEADD_MAIN_CHARGE     0x0074
 #define TWL4030_BASEADD_PRECHARGE       0x00AA
-#define TWL4030_BASEADD_PWM0            0x00F8
+#define TWL4030_BASEADD_PWM             0x00F8
-#define TWL4030_BASEADD_PWM1            0x00FB
-#define TWL4030_BASEADD_PWMA            0x00EF
-#define TWL4030_BASEADD_PWMB            0x00F1
 #define TWL4030_BASEADD_KEYPAD          0x00D2
 #define TWL5031_BASEADD_ACCESSORY       0x0074 /* Replaces Main Charge */
@@ -117,7 +104,7 @@
 /* subchip/slave 0 0x48 - POWER */
 #define TWL6030_BASEADD_RTC             0x0000
-#define TWL6030_BASEADD_MEM             0x0017
+#define TWL6030_BASEADD_SECURED_REG     0x0017
 #define TWL6030_BASEADD_PM_MASTER       0x001F
 #define TWL6030_BASEADD_PM_SLAVE_MISC   0x0030 /* PM_RECEIVER */
 #define TWL6030_BASEADD_PM_MISC         0x00E2
@@ -132,6 +119,7 @@
 #define TWL6030_BASEADD_PIH             0x00D0
 #define TWL6030_BASEADD_CHARGER         0x00E0
 #define TWL6025_BASEADD_CHARGER         0x00DA
+#define TWL6030_BASEADD_LED             0x00F4
 /* subchip/slave 2 0x4A - DFT */
 #define TWL6030_BASEADD_DIEID           0x00C0
@@ -153,33 +141,28 @@
 /*----------------------------------------------------------------------*/
-/* is driver active, bound to a chip? */
-static bool inuse;
-/* TWL IDCODE Register value */
-static u32 twl_idcode;
-static unsigned int twl_id;
-unsigned int twl_rev(void)
-{
-        return twl_id;
-}
-EXPORT_SYMBOL(twl_rev);
 /* Structure for each TWL4030/TWL6030 Slave */
 struct twl_client {
        struct i2c_client *client;
        struct regmap *regmap;
 };
-static struct twl_client twl_modules[TWL_NUM_SLAVES];
 /* mapping the module id to slave id and base address */
 struct twl_mapping {
        unsigned char sid;      /* Slave ID */
        unsigned char base;     /* base address */
 };
-static struct twl_mapping *twl_map;
+struct twl_private {
+        bool ready; /* The core driver is ready to be used */
+        u32 twl_idcode; /* TWL IDCODE Register value */
+        unsigned int twl_id;
+        struct twl_mapping *twl_map;
+        struct twl_client *twl_modules;
+};
+static struct twl_private *twl_priv;
 static struct twl_mapping twl4030_map[] = {
        /*
@@ -188,34 +171,33 @@ static struct twl_mapping twl4030_map[] = {
         * so they continue to match the order in this table.
         */
+        /* Common IPs */
        { 0, TWL4030_BASEADD_USB },
+        { 1, TWL4030_BASEADD_PIH },
+        { 2, TWL4030_BASEADD_MAIN_CHARGE },
+        { 3, TWL4030_BASEADD_PM_MASTER },
+        { 3, TWL4030_BASEADD_PM_RECEIVER },
+        { 3, TWL4030_BASEADD_RTC },
+        { 2, TWL4030_BASEADD_PWM },
+        { 2, TWL4030_BASEADD_LED },
+        { 3, TWL4030_BASEADD_SECURED_REG },
+        /* TWL4030 specific IPs */
        { 1, TWL4030_BASEADD_AUDIO_VOICE },
        { 1, TWL4030_BASEADD_GPIO },
        { 1, TWL4030_BASEADD_INTBR },
-        { 1, TWL4030_BASEADD_PIH },
        { 1, TWL4030_BASEADD_TEST },
        { 2, TWL4030_BASEADD_KEYPAD },
        { 2, TWL4030_BASEADD_MADC },
        { 2, TWL4030_BASEADD_INTERRUPTS },
-        { 2, TWL4030_BASEADD_LED },
-        { 2, TWL4030_BASEADD_MAIN_CHARGE },
        { 2, TWL4030_BASEADD_PRECHARGE },
-        { 2, TWL4030_BASEADD_PWM0 },
-        { 2, TWL4030_BASEADD_PWM1 },
-        { 2, TWL4030_BASEADD_PWMA },
-        { 2, TWL4030_BASEADD_PWMB },
-        { 2, TWL5031_BASEADD_ACCESSORY },
-        { 2, TWL5031_BASEADD_INTERRUPTS },
        { 3, TWL4030_BASEADD_BACKUP },
        { 3, TWL4030_BASEADD_INT },
-        { 3, TWL4030_BASEADD_PM_MASTER },
+        { 2, TWL5031_BASEADD_ACCESSORY },
-        { 3, TWL4030_BASEADD_PM_RECEIVER },
+        { 2, TWL5031_BASEADD_INTERRUPTS },
-        { 3, TWL4030_BASEADD_RTC },
-        { 3, TWL4030_BASEADD_SECURED_REG },
 };
 static struct regmap_config twl4030_regmap_config[4] = {
@@ -251,35 +233,25 @@ static struct twl_mapping twl6030_map[] = {
         * <linux/i2c/twl.h> defines for TWL4030_MODULE_*
         * so they continue to match the order in this table.
         */
-        { SUB_CHIP_ID1, TWL6030_BASEADD_USB },
-        { SUB_CHIP_ID_INVAL, TWL6030_BASEADD_AUDIO },
+        /* Common IPs */
-        { SUB_CHIP_ID2, TWL6030_BASEADD_DIEID },
+        { 1, TWL6030_BASEADD_USB },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
+        { 1, TWL6030_BASEADD_PIH },
-        { SUB_CHIP_ID1, TWL6030_BASEADD_PIH },
+        { 1, TWL6030_BASEADD_CHARGER },
+        { 0, TWL6030_BASEADD_PM_MASTER },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
+        { 0, TWL6030_BASEADD_PM_SLAVE_MISC },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
-        { SUB_CHIP_ID1, TWL6030_BASEADD_GPADC_CTRL },
+        { 0, TWL6030_BASEADD_RTC },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
+        { 1, TWL6030_BASEADD_PWM },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
+        { 1, TWL6030_BASEADD_LED },
+        { 0, TWL6030_BASEADD_SECURED_REG },
-        { SUB_CHIP_ID1, TWL6030_BASEADD_CHARGER },
-        { SUB_CHIP_ID1, TWL6030_BASEADD_GASGAUGE },
+        /* TWL6030 specific IPs */
-        { SUB_CHIP_ID1, TWL6030_BASEADD_PWM },
+        { 0, TWL6030_BASEADD_ZERO },
-        { SUB_CHIP_ID0, TWL6030_BASEADD_ZERO },
+        { 1, TWL6030_BASEADD_ZERO },
-        { SUB_CHIP_ID1, TWL6030_BASEADD_ZERO },
+        { 2, TWL6030_BASEADD_ZERO },
+        { 1, TWL6030_BASEADD_GPADC_CTRL },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_ZERO },
+        { 1, TWL6030_BASEADD_GASGAUGE },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_ZERO },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
-        { SUB_CHIP_ID2, TWL6030_BASEADD_RSV },
-        { SUB_CHIP_ID0, TWL6030_BASEADD_PM_MASTER },
-        { SUB_CHIP_ID0, TWL6030_BASEADD_PM_SLAVE_MISC },
-        { SUB_CHIP_ID0, TWL6030_BASEADD_RTC },
-        { SUB_CHIP_ID0, TWL6030_BASEADD_MEM },
-        { SUB_CHIP_ID1, TWL6025_BASEADD_CHARGER },
 };
 static struct regmap_config twl6030_regmap_config[3] = {
@@ -305,8 +277,30 @@ static struct regmap_config twl6030_regmap_config[3] = {
 /*----------------------------------------------------------------------*/
+static inline int twl_get_num_slaves(void)
+{
+        if (twl_class_is_4030())
+                return 4; /* TWL4030 class have four slave address */
+        else
+                return 3; /* TWL6030 class have three slave address */
+}
+static inline int twl_get_last_module(void)
+{
+        if (twl_class_is_4030())
+                return TWL4030_MODULE_LAST;
+        else
+                return TWL6030_MODULE_LAST;
+}
 /* Exported Functions */
+unsigned int twl_rev(void)
+{
+        return twl_priv ? twl_priv->twl_id : 0;
+}
+EXPORT_SYMBOL(twl_rev);
 /**
 * twl_i2c_write - Writes a n bit register in TWL4030/TWL5030/TWL60X0
 * @mod_no: module number
@@ -314,9 +308,6 @@ static struct regmap_config twl6030_regmap_config[3] = {
 * @reg: register address (just offset will do)
 * @num_bytes: number of bytes to transfer
 *
- * IMPORTANT: for 'value' parameter: Allocate value num_bytes+1 and
- * valid data starts at Offset 1.
- *
 * Returns the result of operation - 0 is success
 */
 int twl_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
@@ -325,24 +316,21 @@ int twl_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
        int sid;
        struct twl_client *twl;
-        if (unlikely(mod_no >= TWL_MODULE_LAST)) {
+        if (unlikely(mod_no >= twl_get_last_module())) {
                pr_err("%s: invalid module number %d\n", DRIVER_NAME, mod_no);
                return -EPERM;
        }
-        if (unlikely(!inuse)) {
+        if (unlikely(!twl_priv->ready)) {
                pr_err("%s: not initialized\n", DRIVER_NAME);
                return -EPERM;
        }
-        sid = twl_map[mod_no].sid;
-        if (unlikely(sid == SUB_CHIP_ID_INVAL)) {
-                pr_err("%s: module %d is not part of the pmic\n",
-                       DRIVER_NAME, mod_no);
-                return -EINVAL;
-        }
-        twl = &twl_modules[sid];
-        ret = regmap_bulk_write(twl->regmap, twl_map[mod_no].base + reg,
+        sid = twl_priv->twl_map[mod_no].sid;
-                                value, num_bytes);
+        twl = &twl_priv->twl_modules[sid];
+        ret = regmap_bulk_write(twl->regmap,
+                                twl_priv->twl_map[mod_no].base + reg, value,
+                                num_bytes);
        if (ret)
                pr_err("%s: Write failed (mod %d, reg 0x%02x count %d)\n",
@@ -367,24 +355,21 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
        int sid;
        struct twl_client *twl;
-        if (unlikely(mod_no >= TWL_MODULE_LAST)) {
+        if (unlikely(mod_no >= twl_get_last_module())) {
                pr_err("%s: invalid module number %d\n", DRIVER_NAME, mod_no);
                return -EPERM;
        }
-        if (unlikely(!inuse)) {
+        if (unlikely(!twl_priv->ready)) {
                pr_err("%s: not initialized\n", DRIVER_NAME);
                return -EPERM;
        }
-        sid = twl_map[mod_no].sid;
-        if (unlikely(sid == SUB_CHIP_ID_INVAL)) {
-                pr_err("%s: module %d is not part of the pmic\n",
-                       DRIVER_NAME, mod_no);
-                return -EINVAL;
-        }
-        twl = &twl_modules[sid];
-        ret = regmap_bulk_read(twl->regmap, twl_map[mod_no].base + reg,
+        sid = twl_priv->twl_map[mod_no].sid;
-                               value, num_bytes);
+        twl = &twl_priv->twl_modules[sid];
+        ret = regmap_bulk_read(twl->regmap,
+                               twl_priv->twl_map[mod_no].base + reg, value,
+                               num_bytes);
        if (ret)
                pr_err("%s: Read failed (mod %d, reg 0x%02x count %d)\n",
@@ -394,34 +379,6 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
 }
 EXPORT_SYMBOL(twl_i2c_read);
-/**
- * twl_i2c_write_u8 - Writes a 8 bit register in TWL4030/TWL5030/TWL60X0
- * @mod_no: module number
- * @value: the value to be written 8 bit
- * @reg: register address (just offset will do)
- *
- * Returns result of operation - 0 is success
- */
-int twl_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
-{
-        return twl_i2c_write(mod_no, &value, reg, 1);
-}
-EXPORT_SYMBOL(twl_i2c_write_u8);
-/**
- * twl_i2c_read_u8 - Reads a 8 bit register from TWL4030/TWL5030/TWL60X0
- * @mod_no: module number
- * @value: the value read 8 bit
- * @reg: register address (just offset will do)
- *
- * Returns result of operation - 0 is success
- */
-int twl_i2c_read_u8(u8 mod_no, u8 *value, u8 reg)
-{
-        return twl_i2c_read(mod_no, value, reg, 1);
-}
-EXPORT_SYMBOL(twl_i2c_read_u8);
 /*----------------------------------------------------------------------*/
 /**
@@ -440,7 +397,7 @@ static int twl_read_idcode_register(void)
                goto fail;
        }
-        err = twl_i2c_read(TWL4030_MODULE_INTBR, (u8 *)(&twl_idcode),
+        err = twl_i2c_read(TWL4030_MODULE_INTBR, (u8 *)(&twl_priv->twl_idcode),
                                                REG_IDCODE_7_0, 4);
        if (err) {
                pr_err("TWL4030: unable to read IDCODE -%d\n", err);
@@ -461,7 +418,7 @@ fail:
 */
 int twl_get_type(void)
 {
-        return TWL_SIL_TYPE(twl_idcode);
+        return TWL_SIL_TYPE(twl_priv->twl_idcode);
 }
 EXPORT_SYMBOL_GPL(twl_get_type);
@@ -472,7 +429,7 @@ EXPORT_SYMBOL_GPL(twl_get_type);
 */
 int twl_get_version(void)
 {
-        return TWL_SIL_REV(twl_idcode);
+        return TWL_SIL_REV(twl_priv->twl_idcode);
 }
 EXPORT_SYMBOL_GPL(twl_get_version);
@@ -509,13 +466,20 @@ int twl_get_hfclk_rate(void)
 EXPORT_SYMBOL_GPL(twl_get_hfclk_rate);
 static struct device *
-add_numbered_child(unsigned chip, const char *name, int num,
+add_numbered_child(unsigned mod_no, const char *name, int num,
                void *pdata, unsigned pdata_len,
                bool can_wakeup, int irq0, int irq1)
 {
        struct platform_device  *pdev;
-        struct twl_client       *twl = &twl_modules[chip];
+        struct twl_client       *twl;
-        int                     status;
+        int                     status, sid;
+        if (unlikely(mod_no >= twl_get_last_module())) {
+                pr_err("%s: invalid module number %d\n", DRIVER_NAME, mod_no);
+                return ERR_PTR(-EPERM);
+        }
+        sid = twl_priv->twl_map[mod_no].sid;
+        twl = &twl_priv->twl_modules[sid];
        pdev = platform_device_alloc(name, num);
        if (!pdev) {
@@ -560,11 +524,11 @@ err:
        return &pdev->dev;
 }
-static inline struct device *add_child(unsigned chip, const char *name,
+static inline struct device *add_child(unsigned mod_no, const char *name,
                void *pdata, unsigned pdata_len,
                bool can_wakeup, int irq0, int irq1)
 {
-        return add_numbered_child(chip, name, -1, pdata, pdata_len,
+        return add_numbered_child(mod_no, name, -1, pdata, pdata_len,
                can_wakeup, irq0, irq1);
 }
@@ -573,7 +537,6 @@ add_regulator_linked(int num, struct regulator_init_data *pdata,
                struct regulator_consumer_supply *consumers,
                unsigned num_consumers, unsigned long features)
 {
-        unsigned sub_chip_id;
        struct twl_regulator_driver_data drv_data;
        /* regulator framework demands init_data ... */
@@ -600,8 +563,7 @@ add_regulator_linked(int num, struct regulator_init_data *pdata,
        }
        /* NOTE:  we currently ignore regulator IRQs, e.g. for short circuits */
-        sub_chip_id = twl_map[TWL_MODULE_PM_MASTER].sid;
+        return add_numbered_child(TWL_MODULE_PM_MASTER, "twl_reg", num,
-        return add_numbered_child(sub_chip_id, "twl_reg", num,
                pdata, sizeof(*pdata), false, 0, 0);
 }
@@ -623,10 +585,9 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                unsigned long features)
 {
        struct device   *child;
-        unsigned sub_chip_id;
        if (IS_ENABLED(CONFIG_GPIO_TWL4030) && pdata->gpio) {
-                child = add_child(SUB_CHIP_ID1, "twl4030_gpio",
+                child = add_child(TWL4030_MODULE_GPIO, "twl4030_gpio",
                                pdata->gpio, sizeof(*pdata->gpio),
                                false, irq_base + GPIO_INTR_OFFSET, 0);
                if (IS_ERR(child))
@@ -634,7 +595,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
        }
        if (IS_ENABLED(CONFIG_KEYBOARD_TWL4030) && pdata->keypad) {
-                child = add_child(SUB_CHIP_ID2, "twl4030_keypad",
+                child = add_child(TWL4030_MODULE_KEYPAD, "twl4030_keypad",
                                pdata->keypad, sizeof(*pdata->keypad),
                                true, irq_base + KEYPAD_INTR_OFFSET, 0);
                if (IS_ERR(child))
@@ -643,7 +604,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
        if (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc &&
            twl_class_is_4030()) {
-                child = add_child(SUB_CHIP_ID2, "twl4030_madc",
+                child = add_child(TWL4030_MODULE_MADC, "twl4030_madc",
                                pdata->madc, sizeof(*pdata->madc),
                                true, irq_base + MADC_INTR_OFFSET, 0);
                if (IS_ERR(child))
@@ -658,22 +619,21 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                 * Eventually, Linux might become more aware of such
                 * HW security concerns, and "least privilege".
                 */
-                sub_chip_id = twl_map[TWL_MODULE_RTC].sid;
+                child = add_child(TWL_MODULE_RTC, "twl_rtc", NULL, 0,
-                child = add_child(sub_chip_id, "twl_rtc", NULL, 0,
                                true, irq_base + RTC_INTR_OFFSET, 0);
                if (IS_ERR(child))
                        return PTR_ERR(child);
        }
        if (IS_ENABLED(CONFIG_PWM_TWL)) {
-                child = add_child(SUB_CHIP_ID1, "twl-pwm", NULL, 0,
+                child = add_child(TWL_MODULE_PWM, "twl-pwm", NULL, 0,
                                  false, 0, 0);
                if (IS_ERR(child))
                        return PTR_ERR(child);
        }
        if (IS_ENABLED(CONFIG_PWM_TWL_LED)) {
-                child = add_child(SUB_CHIP_ID1, "twl-pwmled", NULL, 0,
+                child = add_child(TWL_MODULE_LED, "twl-pwmled", NULL, 0,
                                  false, 0, 0);
                if (IS_ERR(child))
                        return PTR_ERR(child);
@@ -725,7 +685,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                }
-                child = add_child(SUB_CHIP_ID0, "twl4030_usb",
+                child = add_child(TWL_MODULE_USB, "twl4030_usb",
                                pdata->usb, sizeof(*pdata->usb), true,
                                /* irq0 = USB_PRES, irq1 = USB */
                                irq_base + USB_PRES_INTR_OFFSET,
@@ -774,7 +734,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
                pdata->usb->features = features;
-                child = add_child(SUB_CHIP_ID0, "twl6030_usb",
+                child = add_child(TWL_MODULE_USB, "twl6030_usb",
                        pdata->usb, sizeof(*pdata->usb), true,
                        /* irq1 = VBUS_PRES, irq0 = USB ID */
                        irq_base + USBOTG_INTR_OFFSET,
@@ -799,22 +759,22 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
        }
        if (IS_ENABLED(CONFIG_TWL4030_WATCHDOG) && twl_class_is_4030()) {
-                child = add_child(SUB_CHIP_ID3, "twl4030_wdt", NULL, 0,
+                child = add_child(TWL_MODULE_PM_RECEIVER, "twl4030_wdt", NULL,
-                                  false, 0, 0);
+                                  0, false, 0, 0);
                if (IS_ERR(child))
                        return PTR_ERR(child);
        }
        if (IS_ENABLED(CONFIG_INPUT_TWL4030_PWRBUTTON) && twl_class_is_4030()) {
-                child = add_child(SUB_CHIP_ID3, "twl4030_pwrbutton", NULL, 0,
+                child = add_child(TWL_MODULE_PM_MASTER, "twl4030_pwrbutton",
-                                  true, irq_base + 8 + 0, 0);
+                                  NULL, 0, true, irq_base + 8 + 0, 0);
                if (IS_ERR(child))
                        return PTR_ERR(child);
        }
        if (IS_ENABLED(CONFIG_MFD_TWL4030_AUDIO) && pdata->audio &&
            twl_class_is_4030()) {
-                child = add_child(SUB_CHIP_ID1, "twl4030-audio",
+                child = add_child(TWL4030_MODULE_AUDIO_VOICE, "twl4030-audio",
                                pdata->audio, sizeof(*pdata->audio),
                                false, 0, 0);
                if (IS_ERR(child))
@@ -1054,7 +1014,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
        if (IS_ENABLED(CONFIG_CHARGER_TWL4030) && pdata->bci &&
                        !(features & (TPS_SUBSET | TWL5031))) {
-                child = add_child(SUB_CHIP_ID3, "twl4030_bci",
+                child = add_child(TWL_MODULE_MAIN_CHARGE, "twl4030_bci",
                                pdata->bci, sizeof(*pdata->bci), false,
                                /* irq0 = CHG_PRES, irq1 = BCI */
                                irq_base + BCI_PRES_INTR_OFFSET,
@@ -1145,25 +1105,23 @@ static int twl_remove(struct i2c_client *client)
        unsigned i, num_slaves;
        int status;
-        if (twl_class_is_4030()) {
+        if (twl_class_is_4030())
                status = twl4030_exit_irq();
-                num_slaves = TWL_NUM_SLAVES;
+        else
-        } else {
                status = twl6030_exit_irq();
-                num_slaves = TWL_NUM_SLAVES - 1;
-        }
        if (status < 0)
                return status;
+        num_slaves = twl_get_num_slaves();
        for (i = 0; i < num_slaves; i++) {
-                struct twl_client       *twl = &twl_modules[i];
+                struct twl_client       *twl = &twl_priv->twl_modules[i];
                if (twl->client && twl->client != client)
                        i2c_unregister_device(twl->client);
-                twl_modules[i].client = NULL;
+                twl->client = NULL;
        }
-        inuse = false;
+        twl_priv->ready = false;
        return 0;
 }
@@ -1179,6 +1137,17 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
        int                             status;
        unsigned                        i, num_slaves;
+        if (!node && !pdata) {
+                dev_err(&client->dev, "no platform data\n");
+                return -EINVAL;
+        }
+        if (twl_priv) {
+                dev_dbg(&client->dev, "only one instance of %s allowed\n",
+                        DRIVER_NAME);
+                return -EBUSY;
+        }
        pdev = platform_device_alloc(DRIVER_NAME, -1);
        if (!pdev) {
                dev_err(&client->dev, "can't alloc pdev\n");
@@ -1191,54 +1160,44 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
                return status;
        }
-        if (node && !pdata) {
-                /*
-                 * XXX: Temporary pdata until the information is correctly
-                 * retrieved by every TWL modules from DT.
-                 */
-                pdata = devm_kzalloc(&client->dev,
-                                     sizeof(struct twl4030_platform_data),
-                                     GFP_KERNEL);
-                if (!pdata) {
-                        status = -ENOMEM;
-                        goto free;
-                }
-        }
-        if (!pdata) {
-                dev_dbg(&client->dev, "no platform data?\n");
-                status = -EINVAL;
-                goto free;
-        }
-        platform_set_drvdata(pdev, pdata);
        if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C) == 0) {
                dev_dbg(&client->dev, "can't talk I2C?\n");
                status = -EIO;
                goto free;
        }
-        if (inuse) {
+        twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private),
-                dev_dbg(&client->dev, "driver is already in use\n");
+                                GFP_KERNEL);
-                status = -EBUSY;
+        if (!twl_priv) {
+                status = -ENOMEM;
                goto free;
        }
        if ((id->driver_data) & TWL6030_CLASS) {
-                twl_id = TWL6030_CLASS_ID;
+                twl_priv->twl_id = TWL6030_CLASS_ID;
-                twl_map = &twl6030_map[0];
+                twl_priv->twl_map = &twl6030_map[0];
+                /* The charger base address is different in twl6025 */
+                if ((id->driver_data) & TWL6025_SUBCLASS)
+                        twl_priv->twl_map[TWL_MODULE_MAIN_CHARGE].base =
+                                                        TWL6025_BASEADD_CHARGER;
                twl_regmap_config = twl6030_regmap_config;
-                num_slaves = TWL_NUM_SLAVES - 1;
        } else {
-                twl_id = TWL4030_CLASS_ID;
+                twl_priv->twl_id = TWL4030_CLASS_ID;
-                twl_map = &twl4030_map[0];
+                twl_priv->twl_map = &twl4030_map[0];
                twl_regmap_config = twl4030_regmap_config;
-                num_slaves = TWL_NUM_SLAVES;
+        }
+        num_slaves = twl_get_num_slaves();
+        twl_priv->twl_modules = devm_kzalloc(&client->dev,
+                                         sizeof(struct twl_client) * num_slaves,
+                                         GFP_KERNEL);
+        if (!twl_priv->twl_modules) {
+                status = -ENOMEM;
+                goto free;
        }
        for (i = 0; i < num_slaves; i++) {
-                struct twl_client *twl = &twl_modules[i];
+                struct twl_client *twl = &twl_priv->twl_modules[i];
                if (i == 0) {
                        twl->client = client;
@@ -1264,19 +1223,19 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
                }
        }
-        inuse = true;
+        twl_priv->ready = true;
        /* setup clock framework */
-        clocks_init(&pdev->dev, pdata->clock);
+        clocks_init(&pdev->dev, pdata ? pdata->clock : NULL);
        /* read TWL IDCODE Register */
-        if (twl_id == TWL4030_CLASS_ID) {
+        if (twl_class_is_4030()) {
                status = twl_read_idcode_register();
                WARN(status < 0, "Error: reading twl_idcode register value\n");
        }
        /* load power event scripts */
-        if (IS_ENABLED(CONFIG_TWL4030_POWER) && pdata->power)
+        if (IS_ENABLED(CONFIG_TWL4030_POWER) && pdata && pdata->power)
                twl4030_power_init(pdata->power);
        /* Maybe init the T2 Interrupt subsystem */
@@ -1308,10 +1267,9 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
                twl_i2c_write_u8(TWL4030_MODULE_INTBR, temp, REG_GPPUPDCTR1);
        }
-        status = -ENODEV;
        if (node)
                status = of_platform_populate(node, NULL, NULL, &client->dev);
-        if (status)
+        else
                status = add_children(pdata, irq_base, id->driver_data);
 fail:
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 4dae241e5017..dd362c1078e1 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -159,7 +159,7 @@ out:
 static int twl4030_write_script(u8 address, struct twl4030_ins *script,
                                       int len)
 {
-        int err;
+        int err = -EINVAL;
        for (; len; len--, address++, script++) {
                if (len == 1) {
diff --git a/drivers/mfd/vexpress-config.c b/drivers/mfd/vexpress-config.c
index fae15d880758..3c1723aa6225 100644
--- a/drivers/mfd/vexpress-config.c
+++ b/drivers/mfd/vexpress-config.c
@@ -67,6 +67,7 @@ struct vexpress_config_bridge *vexpress_config_bridge_register(
        return bridge;
 }
+EXPORT_SYMBOL(vexpress_config_bridge_register);
 void vexpress_config_bridge_unregister(struct vexpress_config_bridge *bridge)
 {
@@ -83,6 +84,7 @@ void vexpress_config_bridge_unregister(struct vexpress_config_bridge *bridge)
        while (!list_empty(&__bridge.transactions))
                cpu_relax();
 }
+EXPORT_SYMBOL(vexpress_config_bridge_unregister);
 struct vexpress_config_func {
@@ -142,6 +144,7 @@ struct vexpress_config_func *__vexpress_config_func_get(struct device *dev,
        return func;
 }
+EXPORT_SYMBOL(__vexpress_config_func_get);
 void vexpress_config_func_put(struct vexpress_config_func *func)
 {
@@ -149,7 +152,7 @@ void vexpress_config_func_put(struct vexpress_config_func *func)
        of_node_put(func->bridge->node);
        kfree(func);
 }
+EXPORT_SYMBOL(vexpress_config_func_put);
 struct vexpress_config_trans {
        struct vexpress_config_func *func;
@@ -229,6 +232,7 @@ void vexpress_config_complete(struct vexpress_config_bridge *bridge,
        complete(&trans->completion);
 }
+EXPORT_SYMBOL(vexpress_config_complete);
 int vexpress_config_wait(struct vexpress_config_trans *trans)
 {
@@ -236,7 +240,7 @@ int vexpress_config_wait(struct vexpress_config_trans *trans)
        return trans->status;
 }
+EXPORT_SYMBOL(vexpress_config_wait);
 int vexpress_config_read(struct vexpress_config_func *func, int offset,
                u32 *data)
diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index 77048b18439e..a4a43230abcd 100644
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -49,6 +49,8 @@
 #define SYS_ID_HBI_SHIFT        16
 #define SYS_PROCIDx_HBI_SHIFT   0
+#define SYS_LED_LED(n)          (1 << (n))
 #define SYS_MCI_CARDIN          (1 << 0)
 #define SYS_MCI_WPROT           (1 << 1)
@@ -336,34 +338,40 @@ void __init vexpress_sysreg_early_init(void __iomem *base)
 void __init vexpress_sysreg_of_early_init(void)
 {
-        struct device_node *node = of_find_compatible_node(NULL, NULL,
+        struct device_node *node;
-                        "arm,vexpress-sysreg");
+        if (vexpress_sysreg_base)
+                return;
+        node = of_find_compatible_node(NULL, NULL, "arm,vexpress-sysreg");
        if (node) {
                vexpress_sysreg_base = of_iomap(node, 0);
                vexpress_sysreg_setup(node);
-        } else {
-                pr_info("vexpress-sysreg: No Device Tree node found.");
        }
 }
+#define VEXPRESS_SYSREG_GPIO(_name, _reg, _value) \
+        [VEXPRESS_GPIO_##_name] = { \
+                .reg = _reg, \
+                .value = _reg##_##_value, \
+        }
 static struct vexpress_sysreg_gpio {
        unsigned long reg;
        u32 value;
 } vexpress_sysreg_gpios[] = {
-        [VEXPRESS_GPIO_MMC_CARDIN] = {
+        VEXPRESS_SYSREG_GPIO(MMC_CARDIN,        SYS_MCI,        CARDIN),
-                .reg = SYS_MCI,
+        VEXPRESS_SYSREG_GPIO(MMC_WPROT,         SYS_MCI,        WPROT),
-                .value = SYS_MCI_CARDIN,
+        VEXPRESS_SYSREG_GPIO(FLASH_WPn,         SYS_FLASH,      WPn),
-        },
+        VEXPRESS_SYSREG_GPIO(LED0,              SYS_LED,        LED(0)),
-        [VEXPRESS_GPIO_MMC_WPROT] = {
+        VEXPRESS_SYSREG_GPIO(LED1,              SYS_LED,        LED(1)),
-                .reg = SYS_MCI,
+        VEXPRESS_SYSREG_GPIO(LED2,              SYS_LED,        LED(2)),
-                .value = SYS_MCI_WPROT,
+        VEXPRESS_SYSREG_GPIO(LED3,              SYS_LED,        LED(3)),
-        },
+        VEXPRESS_SYSREG_GPIO(LED4,              SYS_LED,        LED(4)),
-        [VEXPRESS_GPIO_FLASH_WPn] = {
+        VEXPRESS_SYSREG_GPIO(LED5,              SYS_LED,        LED(5)),
-                .reg = SYS_FLASH,
+        VEXPRESS_SYSREG_GPIO(LED6,              SYS_LED,        LED(6)),
-                .value = SYS_FLASH_WPn,
+        VEXPRESS_SYSREG_GPIO(LED7,              SYS_LED,        LED(7)),
-        },
 };
 static int vexpress_sysreg_gpio_direction_input(struct gpio_chip *chip,
@@ -372,12 +380,6 @@ static int vexpress_sysreg_gpio_direction_input(struct gpio_chip *chip,
        return 0;
 }
-static int vexpress_sysreg_gpio_direction_output(struct gpio_chip *chip,
-                                                unsigned offset, int value)
-{
-        return 0;
-}
 static int vexpress_sysreg_gpio_get(struct gpio_chip *chip,
                                       unsigned offset)
 {
@@ -401,6 +403,14 @@ static void vexpress_sysreg_gpio_set(struct gpio_chip *chip,
        writel(reg_value, vexpress_sysreg_base + gpio->reg);
 }
+static int vexpress_sysreg_gpio_direction_output(struct gpio_chip *chip,
+                                                unsigned offset, int value)
+{
+        vexpress_sysreg_gpio_set(chip, offset, value);
+        return 0;
+}
 static struct gpio_chip vexpress_sysreg_gpio_chip = {
        .label = "vexpress-sysreg",
        .direction_input = vexpress_sysreg_gpio_direction_input,
@@ -412,6 +422,30 @@ static struct gpio_chip vexpress_sysreg_gpio_chip = {
 };
+#define VEXPRESS_SYSREG_GREEN_LED(_name, _default_trigger, _gpio) \
+        { \
+                .name = "v2m:green:"_name, \
+                .default_trigger = _default_trigger, \
+                .gpio = VEXPRESS_GPIO_##_gpio, \
+        }
+struct gpio_led vexpress_sysreg_leds[] = {
+        VEXPRESS_SYSREG_GREEN_LED("user1",      "heartbeat",    LED0),
+        VEXPRESS_SYSREG_GREEN_LED("user2",      "mmc0",         LED1),
+        VEXPRESS_SYSREG_GREEN_LED("user3",      "cpu0",         LED2),
+        VEXPRESS_SYSREG_GREEN_LED("user4",      "cpu1",         LED3),
+        VEXPRESS_SYSREG_GREEN_LED("user5",      "cpu2",         LED4),
+        VEXPRESS_SYSREG_GREEN_LED("user6",      "cpu3",         LED5),
+        VEXPRESS_SYSREG_GREEN_LED("user7",      "cpu4",         LED6),
+        VEXPRESS_SYSREG_GREEN_LED("user8",      "cpu5",         LED7),
+};
+struct gpio_led_platform_data vexpress_sysreg_leds_pdata = {
+        .num_leds = ARRAY_SIZE(vexpress_sysreg_leds),
+        .leds = vexpress_sysreg_leds,
+};
 static ssize_t vexpress_sysreg_sys_id_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {
@@ -456,6 +490,10 @@ static int vexpress_sysreg_probe(struct platform_device *pdev)
                return err;
        }
+        platform_device_register_data(vexpress_sysreg_dev, "leds-gpio",
+                        PLATFORM_DEVID_AUTO, &vexpress_sysreg_leds_pdata,
+                        sizeof(vexpress_sysreg_leds_pdata));
        vexpress_sysreg_dev = &pdev->dev;
        device_create_file(vexpress_sysreg_dev, &dev_attr_sys_id);
@@ -478,6 +516,7 @@ static struct platform_driver vexpress_sysreg_driver = {
 static int __init vexpress_sysreg_init(void)
 {
+        vexpress_sysreg_of_early_init();
        return platform_driver_register(&vexpress_sysreg_driver);
 }
 core_initcall(vexpress_sysreg_init);
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index 088872ab6338..d754596eb942 100644
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -59,12 +59,13 @@ static const struct reg_default wm5102_reva_patch[] = {
 static const struct reg_default wm5102_revb_patch[] = {
        { 0x80, 0x0003 },
        { 0x081, 0xE022 },
-        { 0x410, 0x6080 },
+        { 0x410, 0x4080 },
-        { 0x418, 0x6080 },
+        { 0x418, 0x4080 },
-        { 0x420, 0x6080 },
+        { 0x420, 0x4080 },
        { 0x428, 0xC000 },
-        { 0x441, 0x8014 },
+        { 0x4B0, 0x0066 },
        { 0x458, 0x000b },
+        { 0x212, 0x0000 },
        { 0x80, 0x0000 },
 };
@@ -224,11 +225,9 @@ const struct regmap_irq_chip wm5102_irq = {
 static const struct reg_default wm5102_reg_default[] = {
        { 0x00000008, 0x0019 },   /* R8     - Ctrl IF SPI CFG 1 */ 
        { 0x00000009, 0x0001 },   /* R9     - Ctrl IF I2C1 CFG 1 */ 
-        { 0x0000000D, 0x0000 },   /* R13    - Ctrl IF Status 1 */ 
        { 0x00000016, 0x0000 },   /* R22    - Write Sequencer Ctrl 0 */ 
        { 0x00000017, 0x0000 },   /* R23    - Write Sequencer Ctrl 1 */ 
        { 0x00000018, 0x0000 },   /* R24    - Write Sequencer Ctrl 2 */ 
-        { 0x0000001A, 0x0000 },   /* R26    - Write Sequencer PROM */ 
        { 0x00000020, 0x0000 },   /* R32    - Tone Generator 1 */ 
        { 0x00000021, 0x1000 },   /* R33    - Tone Generator 2 */ 
        { 0x00000022, 0x0000 },   /* R34    - Tone Generator 3 */ 
@@ -243,12 +242,14 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000062, 0x01FF },   /* R98    - Sample Rate Sequence Select 2 */ 
        { 0x00000063, 0x01FF },   /* R99    - Sample Rate Sequence Select 3 */ 
        { 0x00000064, 0x01FF },   /* R100   - Sample Rate Sequence Select 4 */ 
-        { 0x00000068, 0x01FF },   /* R104   - Always On Triggers Sequence Select 1 */ 
+        { 0x00000066, 0x01FF },   /* R102   - Always On Triggers Sequence Select 1 */
-        { 0x00000069, 0x01FF },   /* R105   - Always On Triggers Sequence Select 2 */ 
+        { 0x00000067, 0x01FF },   /* R103   - Always On Triggers Sequence Select 2 */
-        { 0x0000006A, 0x01FF },   /* R106   - Always On Triggers Sequence Select 3 */ 
+        { 0x00000068, 0x01FF },   /* R104   - Always On Triggers Sequence Select 3 */
-        { 0x0000006B, 0x01FF },   /* R107   - Always On Triggers Sequence Select 4 */ 
+        { 0x00000069, 0x01FF },   /* R105   - Always On Triggers Sequence Select 4 */
-        { 0x0000006C, 0x01FF },   /* R108   - Always On Triggers Sequence Select 5 */ 
+        { 0x0000006A, 0x01FF },   /* R106   - Always On Triggers Sequence Select 5 */
-        { 0x0000006D, 0x01FF },   /* R109   - Always On Triggers Sequence Select 6 */ 
+        { 0x0000006B, 0x01FF },   /* R107   - Always On Triggers Sequence Select 6 */
+        { 0x0000006E, 0x01FF },   /* R110   - Trigger Sequence Select 32 */
+        { 0x0000006F, 0x01FF },   /* R111   - Trigger Sequence Select 33 */
        { 0x00000070, 0x0000 },   /* R112   - Comfort Noise Generator */ 
        { 0x00000090, 0x0000 },   /* R144   - Haptics Control 1 */ 
        { 0x00000091, 0x7FFF },   /* R145   - Haptics Control 2 */ 
@@ -258,13 +259,14 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000095, 0x0000 },   /* R149   - Haptics phase 2 duration */ 
        { 0x00000096, 0x0000 },   /* R150   - Haptics phase 3 intensity */ 
        { 0x00000097, 0x0000 },   /* R151   - Haptics phase 3 duration */ 
-        { 0x00000100, 0x0001 },   /* R256   - Clock 32k 1 */ 
+        { 0x00000100, 0x0002 },   /* R256   - Clock 32k 1 */
        { 0x00000101, 0x0304 },   /* R257   - System Clock 1 */ 
        { 0x00000102, 0x0011 },   /* R258   - Sample rate 1 */ 
        { 0x00000103, 0x0011 },   /* R259   - Sample rate 2 */ 
        { 0x00000104, 0x0011 },   /* R260   - Sample rate 3 */ 
        { 0x00000112, 0x0305 },   /* R274   - Async clock 1 */ 
        { 0x00000113, 0x0011 },   /* R275   - Async sample rate 1 */ 
+        { 0x00000114, 0x0011 },   /* R276   - Async sample rate 2 */
        { 0x00000149, 0x0000 },   /* R329   - Output system clock */ 
        { 0x0000014A, 0x0000 },   /* R330   - Output async clock */ 
        { 0x00000152, 0x0000 },   /* R338   - Rate Estimator 1 */ 
@@ -273,13 +275,14 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000155, 0x0000 },   /* R341   - Rate Estimator 4 */ 
        { 0x00000156, 0x0000 },   /* R342   - Rate Estimator 5 */ 
        { 0x00000161, 0x0000 },   /* R353   - Dynamic Frequency Scaling 1 */ 
-        { 0x00000171, 0x0000 },   /* R369   - FLL1 Control 1 */ 
+        { 0x00000171, 0x0002 },   /* R369   - FLL1 Control 1 */
        { 0x00000172, 0x0008 },   /* R370   - FLL1 Control 2 */ 
        { 0x00000173, 0x0018 },   /* R371   - FLL1 Control 3 */ 
        { 0x00000174, 0x007D },   /* R372   - FLL1 Control 4 */ 
        { 0x00000175, 0x0004 },   /* R373   - FLL1 Control 5 */ 
        { 0x00000176, 0x0000 },   /* R374   - FLL1 Control 6 */ 
        { 0x00000177, 0x0181 },   /* R375   - FLL1 Loop Filter Test 1 */ 
+        { 0x00000178, 0x0000 },   /* R376   - FLL1 NCO Test 0 */
        { 0x00000181, 0x0000 },   /* R385   - FLL1 Synchroniser 1 */ 
        { 0x00000182, 0x0000 },   /* R386   - FLL1 Synchroniser 2 */ 
        { 0x00000183, 0x0000 },   /* R387   - FLL1 Synchroniser 3 */ 
@@ -295,6 +298,7 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000195, 0x0004 },   /* R405   - FLL2 Control 5 */ 
        { 0x00000196, 0x0000 },   /* R406   - FLL2 Control 6 */ 
        { 0x00000197, 0x0000 },   /* R407   - FLL2 Loop Filter Test 1 */ 
+        { 0x00000198, 0x0000 },   /* R408   - FLL2 NCO Test 0 */
        { 0x000001A1, 0x0000 },   /* R417   - FLL2 Synchroniser 1 */ 
        { 0x000001A2, 0x0000 },   /* R418   - FLL2 Synchroniser 2 */ 
        { 0x000001A3, 0x0000 },   /* R419   - FLL2 Synchroniser 3 */ 
@@ -310,8 +314,13 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000218, 0x01A6 },   /* R536   - Mic Bias Ctrl 1 */ 
        { 0x00000219, 0x01A6 },   /* R537   - Mic Bias Ctrl 2 */ 
        { 0x0000021A, 0x01A6 },   /* R538   - Mic Bias Ctrl 3 */ 
+        { 0x00000225, 0x0400 },   /* R549   - HP Ctrl 1L */
+        { 0x00000226, 0x0400 },   /* R550   - HP Ctrl 1R */
        { 0x00000293, 0x0000 },   /* R659   - Accessory Detect Mode 1 */ 
        { 0x0000029B, 0x0020 },   /* R667   - Headphone Detect 1 */ 
+        { 0x0000029C, 0x0000 },   /* R668   - Headphone Detect 2 */
+        { 0x0000029F, 0x0000 },   /* R671   - Headphone Detect Test */
+        { 0x000002A2, 0x0000 },   /* R674   - Micd Clamp control */
        { 0x000002A3, 0x1102 },   /* R675   - Mic Detect 1 */ 
        { 0x000002A4, 0x009F },   /* R676   - Mic Detect 2 */ 
        { 0x000002A5, 0x0000 },   /* R677   - Mic Detect 3 */ 
@@ -342,53 +351,44 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000400, 0x0000 },   /* R1024  - Output Enables 1 */ 
        { 0x00000408, 0x0000 },   /* R1032  - Output Rate 1 */ 
        { 0x00000409, 0x0022 },   /* R1033  - Output Volume Ramp */ 
-        { 0x00000410, 0x0080 },   /* R1040  - Output Path Config 1L */ 
+        { 0x00000410, 0x4080 },   /* R1040  - Output Path Config 1L */
        { 0x00000411, 0x0180 },   /* R1041  - DAC Digital Volume 1L */ 
-        { 0x00000412, 0x0080 },   /* R1042  - DAC Volume Limit 1L */ 
+        { 0x00000412, 0x0081 },   /* R1042  - DAC Volume Limit 1L */
        { 0x00000413, 0x0001 },   /* R1043  - Noise Gate Select 1L */ 
        { 0x00000414, 0x0080 },   /* R1044  - Output Path Config 1R */ 
        { 0x00000415, 0x0180 },   /* R1045  - DAC Digital Volume 1R */ 
-        { 0x00000416, 0x0080 },   /* R1046  - DAC Volume Limit 1R */ 
+        { 0x00000416, 0x0081 },   /* R1046  - DAC Volume Limit 1R */
        { 0x00000417, 0x0002 },   /* R1047  - Noise Gate Select 1R */ 
-        { 0x00000418, 0x0080 },   /* R1048  - Output Path Config 2L */ 
+        { 0x00000418, 0x4080 },   /* R1048  - Output Path Config 2L */
        { 0x00000419, 0x0180 },   /* R1049  - DAC Digital Volume 2L */ 
-        { 0x0000041A, 0x0080 },   /* R1050  - DAC Volume Limit 2L */ 
+        { 0x0000041A, 0x0081 },   /* R1050  - DAC Volume Limit 2L */
        { 0x0000041B, 0x0004 },   /* R1051  - Noise Gate Select 2L */ 
        { 0x0000041C, 0x0080 },   /* R1052  - Output Path Config 2R */ 
        { 0x0000041D, 0x0180 },   /* R1053  - DAC Digital Volume 2R */ 
-        { 0x0000041E, 0x0080 },   /* R1054  - DAC Volume Limit 2R */ 
+        { 0x0000041E, 0x0081 },   /* R1054  - DAC Volume Limit 2R */
        { 0x0000041F, 0x0008 },   /* R1055  - Noise Gate Select 2R */ 
-        { 0x00000420, 0x0080 },   /* R1056  - Output Path Config 3L */ 
+        { 0x00000420, 0x4080 },   /* R1056  - Output Path Config 3L */
        { 0x00000421, 0x0180 },   /* R1057  - DAC Digital Volume 3L */ 
-        { 0x00000422, 0x0080 },   /* R1058  - DAC Volume Limit 3L */ 
+        { 0x00000422, 0x0081 },   /* R1058  - DAC Volume Limit 3L */
        { 0x00000423, 0x0010 },   /* R1059  - Noise Gate Select 3L */ 
-        { 0x00000424, 0x0080 },   /* R1060  - Output Path Config 3R */ 
+        { 0x00000428, 0xC000 },   /* R1064  - Output Path Config 4L */
-        { 0x00000425, 0x0180 },   /* R1061  - DAC Digital Volume 3R */ 
-        { 0x00000426, 0x0080 },   /* R1062  - DAC Volume Limit 3R */ 
-        { 0x00000428, 0x0000 },   /* R1064  - Output Path Config 4L */ 
        { 0x00000429, 0x0180 },   /* R1065  - DAC Digital Volume 4L */ 
-        { 0x0000042A, 0x0080 },   /* R1066  - Out Volume 4L */ 
+        { 0x0000042A, 0x0081 },   /* R1066  - Out Volume 4L */
        { 0x0000042B, 0x0040 },   /* R1067  - Noise Gate Select 4L */ 
-        { 0x0000042C, 0x0000 },   /* R1068  - Output Path Config 4R */ 
        { 0x0000042D, 0x0180 },   /* R1069  - DAC Digital Volume 4R */ 
-        { 0x0000042E, 0x0080 },   /* R1070  - Out Volume 4R */ 
+        { 0x0000042E, 0x0081 },   /* R1070  - Out Volume 4R */
        { 0x0000042F, 0x0080 },   /* R1071  - Noise Gate Select 4R */ 
        { 0x00000430, 0x0000 },   /* R1072  - Output Path Config 5L */ 
        { 0x00000431, 0x0180 },   /* R1073  - DAC Digital Volume 5L */ 
-        { 0x00000432, 0x0080 },   /* R1074  - DAC Volume Limit 5L */ 
+        { 0x00000432, 0x0081 },   /* R1074  - DAC Volume Limit 5L */
        { 0x00000433, 0x0100 },   /* R1075  - Noise Gate Select 5L */ 
-        { 0x00000434, 0x0000 },   /* R1076  - Output Path Config 5R */ 
        { 0x00000435, 0x0180 },   /* R1077  - DAC Digital Volume 5R */ 
-        { 0x00000436, 0x0080 },   /* R1078  - DAC Volume Limit 5R */ 
+        { 0x00000436, 0x0081 },   /* R1078  - DAC Volume Limit 5R */
-        { 0x00000437, 0x0200 },   /* R1079  - Noise Gate Select 5R */ 
+        { 0x00000437, 0x0200 },   /* R1079  - Noise Gate Select 5R */
        { 0x00000450, 0x0000 },   /* R1104  - DAC AEC Control 1 */ 
        { 0x00000458, 0x0001 },   /* R1112  - Noise Gate Control */ 
        { 0x00000490, 0x0069 },   /* R1168  - PDM SPK1 CTRL 1 */ 
        { 0x00000491, 0x0000 },   /* R1169  - PDM SPK1 CTRL 2 */ 
-        { 0x000004DC, 0x0000 },   /* R1244  - DAC comp 1 */ 
-        { 0x000004DD, 0x0000 },   /* R1245  - DAC comp 2 */ 
-        { 0x000004DE, 0x0000 },   /* R1246  - DAC comp 3 */ 
-        { 0x000004DF, 0x0000 },   /* R1247  - DAC comp 4 */ 
        { 0x00000500, 0x000C },   /* R1280  - AIF1 BCLK Ctrl */ 
        { 0x00000501, 0x0008 },   /* R1281  - AIF1 Tx Pin Ctrl */ 
        { 0x00000502, 0x0000 },   /* R1282  - AIF1 Rx Pin Ctrl */ 
@@ -416,7 +416,6 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000518, 0x0007 },   /* R1304  - AIF1 Frame Ctrl 18 */ 
        { 0x00000519, 0x0000 },   /* R1305  - AIF1 Tx Enables */ 
        { 0x0000051A, 0x0000 },   /* R1306  - AIF1 Rx Enables */ 
-        { 0x0000051B, 0x0000 },   /* R1307  - AIF1 Force Write */ 
        { 0x00000540, 0x000C },   /* R1344  - AIF2 BCLK Ctrl */ 
        { 0x00000541, 0x0008 },   /* R1345  - AIF2 Tx Pin Ctrl */ 
        { 0x00000542, 0x0000 },   /* R1346  - AIF2 Rx Pin Ctrl */ 
@@ -432,7 +431,6 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000552, 0x0001 },   /* R1362  - AIF2 Frame Ctrl 12 */ 
        { 0x00000559, 0x0000 },   /* R1369  - AIF2 Tx Enables */ 
        { 0x0000055A, 0x0000 },   /* R1370  - AIF2 Rx Enables */ 
-        { 0x0000055B, 0x0000 },   /* R1371  - AIF2 Force Write */ 
        { 0x00000580, 0x000C },   /* R1408  - AIF3 BCLK Ctrl */ 
        { 0x00000581, 0x0008 },   /* R1409  - AIF3 Tx Pin Ctrl */ 
        { 0x00000582, 0x0000 },   /* R1410  - AIF3 Rx Pin Ctrl */ 
@@ -448,7 +446,6 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000592, 0x0001 },   /* R1426  - AIF3 Frame Ctrl 12 */ 
        { 0x00000599, 0x0000 },   /* R1433  - AIF3 Tx Enables */ 
        { 0x0000059A, 0x0000 },   /* R1434  - AIF3 Rx Enables */ 
-        { 0x0000059B, 0x0000 },   /* R1435  - AIF3 Force Write */ 
        { 0x000005E3, 0x0004 },   /* R1507  - SLIMbus Framer Ref Gear */ 
        { 0x000005E5, 0x0000 },   /* R1509  - SLIMbus Rates 1 */ 
        { 0x000005E6, 0x0000 },   /* R1510  - SLIMbus Rates 2 */ 
@@ -772,22 +769,6 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x000008CD, 0x0080 },   /* R2253  - DRC1RMIX Input 3 Volume */ 
        { 0x000008CE, 0x0000 },   /* R2254  - DRC1RMIX Input 4 Source */ 
        { 0x000008CF, 0x0080 },   /* R2255  - DRC1RMIX Input 4 Volume */ 
-        { 0x000008D0, 0x0000 },   /* R2256  - DRC2LMIX Input 1 Source */ 
-        { 0x000008D1, 0x0080 },   /* R2257  - DRC2LMIX Input 1 Volume */ 
-        { 0x000008D2, 0x0000 },   /* R2258  - DRC2LMIX Input 2 Source */ 
-        { 0x000008D3, 0x0080 },   /* R2259  - DRC2LMIX Input 2 Volume */ 
-        { 0x000008D4, 0x0000 },   /* R2260  - DRC2LMIX Input 3 Source */ 
-        { 0x000008D5, 0x0080 },   /* R2261  - DRC2LMIX Input 3 Volume */ 
-        { 0x000008D6, 0x0000 },   /* R2262  - DRC2LMIX Input 4 Source */ 
-        { 0x000008D7, 0x0080 },   /* R2263  - DRC2LMIX Input 4 Volume */ 
-        { 0x000008D8, 0x0000 },   /* R2264  - DRC2RMIX Input 1 Source */ 
-        { 0x000008D9, 0x0080 },   /* R2265  - DRC2RMIX Input 1 Volume */ 
-        { 0x000008DA, 0x0000 },   /* R2266  - DRC2RMIX Input 2 Source */ 
-        { 0x000008DB, 0x0080 },   /* R2267  - DRC2RMIX Input 2 Volume */ 
-        { 0x000008DC, 0x0000 },   /* R2268  - DRC2RMIX Input 3 Source */ 
-        { 0x000008DD, 0x0080 },   /* R2269  - DRC2RMIX Input 3 Volume */ 
-        { 0x000008DE, 0x0000 },   /* R2270  - DRC2RMIX Input 4 Source */ 
-        { 0x000008DF, 0x0080 },   /* R2271  - DRC2RMIX Input 4 Volume */ 
        { 0x00000900, 0x0000 },   /* R2304  - HPLP1MIX Input 1 Source */ 
        { 0x00000901, 0x0080 },   /* R2305  - HPLP1MIX Input 1 Volume */ 
        { 0x00000902, 0x0000 },   /* R2306  - HPLP1MIX Input 2 Source */ 
@@ -879,7 +860,7 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000D1B, 0xFFFF },   /* R3355  - IRQ2 Status 4 Mask */ 
        { 0x00000D1C, 0xFFFF },   /* R3356  - IRQ2 Status 5 Mask */ 
        { 0x00000D1F, 0x0000 },   /* R3359  - IRQ2 Control */ 
-        { 0x00000D41, 0x0000 },   /* R3393  - ADSP2 IRQ0 */ 
+        { 0x00000D50, 0x0000 },   /* R3408  - AOD wkup and trig */
        { 0x00000D53, 0xFFFF },   /* R3411  - AOD IRQ Mask IRQ1 */ 
        { 0x00000D54, 0xFFFF },   /* R3412  - AOD IRQ Mask IRQ2 */ 
        { 0x00000D56, 0x0000 },   /* R3414  - Jack detect debounce */ 
@@ -974,11 +955,6 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000E82, 0x0018 },   /* R3714  - DRC1 ctrl3 */ 
        { 0x00000E83, 0x0000 },   /* R3715  - DRC1 ctrl4 */ 
        { 0x00000E84, 0x0000 },   /* R3716  - DRC1 ctrl5 */ 
-        { 0x00000E89, 0x0018 },   /* R3721  - DRC2 ctrl1 */ 
-        { 0x00000E8A, 0x0933 },   /* R3722  - DRC2 ctrl2 */ 
-        { 0x00000E8B, 0x0018 },   /* R3723  - DRC2 ctrl3 */ 
-        { 0x00000E8C, 0x0000 },   /* R3724  - DRC2 ctrl4 */ 
-        { 0x00000E8D, 0x0000 },   /* R3725  - DRC2 ctrl5 */ 
        { 0x00000EC0, 0x0000 },   /* R3776  - HPLPF1_1 */ 
        { 0x00000EC1, 0x0000 },   /* R3777  - HPLPF1_2 */ 
        { 0x00000EC4, 0x0000 },   /* R3780  - HPLPF2_1 */ 
@@ -989,16 +965,12 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x00000ECD, 0x0000 },   /* R3789  - HPLPF4_2 */ 
        { 0x00000EE0, 0x0000 },   /* R3808  - ASRC_ENABLE */ 
        { 0x00000EE2, 0x0000 },   /* R3810  - ASRC_RATE1 */ 
-        { 0x00000EE3, 0x4000 },   /* R3811  - ASRC_RATE2 */ 
        { 0x00000EF0, 0x0000 },   /* R3824  - ISRC 1 CTRL 1 */ 
        { 0x00000EF1, 0x0000 },   /* R3825  - ISRC 1 CTRL 2 */ 
        { 0x00000EF2, 0x0000 },   /* R3826  - ISRC 1 CTRL 3 */ 
        { 0x00000EF3, 0x0000 },   /* R3827  - ISRC 2 CTRL 1 */ 
        { 0x00000EF4, 0x0000 },   /* R3828  - ISRC 2 CTRL 2 */ 
        { 0x00000EF5, 0x0000 },   /* R3829  - ISRC 2 CTRL 3 */ 
-        { 0x00000EF6, 0x0000 },   /* R3830  - ISRC 3 CTRL 1 */ 
-        { 0x00000EF7, 0x0000 },   /* R3831  - ISRC 3 CTRL 2 */ 
-        { 0x00000EF8, 0x0000 },   /* R3832  - ISRC 3 CTRL 3 */ 
        { 0x00001100, 0x0010 },   /* R4352  - DSP1 Control 1 */ 
        { 0x00001101, 0x0000 },   /* R4353  - DSP1 Clocking 1 */ 
 };
@@ -1823,17 +1795,24 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
        case ARIZONA_DSP1_STATUS_1:
        case ARIZONA_DSP1_STATUS_2:
        case ARIZONA_DSP1_STATUS_3:
+        case ARIZONA_DSP1_SCRATCH_0:
+        case ARIZONA_DSP1_SCRATCH_1:
+        case ARIZONA_DSP1_SCRATCH_2:
+        case ARIZONA_DSP1_SCRATCH_3:
                return true;
        default:
-                return false;
+                if ((reg >= 0x100000 && reg < 0x106000) ||
+                    (reg >= 0x180000 && reg < 0x180800) ||
+                    (reg >= 0x190000 && reg < 0x194800) ||
+                    (reg >= 0x1a8000 && reg < 0x1a9800))
+                        return true;
+                else
+                        return false;
        }
 }
 static bool wm5102_volatile_register(struct device *dev, unsigned int reg)
 {
-        if (reg > 0xffff)
-                return true;
        switch (reg) {
        case ARIZONA_SOFTWARE_RESET:
        case ARIZONA_DEVICE_REVISION:
@@ -1874,15 +1853,25 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)
        case ARIZONA_DSP1_STATUS_1:
        case ARIZONA_DSP1_STATUS_2:
        case ARIZONA_DSP1_STATUS_3:
+        case ARIZONA_DSP1_SCRATCH_0:
+        case ARIZONA_DSP1_SCRATCH_1:
+        case ARIZONA_DSP1_SCRATCH_2:
+        case ARIZONA_DSP1_SCRATCH_3:
        case ARIZONA_HEADPHONE_DETECT_2:
        case ARIZONA_MIC_DETECT_3:
                return true;
        default:
-                return false;
+                if ((reg >= 0x100000 && reg < 0x106000) ||
+                    (reg >= 0x180000 && reg < 0x180800) ||
+                    (reg >= 0x190000 && reg < 0x194800) ||
+                    (reg >= 0x1a8000 && reg < 0x1a9800))
+                        return true;
+                else
+                        return false;
        }
 }
-#define WM5102_MAX_REGISTER 0x1a8fff
+#define WM5102_MAX_REGISTER 0x1a9800
 const struct regmap_config wm5102_spi_regmap = {
        .reg_bits = 32,
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 57c488d42d3e..803e93fae56a 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -467,7 +467,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                goto err;
        }
                
-        ret = regulator_bulk_get(wm8994->dev, wm8994->num_supplies,
+        ret = devm_regulator_bulk_get(wm8994->dev, wm8994->num_supplies,
                                 wm8994->supplies);
        if (ret != 0) {
                dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);
@@ -478,7 +478,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                                    wm8994->supplies);
        if (ret != 0) {
                dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret);
-                goto err_get;
+                goto err;
        }
        ret = wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET);
@@ -658,8 +658,6 @@ err_irq:
 err_enable:
        regulator_bulk_disable(wm8994->num_supplies,
                               wm8994->supplies);
-err_get:
-        regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);
 err:
        mfd_remove_devices(wm8994->dev);
        return ret;
@@ -672,7 +670,6 @@ static void wm8994_device_exit(struct wm8994 *wm8994)
        wm8994_irq_exit(wm8994);
        regulator_bulk_disable(wm8994->num_supplies,
                               wm8994->supplies);
-        regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);
 }
 static const struct of_device_id wm8994_of_match[] = {
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index 571915dfb218..f74b5adca642 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -1060,26 +1060,6 @@ static int sd_wait_voltage_stable_2(struct realtek_pci_sdmmc *host)
        return 0;
 }
-static int sd_change_bank_voltage(struct realtek_pci_sdmmc *host, u8 voltage)
-{
-        struct rtsx_pcr *pcr = host->pcr;
-        int err;
-        if (voltage == SD_IO_3V3) {
-                err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24);
-                if (err < 0)
-                        return err;
-        } else if (voltage == SD_IO_1V8) {
-                err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24);
-                if (err < 0)
-                        return err;
-        } else {
-                return -EINVAL;
-        }
-        return 0;
-}
 static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
 {
        struct realtek_pci_sdmmc *host = mmc_priv(mmc);
@@ -1098,11 +1078,11 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
        rtsx_pci_start_run(pcr);
        if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330)
-                voltage = SD_IO_3V3;
+                voltage = OUTPUT_3V3;
        else
-                voltage = SD_IO_1V8;
+                voltage = OUTPUT_1V8;
-        if (voltage == SD_IO_1V8) {
+        if (voltage == OUTPUT_1V8) {
                err = rtsx_pci_write_register(pcr,
                                SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);
                if (err < 0)
@@ -1113,11 +1093,11 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
                        goto out;
        }
-        err = sd_change_bank_voltage(host, voltage);
+        err = rtsx_pci_switch_output_voltage(pcr, voltage);
        if (err < 0)
                goto out;
-        if (voltage == SD_IO_1V8) {
+        if (voltage == OUTPUT_1V8) {
                err = sd_wait_voltage_stable_2(host);
                if (err < 0)
                        goto out;
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 5233b8f58d77..58607f196c9e 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -960,7 +960,7 @@ static int c_can_handle_bus_err(struct net_device *dev,
                break;
        case LEC_ACK_ERROR:
                netdev_dbg(dev, "ack error\n");
-                cf->data[2] |= (CAN_ERR_PROT_LOC_ACK |
+                cf->data[3] |= (CAN_ERR_PROT_LOC_ACK |
                                CAN_ERR_PROT_LOC_ACK_DEL);
                break;
        case LEC_BIT1_ERROR:
@@ -973,7 +973,7 @@ static int c_can_handle_bus_err(struct net_device *dev,
                break;
        case LEC_CRC_ERROR:
                netdev_dbg(dev, "CRC error\n");
-                cf->data[2] |= (CAN_ERR_PROT_LOC_CRC_SEQ |
+                cf->data[3] |= (CAN_ERR_PROT_LOC_CRC_SEQ |
                                CAN_ERR_PROT_LOC_CRC_DEL);
                break;
        default:
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 7d1748575b1f..5c314a961970 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -560,7 +560,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
                stats->rx_errors++;
                break;
        case PCH_CRC_ERR:
-                cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ |
+                cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ |
                               CAN_ERR_PROT_LOC_CRC_DEL;
                priv->can.can_stats.bus_error++;
                stats->rx_errors++;
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index f898c6363729..300581b24ff3 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -746,12 +746,12 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
                }
                if (err_status & HECC_CANES_CRCE) {
                        hecc_set_bit(priv, HECC_CANES, HECC_CANES_CRCE);
-                        cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ |
+                        cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ |
                                        CAN_ERR_PROT_LOC_CRC_DEL;
                }
                if (err_status & HECC_CANES_ACKE) {
                        hecc_set_bit(priv, HECC_CANES, HECC_CANES_ACKE);
-                        cf->data[2] |= CAN_ERR_PROT_LOC_ACK |
+                        cf->data[3] |= CAN_ERR_PROT_LOC_ACK |
                                        CAN_ERR_PROT_LOC_ACK_DEL;
                }
        }
diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c
index 66df93638085..ffd8de28a76a 100644
--- a/drivers/net/ethernet/3com/3c574_cs.c
+++ b/drivers/net/ethernet/3com/3c574_cs.c
@@ -432,7 +432,7 @@ static int tc574_config(struct pcmcia_device *link)
        netdev_info(dev, "%s at io %#3lx, irq %d, hw_addr %pM\n",
                    cardname, dev->base_addr, dev->irq, dev->dev_addr);
        netdev_info(dev, " %dK FIFO split %s Rx:Tx, %sMII interface.\n",
-                    8 << config & Ram_size,
+                    8 << (config & Ram_size),
                    ram_split[(config & Ram_split) >> Ram_split_shift],
                    config & Autoselect ? "autoselect " : "");
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 78ea90c40e19..bdb086934cd9 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -1283,14 +1283,26 @@ static int tg3_phy_auxctl_write(struct tg3 *tp, int reg, u32 set)
        return tg3_writephy(tp, MII_TG3_AUX_CTRL, set | reg);
 }
-#define TG3_PHY_AUXCTL_SMDSP_ENABLE(tp) \
+static int tg3_phy_toggle_auxctl_smdsp(struct tg3 *tp, bool enable)
-        tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \
+{
-                             MII_TG3_AUXCTL_ACTL_SMDSP_ENA | \
+        u32 val;
-                             MII_TG3_AUXCTL_ACTL_TX_6DB)
+        int err;
-#define TG3_PHY_AUXCTL_SMDSP_DISABLE(tp) \
+        err = tg3_phy_auxctl_read(tp, MII_TG3_AUXCTL_SHDWSEL_AUXCTL, &val);
-        tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \
-                             MII_TG3_AUXCTL_ACTL_TX_6DB);
+        if (err)
+                return err;
+        if (enable)
+                val |= MII_TG3_AUXCTL_ACTL_SMDSP_ENA;
+        else
+                val &= ~MII_TG3_AUXCTL_ACTL_SMDSP_ENA;
+        err = tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL,
+                                   val | MII_TG3_AUXCTL_ACTL_TX_6DB);
+        return err;
+}
 static int tg3_bmcr_reset(struct tg3 *tp)
 {
@@ -2223,7 +2235,7 @@ static void tg3_phy_apply_otp(struct tg3 *tp)
        otp = tp->phy_otp;
-        if (TG3_PHY_AUXCTL_SMDSP_ENABLE(tp))
+        if (tg3_phy_toggle_auxctl_smdsp(tp, true))
                return;
        phy = ((otp & TG3_OTP_AGCTGT_MASK) >> TG3_OTP_AGCTGT_SHIFT);
@@ -2248,7 +2260,7 @@ static void tg3_phy_apply_otp(struct tg3 *tp)
              ((otp & TG3_OTP_RCOFF_MASK) >> TG3_OTP_RCOFF_SHIFT);
        tg3_phydsp_write(tp, MII_TG3_DSP_EXP97, phy);
-        TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
+        tg3_phy_toggle_auxctl_smdsp(tp, false);
 }
 static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)
@@ -2284,9 +2296,9 @@ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)
        if (!tp->setlpicnt) {
                if (current_link_up == 1 &&
-                   !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
+                   !tg3_phy_toggle_auxctl_smdsp(tp, true)) {
                        tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, 0x0000);
-                        TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
+                        tg3_phy_toggle_auxctl_smdsp(tp, false);
                }
                val = tr32(TG3_CPMU_EEE_MODE);
@@ -2302,11 +2314,11 @@ static void tg3_phy_eee_enable(struct tg3 *tp)
            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
             tg3_flag(tp, 57765_CLASS)) &&
-            !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
+            !tg3_phy_toggle_auxctl_smdsp(tp, true)) {
                val = MII_TG3_DSP_TAP26_ALNOKO |
                      MII_TG3_DSP_TAP26_RMRXSTO;
                tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, val);
-                TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
+                tg3_phy_toggle_auxctl_smdsp(tp, false);
        }
        val = tr32(TG3_CPMU_EEE_MODE);
@@ -2450,7 +2462,7 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
                tg3_writephy(tp, MII_CTRL1000,
                             CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER);
-                err = TG3_PHY_AUXCTL_SMDSP_ENABLE(tp);
+                err = tg3_phy_toggle_auxctl_smdsp(tp, true);
                if (err)
                        return err;
@@ -2471,7 +2483,7 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
        tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8200);
        tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0000);
-        TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
+        tg3_phy_toggle_auxctl_smdsp(tp, false);
        tg3_writephy(tp, MII_CTRL1000, phy9_orig);
@@ -2572,10 +2584,10 @@ static int tg3_phy_reset(struct tg3 *tp)
 out:
        if ((tp->phy_flags & TG3_PHYFLG_ADC_BUG) &&
-            !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
+            !tg3_phy_toggle_auxctl_smdsp(tp, true)) {
                tg3_phydsp_write(tp, 0x201f, 0x2aaa);
                tg3_phydsp_write(tp, 0x000a, 0x0323);
-                TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
+                tg3_phy_toggle_auxctl_smdsp(tp, false);
        }
        if (tp->phy_flags & TG3_PHYFLG_5704_A0_BUG) {
@@ -2584,14 +2596,14 @@ out:
        }
        if (tp->phy_flags & TG3_PHYFLG_BER_BUG) {
-                if (!TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
+                if (!tg3_phy_toggle_auxctl_smdsp(tp, true)) {
                        tg3_phydsp_write(tp, 0x000a, 0x310b);
                        tg3_phydsp_write(tp, 0x201f, 0x9506);
                        tg3_phydsp_write(tp, 0x401f, 0x14e2);
-                        TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
+                        tg3_phy_toggle_auxctl_smdsp(tp, false);
                }
        } else if (tp->phy_flags & TG3_PHYFLG_JITTER_BUG) {
-                if (!TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {
+                if (!tg3_phy_toggle_auxctl_smdsp(tp, true)) {
                        tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a);
                        if (tp->phy_flags & TG3_PHYFLG_ADJUST_TRIM) {
                                tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x110b);
@@ -2600,7 +2612,7 @@ out:
                        } else
                                tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x010b);
-                        TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
+                        tg3_phy_toggle_auxctl_smdsp(tp, false);
                }
        }
@@ -4009,7 +4021,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)
        tw32(TG3_CPMU_EEE_MODE,
             tr32(TG3_CPMU_EEE_MODE) & ~TG3_CPMU_EEEMD_LPI_ENABLE);
-        err = TG3_PHY_AUXCTL_SMDSP_ENABLE(tp);
+        err = tg3_phy_toggle_auxctl_smdsp(tp, true);
        if (!err) {
                u32 err2;
@@ -4042,7 +4054,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)
                                                 MII_TG3_DSP_CH34TP2_HIBW01);
                }
-                err2 = TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);
+                err2 = tg3_phy_toggle_auxctl_smdsp(tp, false);
                if (!err)
                        err = err2;
        }
@@ -6950,6 +6962,9 @@ static void tg3_poll_controller(struct net_device *dev)
        int i;
        struct tg3 *tp = netdev_priv(dev);
+        if (tg3_irq_sync(tp))
+                return;
        for (i = 0; i < tp->irq_cnt; i++)
                tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]);
 }
@@ -16367,6 +16382,7 @@ static int tg3_init_one(struct pci_dev *pdev,
        tp->pm_cap = pm_cap;
        tp->rx_mode = TG3_DEF_RX_MODE;
        tp->tx_mode = TG3_DEF_TX_MODE;
+        tp->irq_sync = 1;
        if (tg3_debug > 0)
                tp->msg_enable = tg3_debug;
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index b407043ce9b0..f7f02900f650 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -548,6 +548,10 @@ static int desc_get_rx_status(struct xgmac_priv *priv, struct xgmac_dma_desc *p)
                return -1;
        }
+        /* All frames should fit into a single buffer */
+        if (!(status & RXDESC_FIRST_SEG) || !(status & RXDESC_LAST_SEG))
+                return -1;
        /* Check if packet has checksum already */
        if ((status & RXDESC_FRAME_TYPE) && (status & RXDESC_EXT_STATUS) &&
                !(ext_status & RXDESC_IP_PAYLOAD_MASK))
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index f0718e1a8369..c306df7d4568 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -1994,9 +1994,20 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 {
        const struct port_info *pi = netdev_priv(dev);
        struct adapter *adap = pi->adapter;
+        struct sge_rspq *q;
-        return set_rxq_intr_params(adap, &adap->sge.ethrxq[pi->first_qset].rspq,
+        int i;
-                        c->rx_coalesce_usecs, c->rx_max_coalesced_frames);
+        int r = 0;
+        for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; i++) {
+                q = &adap->sge.ethrxq[i].rspq;
+                r = set_rxq_intr_params(adap, q, c->rx_coalesce_usecs,
+                        c->rx_max_coalesced_frames);
+                if (r) {
+                        dev_err(&dev->dev, "failed to set coalesce %d\n", r);
+                        break;
+                }
+        }
+        return r;
 }
 static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
index f3a632bf8d96..687c83d1bdab 100644
--- a/drivers/net/ethernet/intel/ixgbe/Makefile
+++ b/drivers/net/ethernet/intel/ixgbe/Makefile
@@ -32,7 +32,7 @@
 obj-$(CONFIG_IXGBE) += ixgbe.o
-ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o ixgbe_debugfs.o\
+ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
              ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
              ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o ixgbe_ptp.o
@@ -40,4 +40,5 @@ ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \
                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o
 ixgbe-$(CONFIG_IXGBE_HWMON) += ixgbe_sysfs.o
+ixgbe-$(CONFIG_DEBUG_FS) += ixgbe_debugfs.o
 ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
index 50aa546b8c7a..3504686d3af5 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c
@@ -24,9 +24,6 @@
  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
 *******************************************************************************/
-#ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #include <linux/module.h>
@@ -277,5 +274,3 @@ void ixgbe_dbg_exit(void)
 {
        debugfs_remove_recursive(ixgbe_dbg_root);
 }
-#endif /* CONFIG_DEBUG_FS */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index 1a751c9d09c4..bb9256a1b0a9 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -660,11 +660,11 @@ int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter,
                break;
        case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
                tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L4_V1;
-                tsync_rx_mtrl = IXGBE_RXMTRL_V1_SYNC_MSG;
+                tsync_rx_mtrl |= IXGBE_RXMTRL_V1_SYNC_MSG;
                break;
        case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
                tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L4_V1;
-                tsync_rx_mtrl = IXGBE_RXMTRL_V1_DELAY_REQ_MSG;
+                tsync_rx_mtrl |= IXGBE_RXMTRL_V1_DELAY_REQ_MSG;
                break;
        case HWTSTAMP_FILTER_PTP_V2_EVENT:
        case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 2b799f4f1c37..6771b69f40d5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -630,10 +630,15 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
                ring->tx_csum++;
        }
-        /* Copy dst mac address to wqe */
+        if (mlx4_is_mfunc(mdev->dev) || priv->validate_loopback) {
-        ethh = (struct ethhdr *)skb->data;
+                /* Copy dst mac address to wqe. This allows loopback in eSwitch,
-        tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((__be16 *)ethh->h_dest);
+                 * so that VFs and PF can communicate with each other
-        tx_desc->ctrl.imm = get_unaligned((__be32 *)(ethh->h_dest + 2));
+                 */
+                ethh = (struct ethhdr *)skb->data;
+                tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((__be16 *)ethh->h_dest);
+                tx_desc->ctrl.imm = get_unaligned((__be32 *)(ethh->h_dest + 2));
+        }
        /* Handle LSO (TSO) packets */
        if (lso_header_size) {
                /* Mark opcode as LSO */
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index e1bafffbc3b1..a6542d75374c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -1790,15 +1790,8 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
        int i;
        if (msi_x) {
-                /* In multifunction mode each function gets 2 msi-X vectors
+                nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
-                 * one for data path completions anf the other for asynch events
+                             nreq);
-                 * or command completions */
-                if (mlx4_is_mfunc(dev)) {
-                        nreq = 2;
-                } else {
-                        nreq = min_t(int, dev->caps.num_eqs -
-                                     dev->caps.reserved_eqs, nreq);
-                }
                entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
                if (!entries)
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index bc165f4d0f65..695667d471a1 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -144,7 +144,7 @@ void netxen_release_tx_buffers(struct netxen_adapter *adapter)
                                         buffrag->length, PCI_DMA_TODEVICE);
                        buffrag->dma = 0ULL;
                }
-                for (j = 0; j < cmd_buf->frag_count; j++) {
+                for (j = 1; j < cmd_buf->frag_count; j++) {
                        buffrag++;
                        if (buffrag->dma) {
                                pci_unmap_page(adapter->pdev, buffrag->dma,
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 6098fd4adfeb..69e321a65077 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -1963,10 +1963,12 @@ unwind:
        while (--i >= 0) {
                nf = &pbuf->frag_array[i+1];
                pci_unmap_page(pdev, nf->dma, nf->length, PCI_DMA_TODEVICE);
+                nf->dma = 0ULL;
        }
        nf = &pbuf->frag_array[0];
        pci_unmap_single(pdev, nf->dma, skb_headlen(skb), PCI_DMA_TODEVICE);
+        nf->dma = 0ULL;
 out_err:
        return -ENOMEM;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index ed96f309bca8..11702324a071 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1826,8 +1826,6 @@ static void rtl8169_rx_vlan_tag(struct RxDesc *desc, struct sk_buff *skb)
        if (opts2 & RxVlanTag)
                __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff));
-        desc->opts2 = 0;
 }
 static int rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -6064,8 +6062,6 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget
                            !(status & (RxRWT | RxFOVF)) &&
                            (dev->features & NETIF_F_RXALL))
                                goto process_pkt;
-                        rtl8169_mark_to_asic(desc, rx_buf_sz);
                } else {
                        struct sk_buff *skb;
                        dma_addr_t addr;
@@ -6086,16 +6082,14 @@ process_pkt:
                        if (unlikely(rtl8169_fragmented_frame(status))) {
                                dev->stats.rx_dropped++;
                                dev->stats.rx_length_errors++;
-                                rtl8169_mark_to_asic(desc, rx_buf_sz);
+                                goto release_descriptor;
-                                continue;
                        }
                        skb = rtl8169_try_rx_copy(tp->Rx_databuff[entry],
                                                  tp, pkt_size, addr);
-                        rtl8169_mark_to_asic(desc, rx_buf_sz);
                        if (!skb) {
                                dev->stats.rx_dropped++;
-                                continue;
+                                goto release_descriptor;
                        }
                        rtl8169_rx_csum(skb, status);
@@ -6111,13 +6105,10 @@ process_pkt:
                        tp->rx_stats.bytes += pkt_size;
                        u64_stats_update_end(&tp->rx_stats.syncp);
                }
+release_descriptor:
-                /* Work around for AMD plateform. */
+                desc->opts2 = 0;
-                if ((desc->opts2 & cpu_to_le32(0xfffe000)) &&
+                wmb();
-                    (tp->mac_version == RTL_GIGA_MAC_VER_05)) {
+                rtl8169_mark_to_asic(desc, rx_buf_sz);
-                        desc->opts2 = 0;
-                        cur_rx++;
-                }
        }
        count = cur_rx - tp->cur_rx;
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 5fd6f4674326..e6fe0d80d612 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -84,7 +84,7 @@ struct hv_netvsc_packet {
 };
 struct netvsc_device_info {
-        unsigned char mac_adr[6];
+        unsigned char mac_adr[ETH_ALEN];
        bool link_state;        /* 0 - link up, 1 - link down */
        int  ring_size;
 };
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index f825a629a699..8264f0ef7692 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -349,7 +349,7 @@ static int netvsc_set_mac_addr(struct net_device *ndev, void *p)
        struct net_device_context *ndevctx = netdev_priv(ndev);
        struct hv_device *hdev =  ndevctx->device_ctx;
        struct sockaddr *addr = p;
-        char save_adr[14];
+        char save_adr[ETH_ALEN];
        unsigned char save_aatype;
        int err;
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 81f8f9e31db5..fcbf680c3e62 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -77,6 +77,11 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
        skb_orphan(skb);
+        /* Before queueing this packet to netif_rx(),
+         * make sure dst is refcounted.
+         */
+        skb_dst_force(skb);
        skb->protocol = eth_type_trans(skb, dev);
        /* it's OK to use per_cpu_ptr() because BHs are off */
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 68a43fe602e7..d3fb97d97cbc 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -822,7 +822,10 @@ static int macvlan_changelink(struct net_device *dev,
 static size_t macvlan_get_size(const struct net_device *dev)
 {
-        return nla_total_size(4);
+        return (0
+                + nla_total_size(4) /* IFLA_MACVLAN_MODE */
+                + nla_total_size(2) /* IFLA_MACVLAN_FLAGS */
+                );
 }
 static int macvlan_fill_info(struct sk_buff *skb,
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
index d5199cb4caec..b5ddd5077a80 100644
--- a/drivers/net/phy/icplus.c
+++ b/drivers/net/phy/icplus.c
@@ -36,8 +36,9 @@ MODULE_LICENSE("GPL");
 /* IP101A/G - IP1001 */
 #define IP10XX_SPEC_CTRL_STATUS         16      /* Spec. Control Register */
+#define IP1001_RXPHASE_SEL              (1<<0)  /* Add delay on RX_CLK */
+#define IP1001_TXPHASE_SEL              (1<<1)  /* Add delay on TX_CLK */
 #define IP1001_SPEC_CTRL_STATUS_2       20      /* IP1001 Spec. Control Reg 2 */
-#define IP1001_PHASE_SEL_MASK           3       /* IP1001 RX/TXPHASE_SEL */
 #define IP1001_APS_ON                   11      /* IP1001 APS Mode  bit */
 #define IP101A_G_APS_ON                 2       /* IP101A/G APS Mode bit */
 #define IP101A_G_IRQ_CONF_STATUS        0x11    /* Conf Info IRQ & Status Reg */
@@ -138,19 +139,24 @@ static int ip1001_config_init(struct phy_device *phydev)
        if (c < 0)
                return c;
-        /* INTR pin used: speed/link/duplex will cause an interrupt */
+        if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
-        c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT);
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
-        if (c < 0)
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
-                return c;
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
-        if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
-                /* Additional delay (2ns) used to adjust RX clock phase
-                 * at RGMII interface */
                c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS);
                if (c < 0)
                        return c;
-                c |= IP1001_PHASE_SEL_MASK;
+                c &= ~(IP1001_RXPHASE_SEL | IP1001_TXPHASE_SEL);
+                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
+                        c |= (IP1001_RXPHASE_SEL | IP1001_TXPHASE_SEL);
+                else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+                        c |= IP1001_RXPHASE_SEL;
+                else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+                        c |= IP1001_TXPHASE_SEL;
                c = phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c);
                if (c < 0)
                        return c;
@@ -167,6 +173,11 @@ static int ip101a_g_config_init(struct phy_device *phydev)
        if (c < 0)
                return c;
+        /* INTR pin used: speed/link/duplex will cause an interrupt */
+        c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT);
+        if (c < 0)
+                return c;
        /* Enable Auto Power Saving mode */
        c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS);
        c |= IP101A_G_APS_ON;
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 5d2a3f215887..22dec9c7ef05 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -353,15 +353,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
        int err;
        int temp;
-        /* Enable Fiber/Copper auto selection */
-        temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
-        temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO;
-        phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
-        temp = phy_read(phydev, MII_BMCR);
-        temp |= BMCR_RESET;
-        phy_write(phydev, MII_BMCR, temp);
        if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
            (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
            (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index af372d0957fe..cc09b67c23bc 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -109,11 +109,11 @@ struct tap_filter {
        unsigned char   addr[FLT_EXACT_COUNT][ETH_ALEN];
 };
-/* 1024 is probably a high enough limit: modern hypervisors seem to support on
+/* DEFAULT_MAX_NUM_RSS_QUEUES were choosed to let the rx/tx queues allocated for
- * the order of 100-200 CPUs so this leaves us some breathing space if we want
+ * the netdevice to be fit in one page. So we can make sure the success of
- * to match a queue per guest CPU.
+ * memory allocation. TODO: increase the limit. */
- */
+#define MAX_TAP_QUEUES DEFAULT_MAX_NUM_RSS_QUEUES
-#define MAX_TAP_QUEUES 1024
+#define MAX_TAP_FLOWS  4096
 #define TUN_FLOW_EXPIRE (3 * HZ)
@@ -185,6 +185,8 @@ struct tun_struct {
        unsigned long ageing_time;
        unsigned int numdisabled;
        struct list_head disabled;
+        void *security;
+        u32 flow_count;
 };
 static inline u32 tun_hashfn(u32 rxhash)
@@ -218,6 +220,7 @@ static struct tun_flow_entry *tun_flow_create(struct tun_struct *tun,
                e->queue_index = queue_index;
                e->tun = tun;
                hlist_add_head_rcu(&e->hash_link, head);
+                ++tun->flow_count;
        }
        return e;
 }
@@ -228,6 +231,7 @@ static void tun_flow_delete(struct tun_struct *tun, struct tun_flow_entry *e)
                  e->rxhash, e->queue_index);
        hlist_del_rcu(&e->hash_link);
        kfree_rcu(e, rcu);
+        --tun->flow_count;
 }
 static void tun_flow_flush(struct tun_struct *tun)
@@ -317,7 +321,8 @@ static void tun_flow_update(struct tun_struct *tun, u32 rxhash,
                e->updated = jiffies;
        } else {
                spin_lock_bh(&tun->lock);
-                if (!tun_flow_find(head, rxhash))
+                if (!tun_flow_find(head, rxhash) &&
+                    tun->flow_count < MAX_TAP_FLOWS)
                        tun_flow_create(tun, head, rxhash, queue_index);
                if (!timer_pending(&tun->flow_gc_timer))
@@ -490,6 +495,10 @@ static int tun_attach(struct tun_struct *tun, struct file *file)
        struct tun_file *tfile = file->private_data;
        int err;
+        err = security_tun_dev_attach(tfile->socket.sk, tun->security);
+        if (err < 0)
+                goto out;
        err = -EINVAL;
        if (rtnl_dereference(tfile->tun))
                goto out;
@@ -1373,6 +1382,7 @@ static void tun_free_netdev(struct net_device *dev)
        BUG_ON(!(list_empty(&tun->disabled)));
        tun_flow_uninit(tun);
+        security_tun_dev_free_security(tun->security);
        free_netdev(dev);
 }
@@ -1562,7 +1572,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                if (tun_not_capable(tun))
                        return -EPERM;
-                err = security_tun_dev_attach(tfile->socket.sk);
+                err = security_tun_dev_open(tun->security);
                if (err < 0)
                        return err;
@@ -1577,6 +1587,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
        else {
                char *name;
                unsigned long flags = 0;
+                int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ?
+                             MAX_TAP_QUEUES : 1;
                if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
                        return -EPERM;
@@ -1600,8 +1612,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                        name = ifr->ifr_name;
                dev = alloc_netdev_mqs(sizeof(struct tun_struct), name,
-                                       tun_setup,
+                                       tun_setup, queues, queues);
-                                       MAX_TAP_QUEUES, MAX_TAP_QUEUES);
                if (!dev)
                        return -ENOMEM;
@@ -1619,7 +1631,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                spin_lock_init(&tun->lock);
-                security_tun_dev_post_create(&tfile->sk);
+                err = security_tun_dev_alloc_security(&tun->security);
+                if (err < 0)
+                        goto err_free_dev;
                tun_net_init(dev);
@@ -1789,10 +1803,14 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr)
        if (ifr->ifr_flags & IFF_ATTACH_QUEUE) {
                tun = tfile->detached;
-                if (!tun)
+                if (!tun) {
                        ret = -EINVAL;
-                else
+                        goto unlock;
-                        ret = tun_attach(tun, file);
+                }
+                ret = security_tun_dev_attach_queue(tun->security);
+                if (ret < 0)
+                        goto unlock;
+                ret = tun_attach(tun, file);
        } else if (ifr->ifr_flags & IFF_DETACH_QUEUE) {
                tun = rtnl_dereference(tfile->tun);
                if (!tun || !(tun->flags & TUN_TAP_MQ))
@@ -1802,6 +1820,7 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr)
        } else
                ret = -EINVAL;
+unlock:
        rtnl_unlock();
        return ret;
 }
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
index 42f51c71ec1f..248d2dc765a5 100644
--- a/drivers/net/usb/cdc_mbim.c
+++ b/drivers/net/usb/cdc_mbim.c
@@ -374,6 +374,21 @@ static const struct driver_info cdc_mbim_info = {
        .tx_fixup = cdc_mbim_tx_fixup,
 };
+/* MBIM and NCM devices should not need a ZLP after NTBs with
+ * dwNtbOutMaxSize length. This driver_info is for the exceptional
+ * devices requiring it anyway, allowing them to be supported without
+ * forcing the performance penalty on all the sane devices.
+ */
+static const struct driver_info cdc_mbim_info_zlp = {
+        .description = "CDC MBIM",
+        .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN | FLAG_SEND_ZLP,
+        .bind = cdc_mbim_bind,
+        .unbind = cdc_mbim_unbind,
+        .manage_power = cdc_mbim_manage_power,
+        .rx_fixup = cdc_mbim_rx_fixup,
+        .tx_fixup = cdc_mbim_tx_fixup,
+};
 static const struct usb_device_id mbim_devs[] = {
        /* This duplicate NCM entry is intentional. MBIM devices can
         * be disguised as NCM by default, and this is necessary to
@@ -385,6 +400,10 @@ static const struct usb_device_id mbim_devs[] = {
        { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE),
          .driver_info = (unsigned long)&cdc_mbim_info,
        },
+        /* Sierra Wireless MC7710 need ZLPs */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68a2, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
+          .driver_info = (unsigned long)&cdc_mbim_info_zlp,
+        },
        { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
          .driver_info = (unsigned long)&cdc_mbim_info,
        },
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 71b6e92b8e9b..9197b2c72ca3 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -435,6 +435,13 @@ advance:
                len -= temp;
        }
+        /* some buggy devices have an IAD but no CDC Union */
+        if (!ctx->union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) {
+                ctx->control = intf;
+                ctx->data = usb_ifnum_to_if(dev->udev, intf->cur_altsetting->desc.bInterfaceNumber + 1);
+                dev_dbg(&intf->dev, "CDC Union missing - got slave from IAD\n");
+        }
        /* check if we got everything */
        if ((ctx->control == NULL) || (ctx->data == NULL) ||
            ((!ctx->mbim_desc) && ((ctx->ether_desc == NULL) || (ctx->control != intf))))
@@ -497,7 +504,8 @@ advance:
 error2:
        usb_set_intfdata(ctx->control, NULL);
        usb_set_intfdata(ctx->data, NULL);
-        usb_driver_release_interface(driver, ctx->data);
+        if (ctx->data != ctx->control)
+                usb_driver_release_interface(driver, ctx->data);
 error:
        cdc_ncm_free((struct cdc_ncm_ctx *)dev->data[0]);
        dev->data[0] = 0;
@@ -1155,6 +1163,20 @@ static const struct driver_info wwan_info = {
        .tx_fixup = cdc_ncm_tx_fixup,
 };
+/* Same as wwan_info, but with FLAG_NOARP  */
+static const struct driver_info wwan_noarp_info = {
+        .description = "Mobile Broadband Network Device (NO ARP)",
+        .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET
+                        | FLAG_WWAN | FLAG_NOARP,
+        .bind = cdc_ncm_bind,
+        .unbind = cdc_ncm_unbind,
+        .check_connect = cdc_ncm_check_connect,
+        .manage_power = usbnet_manage_power,
+        .status = cdc_ncm_status,
+        .rx_fixup = cdc_ncm_rx_fixup,
+        .tx_fixup = cdc_ncm_tx_fixup,
+};
 static const struct usb_device_id cdc_devs[] = {
        /* Ericsson MBM devices like F5521gw */
        { .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
@@ -1194,6 +1216,13 @@ static const struct usb_device_id cdc_devs[] = {
          .driver_info = (unsigned long)&wwan_info,
        },
+        /* Infineon(now Intel) HSPA Modem platform */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1519, 0x0443,
+                USB_CLASS_COMM,
+                USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE),
+          .driver_info = (unsigned long)&wwan_noarp_info,
+        },
        /* Generic CDC-NCM devices */
        { USB_INTERFACE_INFO(USB_CLASS_COMM,
                USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE),
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 3f554c1149f3..d7e99445518e 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -45,6 +45,12 @@
 #define DM_MCAST_ADDR   0x16    /* 8 bytes */
 #define DM_GPR_CTRL     0x1e
 #define DM_GPR_DATA     0x1f
+#define DM_CHIP_ID      0x2c
+#define DM_MODE_CTRL    0x91    /* only on dm9620 */
+/* chip id values */
+#define ID_DM9601       0
+#define ID_DM9620       1
 #define DM_MAX_MCAST    64
 #define DM_MCAST_SIZE   8
@@ -53,7 +59,6 @@
 #define DM_RX_OVERHEAD  7       /* 3 byte header + 4 byte crc tail */
 #define DM_TIMEOUT      1000
 static int dm_read(struct usbnet *dev, u8 reg, u16 length, void *data)
 {
        int err;
@@ -84,32 +89,23 @@ static int dm_write(struct usbnet *dev, u8 reg, u16 length, void *data)
 static int dm_write_reg(struct usbnet *dev, u8 reg, u8 value)
 {
-        return usbnet_write_cmd(dev, DM_WRITE_REGS,
+        return usbnet_write_cmd(dev, DM_WRITE_REG,
                                USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                                value, reg, NULL, 0);
 }
-static void dm_write_async_helper(struct usbnet *dev, u8 reg, u8 value,
+static void dm_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)
-                                  u16 length, void *data)
 {
        usbnet_write_cmd_async(dev, DM_WRITE_REGS,
                               USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-                               value, reg, data, length);
+                               0, reg, data, length);
-}
-static void dm_write_async(struct usbnet *dev, u8 reg, u16 length, void *data)
-{
-        netdev_dbg(dev->net, "dm_write_async() reg=0x%02x length=%d\n", reg, length);
-        dm_write_async_helper(dev, reg, 0, length, data);
 }
 static void dm_write_reg_async(struct usbnet *dev, u8 reg, u8 value)
 {
-        netdev_dbg(dev->net, "dm_write_reg_async() reg=0x%02x value=0x%02x\n",
+        usbnet_write_cmd_async(dev, DM_WRITE_REG,
-                   reg, value);
+                               USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                               value, reg, NULL, 0);
-        dm_write_async_helper(dev, reg, value, 0, NULL);
 }
 static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *value)
@@ -358,7 +354,7 @@ static const struct net_device_ops dm9601_netdev_ops = {
 static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
 {
        int ret;
-        u8 mac[ETH_ALEN];
+        u8 mac[ETH_ALEN], id;
        ret = usbnet_get_endpoints(dev, intf);
        if (ret)
@@ -399,6 +395,24 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
                __dm9601_set_mac_address(dev);
        }
+        if (dm_read_reg(dev, DM_CHIP_ID, &id) < 0) {
+                netdev_err(dev->net, "Error reading chip ID\n");
+                ret = -ENODEV;
+                goto out;
+        }
+        /* put dm9620 devices in dm9601 mode */
+        if (id == ID_DM9620) {
+                u8 mode;
+                if (dm_read_reg(dev, DM_MODE_CTRL, &mode) < 0) {
+                        netdev_err(dev->net, "Error reading MODE_CTRL\n");
+                        ret = -ENODEV;
+                        goto out;
+                }
+                dm_write_reg(dev, DM_MODE_CTRL, mode & 0x7f);
+        }
        /* power up phy */
        dm_write_reg(dev, DM_GPR_CTRL, 1);
        dm_write_reg(dev, DM_GPR_DATA, 0);
@@ -581,6 +595,10 @@ static const struct usb_device_id products[] = {
         USB_DEVICE(0x0a46, 0x9000),    /* DM9000E */
         .driver_info = (unsigned long)&dm9601_info,
         },
+        {
+         USB_DEVICE(0x0a46, 0x9620),    /* DM9620 USB to Fast Ethernet Adapter */
+         .driver_info = (unsigned long)&dm9601_info,
+         },
        {},                     // END
 };
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 6a1ca500e612..575a5839ee34 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -433,6 +433,7 @@ static const struct usb_device_id products[] = {
        {QMI_FIXED_INTF(0x19d2, 0x0199, 1)},    /* ZTE MF820S */
        {QMI_FIXED_INTF(0x19d2, 0x0200, 1)},
        {QMI_FIXED_INTF(0x19d2, 0x0257, 3)},    /* ZTE MF821 */
+        {QMI_FIXED_INTF(0x19d2, 0x0265, 4)},    /* ONDA MT8205 4G LTE */
        {QMI_FIXED_INTF(0x19d2, 0x0284, 4)},    /* ZTE MF880 */
        {QMI_FIXED_INTF(0x19d2, 0x0326, 4)},    /* ZTE MF821D */
        {QMI_FIXED_INTF(0x19d2, 0x1008, 4)},    /* ZTE (Vodafone) K3570-Z */
@@ -459,6 +460,7 @@ static const struct usb_device_id products[] = {
        {QMI_FIXED_INTF(0x1199, 0x68a2, 19)},   /* Sierra Wireless MC7710 in QMI mode */
        {QMI_FIXED_INTF(0x1199, 0x901c, 8)},    /* Sierra Wireless EM7700 */
        {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)},    /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
+        {QMI_FIXED_INTF(0x2357, 0x0201, 4)},    /* TP-LINK HSUPA Modem MA180 */
        /* 4. Gobi 1000 devices */
        {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},    /* Acer Gobi Modem Device */
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 3d4bf01641b4..f34b2ebee815 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1448,6 +1448,10 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
                if ((dev->driver_info->flags & FLAG_WWAN) != 0)
                        strcpy(net->name, "wwan%d");
+                /* devices that cannot do ARP */
+                if ((dev->driver_info->flags & FLAG_NOARP) != 0)
+                        net->flags |= IFF_NOARP;
                /* maybe the remote can't receive an Ethernet MTU */
                if (net->mtu > (dev->hard_mtu - net->hard_header_len))
                        net->mtu = dev->hard_mtu - net->hard_header_len;
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index a6fcf15adc4f..35c00c5ea02a 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -26,6 +26,7 @@
 #include <linux/scatterlist.h>
 #include <linux/if_vlan.h>
 #include <linux/slab.h>
+#include <linux/cpu.h>
 static int napi_weight = 128;
 module_param(napi_weight, int, 0444);
@@ -123,6 +124,12 @@ struct virtnet_info {
        /* Does the affinity hint is set for virtqueues? */
        bool affinity_hint_set;
+        /* Per-cpu variable to show the mapping from CPU to virtqueue */
+        int __percpu *vq_index;
+        /* CPU hot plug notifier */
+        struct notifier_block nb;
 };
 struct skb_vnet_hdr {
@@ -1013,32 +1020,75 @@ static int virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid)
        return 0;
 }
-static void virtnet_set_affinity(struct virtnet_info *vi, bool set)
+static void virtnet_clean_affinity(struct virtnet_info *vi, long hcpu)
 {
        int i;
+        int cpu;
+        if (vi->affinity_hint_set) {
+                for (i = 0; i < vi->max_queue_pairs; i++) {
+                        virtqueue_set_affinity(vi->rq[i].vq, -1);
+                        virtqueue_set_affinity(vi->sq[i].vq, -1);
+                }
+                vi->affinity_hint_set = false;
+        }
+        i = 0;
+        for_each_online_cpu(cpu) {
+                if (cpu == hcpu) {
+                        *per_cpu_ptr(vi->vq_index, cpu) = -1;
+                } else {
+                        *per_cpu_ptr(vi->vq_index, cpu) =
+                                ++i % vi->curr_queue_pairs;
+                }
+        }
+}
+static void virtnet_set_affinity(struct virtnet_info *vi)
+{
+        int i;
+        int cpu;
        /* In multiqueue mode, when the number of cpu is equal to the number of
         * queue pairs, we let the queue pairs to be private to one cpu by
         * setting the affinity hint to eliminate the contention.
         */
-        if ((vi->curr_queue_pairs == 1 ||
+        if (vi->curr_queue_pairs == 1 ||
-             vi->max_queue_pairs != num_online_cpus()) && set) {
+            vi->max_queue_pairs != num_online_cpus()) {
-                if (vi->affinity_hint_set)
+                virtnet_clean_affinity(vi, -1);
-                        set = false;
+                return;
-                else
-                        return;
        }
-        for (i = 0; i < vi->max_queue_pairs; i++) {
+        i = 0;
-                int cpu = set ? i : -1;
+        for_each_online_cpu(cpu) {
                virtqueue_set_affinity(vi->rq[i].vq, cpu);
                virtqueue_set_affinity(vi->sq[i].vq, cpu);
+                *per_cpu_ptr(vi->vq_index, cpu) = i;
+                i++;
        }
-        if (set)
+        vi->affinity_hint_set = true;
-                vi->affinity_hint_set = true;
+}
-        else
-                vi->affinity_hint_set = false;
+static int virtnet_cpu_callback(struct notifier_block *nfb,
+                                unsigned long action, void *hcpu)
+{
+        struct virtnet_info *vi = container_of(nfb, struct virtnet_info, nb);
+        switch(action & ~CPU_TASKS_FROZEN) {
+        case CPU_ONLINE:
+        case CPU_DOWN_FAILED:
+        case CPU_DEAD:
+                virtnet_set_affinity(vi);
+                break;
+        case CPU_DOWN_PREPARE:
+                virtnet_clean_affinity(vi, (long)hcpu);
+                break;
+        default:
+                break;
+        }
+        return NOTIFY_OK;
 }
 static void virtnet_get_ringparam(struct net_device *dev,
@@ -1082,13 +1132,15 @@ static int virtnet_set_channels(struct net_device *dev,
        if (queue_pairs > vi->max_queue_pairs)
                return -EINVAL;
+        get_online_cpus();
        err = virtnet_set_queues(vi, queue_pairs);
        if (!err) {
                netif_set_real_num_tx_queues(dev, queue_pairs);
                netif_set_real_num_rx_queues(dev, queue_pairs);
-                virtnet_set_affinity(vi, true);
+                virtnet_set_affinity(vi);
        }
+        put_online_cpus();
        return err;
 }
@@ -1127,12 +1179,19 @@ static int virtnet_change_mtu(struct net_device *dev, int new_mtu)
 /* To avoid contending a lock hold by a vcpu who would exit to host, select the
 * txq based on the processor id.
- * TODO: handle cpu hotplug.
 */
 static u16 virtnet_select_queue(struct net_device *dev, struct sk_buff *skb)
 {
-        int txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) :
+        int txq;
-                  smp_processor_id();
+        struct virtnet_info *vi = netdev_priv(dev);
+        if (skb_rx_queue_recorded(skb)) {
+                txq = skb_get_rx_queue(skb);
+        } else {
+                txq = *__this_cpu_ptr(vi->vq_index);
+                if (txq == -1)
+                        txq = 0;
+        }
        while (unlikely(txq >= dev->real_num_tx_queues))
                txq -= dev->real_num_tx_queues;
@@ -1248,7 +1307,7 @@ static void virtnet_del_vqs(struct virtnet_info *vi)
 {
        struct virtio_device *vdev = vi->vdev;
-        virtnet_set_affinity(vi, false);
+        virtnet_clean_affinity(vi, -1);
        vdev->config->del_vqs(vdev);
@@ -1371,7 +1430,10 @@ static int init_vqs(struct virtnet_info *vi)
        if (ret)
                goto err_free;
-        virtnet_set_affinity(vi, true);
+        get_online_cpus();
+        virtnet_set_affinity(vi);
+        put_online_cpus();
        return 0;
 err_free:
@@ -1453,6 +1515,10 @@ static int virtnet_probe(struct virtio_device *vdev)
        if (vi->stats == NULL)
                goto free;
+        vi->vq_index = alloc_percpu(int);
+        if (vi->vq_index == NULL)
+                goto free_stats;
        mutex_init(&vi->config_lock);
        vi->config_enable = true;
        INIT_WORK(&vi->config_work, virtnet_config_changed_work);
@@ -1476,7 +1542,7 @@ static int virtnet_probe(struct virtio_device *vdev)
        /* Allocate/initialize the rx/tx queues, and invoke find_vqs */
        err = init_vqs(vi);
        if (err)
-                goto free_stats;
+                goto free_index;
        netif_set_real_num_tx_queues(dev, 1);
        netif_set_real_num_rx_queues(dev, 1);
@@ -1499,6 +1565,13 @@ static int virtnet_probe(struct virtio_device *vdev)
                }
        }
+        vi->nb.notifier_call = &virtnet_cpu_callback;
+        err = register_hotcpu_notifier(&vi->nb);
+        if (err) {
+                pr_debug("virtio_net: registering cpu notifier failed\n");
+                goto free_recv_bufs;
+        }
        /* Assume link up if device can't report link status,
           otherwise get link status from config. */
        if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) {
@@ -1520,6 +1593,8 @@ free_recv_bufs:
 free_vqs:
        cancel_delayed_work_sync(&vi->refill);
        virtnet_del_vqs(vi);
+free_index:
+        free_percpu(vi->vq_index);
 free_stats:
        free_percpu(vi->stats);
 free:
@@ -1543,6 +1618,8 @@ static void virtnet_remove(struct virtio_device *vdev)
 {
        struct virtnet_info *vi = vdev->priv;
+        unregister_hotcpu_notifier(&vi->nb);
        /* Prevent config work handler from accessing the device. */
        mutex_lock(&vi->config_lock);
        vi->config_enable = false;
@@ -1554,6 +1631,7 @@ static void virtnet_remove(struct virtio_device *vdev)
        flush_work(&vi->config_work);
+        free_percpu(vi->vq_index);
        free_percpu(vi->stats);
        free_netdev(vi->dev);
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 8b0d8dcd7625..56317b0fb6b6 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -976,6 +976,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
                                          AR_PHY_CL_TAB_1,
                                          AR_PHY_CL_TAB_2 };
+        ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
        if (rtt) {
                if (!ar9003_hw_rtt_restore(ah, chan))
                        run_rtt_cal = true;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index ce19c09fa8e8..3afc24bde6d6 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -586,32 +586,19 @@ static void ar9003_hw_init_bb(struct ath_hw *ah,
        ath9k_hw_synth_delay(ah, chan, synthDelay);
 }
-static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
+void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
 {
-        switch (rx) {
+        if (ah->caps.tx_chainmask == 5 || ah->caps.rx_chainmask == 5)
-        case 0x5:
                REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP,
                            AR_PHY_SWAP_ALT_CHAIN);
-        case 0x3:
-        case 0x1:
+        REG_WRITE(ah, AR_PHY_RX_CHAINMASK, rx);
-        case 0x2:
+        REG_WRITE(ah, AR_PHY_CAL_CHAINMASK, rx);
-        case 0x7:
-                REG_WRITE(ah, AR_PHY_RX_CHAINMASK, rx);
-                REG_WRITE(ah, AR_PHY_CAL_CHAINMASK, rx);
-                break;
-        default:
-                break;
-        }
        if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) && (tx == 0x7))
-                REG_WRITE(ah, AR_SELFGEN_MASK, 0x3);
+                tx = 3;
-        else
-                REG_WRITE(ah, AR_SELFGEN_MASK, tx);
-        if (tx == 0x5) {
+        REG_WRITE(ah, AR_SELFGEN_MASK, tx);
-                REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP,
-                            AR_PHY_SWAP_ALT_CHAIN);
-        }
 }
 /*
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 86e26a19efda..42794c546a40 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -317,7 +317,6 @@ struct ath_rx {
        u32 *rxlink;
        u32 num_pkts;
        unsigned int rxfilter;
-        spinlock_t rxbuflock;
        struct list_head rxbuf;
        struct ath_descdma rxdma;
        struct ath_buf *rx_bufptr;
@@ -328,7 +327,6 @@ struct ath_rx {
 int ath_startrecv(struct ath_softc *sc);
 bool ath_stoprecv(struct ath_softc *sc);
-void ath_flushrecv(struct ath_softc *sc);
 u32 ath_calcrxfilter(struct ath_softc *sc);
 int ath_rx_init(struct ath_softc *sc, int nbufs);
 void ath_rx_cleanup(struct ath_softc *sc);
@@ -646,7 +644,6 @@ void ath_ant_comb_update(struct ath_softc *sc);
 enum sc_op_flags {
        SC_OP_INVALID,
        SC_OP_BEACONS,
-        SC_OP_RXFLUSH,
        SC_OP_ANI_RUN,
        SC_OP_PRIM_STA_VIF,
        SC_OP_HW_RESET,
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 531fffd801a3..2ca355e94da6 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,
                                 skb->len, DMA_TO_DEVICE);
                dev_kfree_skb_any(skb);
                bf->bf_buf_addr = 0;
+                bf->bf_mpdu = NULL;
        }
        skb = ieee80211_beacon_get(hw, vif);
@@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long data)
                return;
        bf = ath9k_beacon_generate(sc->hw, vif);
-        WARN_ON(!bf);
        if (sc->beacon.bmisscnt != 0) {
                ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 13ff9edc2401..e585fc827c50 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -861,7 +861,6 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
        RXS_ERR("RX-LENGTH-ERR", rx_len_err);
        RXS_ERR("RX-OOM-ERR", rx_oom_err);
        RXS_ERR("RX-RATE-ERR", rx_rate_err);
-        RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush);
        RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err);
        PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN);
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index 375c3b46411e..6df2ab62dcb7 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -216,7 +216,6 @@ struct ath_tx_stats {
 * @rx_oom_err:  No. of frames dropped due to OOM issues.
 * @rx_rate_err:  No. of frames dropped due to rate errors.
 * @rx_too_many_frags_err:  Frames dropped due to too-many-frags received.
- * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH.
 * @rx_beacons:  No. of beacons received.
 * @rx_frags:  No. of rx-fragements received.
 */
@@ -235,7 +234,6 @@ struct ath_rx_stats {
        u32 rx_oom_err;
        u32 rx_rate_err;
        u32 rx_too_many_frags_err;
-        u32 rx_drop_rxflush;
        u32 rx_beacons;
        u32 rx_frags;
 };
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 4a9570dfba72..aac4a406a513 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -344,6 +344,8 @@ void ath9k_htc_txcompletion_cb(struct htc_target *htc_handle,
                        endpoint->ep_callbacks.tx(endpoint->ep_callbacks.priv,
                                                  skb, htc_hdr->endpoint_id,
                                                  txok);
+                } else {
+                        kfree_skb(skb);
                }
        }
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 7f1a8e91c908..9d26fc56ca56 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -1066,6 +1066,7 @@ void ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain);
 int ar9003_paprd_init_table(struct ath_hw *ah);
 bool ar9003_paprd_is_done(struct ath_hw *ah);
 bool ar9003_is_paprd_enabled(struct ath_hw *ah);
+void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
 /* Hardware family op attach helpers */
 void ar5008_hw_attach_phy_ops(struct ath_hw *ah);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index be30a9af1528..dd91f8fdc01c 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -182,7 +182,7 @@ static void ath_restart_work(struct ath_softc *sc)
        ath_start_ani(sc);
 }
-static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
+static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx)
 {
        struct ath_hw *ah = sc->sc_ah;
        bool ret = true;
@@ -202,14 +202,6 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
        if (!ath_drain_all_txq(sc, retry_tx))
                ret = false;
-        if (!flush) {
-                if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-                        ath_rx_tasklet(sc, 1, true);
-                ath_rx_tasklet(sc, 1, false);
-        } else {
-                ath_flushrecv(sc);
-        }
        return ret;
 }
@@ -262,11 +254,11 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath9k_hw_cal_data *caldata = NULL;
        bool fastcc = true;
-        bool flush = false;
        int r;
        __ath_cancel_work(sc);
+        tasklet_disable(&sc->intr_tq);
        spin_lock_bh(&sc->sc_pcu_lock);
        if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
@@ -276,11 +268,10 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
        if (!hchan) {
                fastcc = false;
-                flush = true;
                hchan = ah->curchan;
        }
-        if (!ath_prepare_reset(sc, retry_tx, flush))
+        if (!ath_prepare_reset(sc, retry_tx))
                fastcc = false;
        ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
@@ -302,6 +293,8 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
 out:
        spin_unlock_bh(&sc->sc_pcu_lock);
+        tasklet_enable(&sc->intr_tq);
        return r;
 }
@@ -804,7 +797,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
                ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
        }
-        ath_prepare_reset(sc, false, true);
+        ath_prepare_reset(sc, false);
        if (sc->rx.frag) {
                dev_kfree_skb_any(sc->rx.frag);
@@ -1833,6 +1826,9 @@ static u32 fill_chainmask(u32 cap, u32 new)
 static bool validate_antenna_mask(struct ath_hw *ah, u32 val)
 {
+        if (AR_SREV_9300_20_OR_LATER(ah))
+                return true;
        switch (val & 0x7) {
        case 0x1:
        case 0x3:
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index d4df98a938bf..90752f246970 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -254,8 +254,6 @@ rx_init_fail:
 static void ath_edma_start_recv(struct ath_softc *sc)
 {
-        spin_lock_bh(&sc->rx.rxbuflock);
        ath9k_hw_rxena(sc->sc_ah);
        ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_HP,
@@ -267,8 +265,6 @@ static void ath_edma_start_recv(struct ath_softc *sc)
        ath_opmode_init(sc);
        ath9k_hw_startpcureceive(sc->sc_ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
-        spin_unlock_bh(&sc->rx.rxbuflock);
 }
 static void ath_edma_stop_recv(struct ath_softc *sc)
@@ -285,8 +281,6 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
        int error = 0;
        spin_lock_init(&sc->sc_pcu_lock);
-        spin_lock_init(&sc->rx.rxbuflock);
-        clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
        common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
                             sc->sc_ah->caps.rx_status_len;
@@ -447,7 +441,6 @@ int ath_startrecv(struct ath_softc *sc)
                return 0;
        }
-        spin_lock_bh(&sc->rx.rxbuflock);
        if (list_empty(&sc->rx.rxbuf))
                goto start_recv;
@@ -468,26 +461,31 @@ start_recv:
        ath_opmode_init(sc);
        ath9k_hw_startpcureceive(ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
-        spin_unlock_bh(&sc->rx.rxbuflock);
        return 0;
 }
+static void ath_flushrecv(struct ath_softc *sc)
+{
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
+                ath_rx_tasklet(sc, 1, true);
+        ath_rx_tasklet(sc, 1, false);
+}
 bool ath_stoprecv(struct ath_softc *sc)
 {
        struct ath_hw *ah = sc->sc_ah;
        bool stopped, reset = false;
-        spin_lock_bh(&sc->rx.rxbuflock);
        ath9k_hw_abortpcurecv(ah);
        ath9k_hw_setrxfilter(ah, 0);
        stopped = ath9k_hw_stopdmarecv(ah, &reset);
+        ath_flushrecv(sc);
        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                ath_edma_stop_recv(sc);
        else
                sc->rx.rxlink = NULL;
-        spin_unlock_bh(&sc->rx.rxbuflock);
        if (!(ah->ah_flags & AH_UNPLUGGED) &&
            unlikely(!stopped)) {
@@ -499,15 +497,6 @@ bool ath_stoprecv(struct ath_softc *sc)
        return stopped && !reset;
 }
-void ath_flushrecv(struct ath_softc *sc)
-{
-        set_bit(SC_OP_RXFLUSH, &sc->sc_flags);
-        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-                ath_rx_tasklet(sc, 1, true);
-        ath_rx_tasklet(sc, 1, false);
-        clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
-}
 static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
 {
        /* Check whether the Beacon frame has DTIM indicating buffered bc/mc */
@@ -744,6 +733,7 @@ static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc,
                        return NULL;
        }
+        list_del(&bf->list);
        if (!bf->bf_mpdu)
                return bf;
@@ -1059,16 +1049,12 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                dma_type = DMA_FROM_DEVICE;
        qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP;
-        spin_lock_bh(&sc->rx.rxbuflock);
        tsf = ath9k_hw_gettsf64(ah);
        tsf_lower = tsf & 0xffffffff;
        do {
                bool decrypt_error = false;
-                /* If handling rx interrupt and flush is in progress => exit */
-                if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
-                        break;
                memset(&rs, 0, sizeof(rs));
                if (edma)
@@ -1111,15 +1097,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                ath_debug_stat_rx(sc, &rs);
-                /*
-                 * If we're asked to flush receive queue, directly
-                 * chain it back at the queue without processing it.
-                 */
-                if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) {
-                        RX_STAT_INC(rx_drop_rxflush);
-                        goto requeue_drop_frag;
-                }
                memset(rxs, 0, sizeof(struct ieee80211_rx_status));
                rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
@@ -1254,19 +1231,18 @@ requeue_drop_frag:
                        sc->rx.frag = NULL;
                }
 requeue:
+                list_add_tail(&bf->list, &sc->rx.rxbuf);
+                if (flush)
+                        continue;
                if (edma) {
-                        list_add_tail(&bf->list, &sc->rx.rxbuf);
                        ath_rx_edma_buf_link(sc, qtype);
                } else {
-                        list_move_tail(&bf->list, &sc->rx.rxbuf);
                        ath_rx_buf_link(sc, bf);
-                        if (!flush)
+                        ath9k_hw_rxena(ah);
-                                ath9k_hw_rxena(ah);
                }
        } while (1);
-        spin_unlock_bh(&sc->rx.rxbuflock);
        if (!(ah->imask & ATH9K_INT_RXEOL)) {
                ah->imask |= (ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
                ath9k_hw_set_interrupts(ah);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 1fbd8ecbe2ea..0f71d1d4339d 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1407,9 +1407,10 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic)
 #endif
        t->ms = ms;
        t->periodic = (bool) periodic;
-        t->set = true;
+        if (!t->set) {
+                t->set = true;
-        atomic_inc(&t->wl->callbacks);
+                atomic_inc(&t->wl->callbacks);
+        }
        ieee80211_queue_delayed_work(hw, &t->dly_wrk, msecs_to_jiffies(ms));
 }
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 7e16d10a7f14..90b8970eadf0 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -3958,17 +3958,21 @@ il_connection_init_rx_config(struct il_priv *il)
        memset(&il->staging, 0, sizeof(il->staging));
-        if (!il->vif) {
+        switch (il->iw_mode) {
+        case NL80211_IFTYPE_UNSPECIFIED:
                il->staging.dev_type = RXON_DEV_TYPE_ESS;
-        } else if (il->vif->type == NL80211_IFTYPE_STATION) {
+                break;
+        case NL80211_IFTYPE_STATION:
                il->staging.dev_type = RXON_DEV_TYPE_ESS;
                il->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
-        } else if (il->vif->type == NL80211_IFTYPE_ADHOC) {
+                break;
+        case NL80211_IFTYPE_ADHOC:
                il->staging.dev_type = RXON_DEV_TYPE_IBSS;
                il->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
                il->staging.filter_flags =
                    RXON_FILTER_BCON_AWARE_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
-        } else {
+                break;
+        default:
                IL_ERR("Unsupported interface type %d\n", il->vif->type);
                return;
        }
@@ -4550,8 +4554,7 @@ out:
 EXPORT_SYMBOL(il_mac_add_interface);
 static void
-il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif,
+il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif)
-                      bool mode_change)
 {
        lockdep_assert_held(&il->mutex);
@@ -4560,9 +4563,7 @@ il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif,
                il_force_scan_end(il);
        }
-        if (!mode_change)
+        il_set_mode(il);
-                il_set_mode(il);
 }
 void
@@ -4575,8 +4576,8 @@ il_mac_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        WARN_ON(il->vif != vif);
        il->vif = NULL;
+        il->iw_mode = NL80211_IFTYPE_UNSPECIFIED;
-        il_teardown_interface(il, vif, false);
+        il_teardown_interface(il, vif);
        memset(il->bssid, 0, ETH_ALEN);
        D_MAC80211("leave\n");
@@ -4685,18 +4686,10 @@ il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        }
        /* success */
-        il_teardown_interface(il, vif, true);
        vif->type = newtype;
        vif->p2p = false;
-        err = il_set_mode(il);
+        il->iw_mode = newtype;
-        WARN_ON(err);
+        il_teardown_interface(il, vif);
-        /*
-         * We've switched internally, but submitting to the
-         * device may have failed for some reason. Mask this
-         * error, because otherwise mac80211 will not switch
-         * (and set the interface type back) and we'll be
-         * out of sync with it.
-         */
        err = 0;
 out:
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index a790599fe2c2..31534f7c0548 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -1079,6 +1079,8 @@ static void iwlagn_set_tx_status(struct iwl_priv *priv,
 {
        u16 status = le16_to_cpu(tx_resp->status.status);
+        info->flags &= ~IEEE80211_TX_CTL_AMPDU;
        info->status.rates[0].count = tx_resp->failure_frame + 1;
        info->flags |= iwl_tx_status_to_mac80211(status);
        iwlagn_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags),
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index efe525be27dd..cdb11b3964e2 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1459,7 +1459,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
        struct cfg80211_ssid req_ssid;
        int ret, auth_type = 0;
        struct cfg80211_bss *bss = NULL;
-        u8 is_scanning_required = 0, config_bands = 0;
+        u8 is_scanning_required = 0;
        memset(&req_ssid, 0, sizeof(struct cfg80211_ssid));
@@ -1478,19 +1478,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
        /* disconnect before try to associate */
        mwifiex_deauthenticate(priv, NULL);
-        if (channel) {
-                if (mode == NL80211_IFTYPE_STATION) {
-                        if (channel->band == IEEE80211_BAND_2GHZ)
-                                config_bands = BAND_B | BAND_G | BAND_GN;
-                        else
-                                config_bands = BAND_A | BAND_AN;
-                        if (!((config_bands | priv->adapter->fw_bands) &
-                              ~priv->adapter->fw_bands))
-                                priv->adapter->config_bands = config_bands;
-                }
-        }
        /* As this is new association, clear locally stored
         * keys and security related flags */
        priv->sec_info.wpa_enabled = false;
@@ -1707,7 +1694,7 @@ static int mwifiex_set_ibss_params(struct mwifiex_private *priv,
                if (cfg80211_get_chandef_type(&params->chandef) !=
                                                NL80211_CHAN_NO_HT)
-                        config_bands |= BAND_GN;
+                        config_bands |= BAND_G | BAND_GN;
        } else {
                if (cfg80211_get_chandef_type(&params->chandef) ==
                                                NL80211_CHAN_NO_HT)
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 13fbc4eb1595..b879e1338a54 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -161,7 +161,7 @@ static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state)
        if (pdev) {
                card = (struct pcie_service_card *) pci_get_drvdata(pdev);
-                if (!card || card->adapter) {
+                if (!card || !card->adapter) {
                        pr_err("Card or adapter structure is not valid\n");
                        return 0;
                }
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 60e88b58039d..f542bb8ccbc8 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -283,6 +283,20 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
                if (ret)
                        goto done;
+                if (bss_desc) {
+                        u8 config_bands = 0;
+                        if (mwifiex_band_to_radio_type((u8) bss_desc->bss_band)
+                            == HostCmd_SCAN_RADIO_TYPE_BG)
+                                config_bands = BAND_B | BAND_G | BAND_GN;
+                        else
+                                config_bands = BAND_A | BAND_AN;
+                        if (!((config_bands | adapter->fw_bands) &
+                              ~adapter->fw_bands))
+                                adapter->config_bands = config_bands;
+                }
                ret = mwifiex_check_network_compatibility(priv, bss_desc);
                if (ret)
                        goto done;
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index 21b1bbb93a7e..b80bc4612581 100644
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -57,12 +57,12 @@ config RTL8192CU
 config RTLWIFI
        tristate
-        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE
+        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE || RTL8723AE
        default m
 config RTLWIFI_DEBUG
        bool "Additional debugging output"
-        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE
+        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE || RTL8723AE
        default y
 config RTL8192C_COMMON
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c31aeb01bb00..efaecefe3f8c 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -181,7 +181,6 @@ config PINCTRL_COH901
 config PINCTRL_SAMSUNG
        bool
-        depends on OF && GPIOLIB
        select PINMUX
        select PINCONF
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 69aba3697287..428ea96a94d3 100644
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -588,7 +588,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev)
 {
        const struct of_device_id *match =
                of_match_device(dove_pinctrl_of_match, &pdev->dev);
-        pdev->dev.platform_data = match->data;
+        pdev->dev.platform_data = (void *)match->data;
        /*
         * General MPP Configuration Register is part of pdma registers.
diff --git a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
index f12084e18057..cdd483df673e 100644
--- a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
+++ b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
@@ -66,9 +66,9 @@ static struct mvebu_mpp_mode mv88f6xxx_mpp_modes[] = {
                MPP_VAR_FUNCTION(0x5, "sata0", "act",    V(0, 1, 1, 1, 1, 0)),
                MPP_VAR_FUNCTION(0xb, "lcd", "vsync",    V(0, 0, 0, 0, 1, 0))),
        MPP_MODE(6,
-                MPP_VAR_FUNCTION(0x0, "sysrst", "out",   V(1, 1, 1, 1, 1, 1)),
+                MPP_VAR_FUNCTION(0x1, "sysrst", "out",   V(1, 1, 1, 1, 1, 1)),
-                MPP_VAR_FUNCTION(0x1, "spi", "mosi",     V(1, 1, 1, 1, 1, 1)),
+                MPP_VAR_FUNCTION(0x2, "spi", "mosi",     V(1, 1, 1, 1, 1, 1)),
-                MPP_VAR_FUNCTION(0x2, "ptp", "trig",     V(1, 1, 1, 1, 0, 0))),
+                MPP_VAR_FUNCTION(0x3, "ptp", "trig",     V(1, 1, 1, 1, 0, 0))),
        MPP_MODE(7,
                MPP_VAR_FUNCTION(0x0, "gpo", NULL,       V(1, 1, 1, 1, 1, 1)),
                MPP_VAR_FUNCTION(0x1, "pex", "rsto",     V(1, 1, 1, 1, 0, 1)),
@@ -458,7 +458,7 @@ static int kirkwood_pinctrl_probe(struct platform_device *pdev)
 {
        const struct of_device_id *match =
                of_match_device(kirkwood_pinctrl_of_match, &pdev->dev);
-        pdev->dev.platform_data = match->data;
+        pdev->dev.platform_data = (void *)match->data;
        return mvebu_pinctrl_probe(pdev);
 }
diff --git a/drivers/pinctrl/pinctrl-exynos5440.c b/drivers/pinctrl/pinctrl-exynos5440.c
index de05b64f0da6..142729914c34 100644
--- a/drivers/pinctrl/pinctrl-exynos5440.c
+++ b/drivers/pinctrl/pinctrl-exynos5440.c
@@ -599,7 +599,7 @@ static int exynos5440_gpio_direction_output(struct gpio_chip *gc, unsigned offse
 }
 /* parse the pin numbers listed in the 'samsung,exynos5440-pins' property */
-static int __init exynos5440_pinctrl_parse_dt_pins(struct platform_device *pdev,
+static int exynos5440_pinctrl_parse_dt_pins(struct platform_device *pdev,
                        struct device_node *cfg_np, unsigned int **pin_list,
                        unsigned int *npins)
 {
@@ -630,7 +630,7 @@ static int __init exynos5440_pinctrl_parse_dt_pins(struct platform_device *pdev,
 * Parse the information about all the available pin groups and pin functions
 * from device node of the pin-controller.
 */
-static int __init exynos5440_pinctrl_parse_dt(struct platform_device *pdev,
+static int exynos5440_pinctrl_parse_dt(struct platform_device *pdev,
                                struct exynos5440_pinctrl_priv_data *priv)
 {
        struct device *dev = &pdev->dev;
@@ -723,7 +723,7 @@ static int __init exynos5440_pinctrl_parse_dt(struct platform_device *pdev,
 }
 /* register the pinctrl interface with the pinctrl subsystem */
-static int __init exynos5440_pinctrl_register(struct platform_device *pdev,
+static int exynos5440_pinctrl_register(struct platform_device *pdev,
                                struct exynos5440_pinctrl_priv_data *priv)
 {
        struct device *dev = &pdev->dev;
@@ -798,7 +798,7 @@ static int __init exynos5440_pinctrl_register(struct platform_device *pdev,
 }
 /* register the gpiolib interface with the gpiolib subsystem */
-static int __init exynos5440_gpiolib_register(struct platform_device *pdev,
+static int exynos5440_gpiolib_register(struct platform_device *pdev,
                                struct exynos5440_pinctrl_priv_data *priv)
 {
        struct gpio_chip *gc;
@@ -831,7 +831,7 @@ static int __init exynos5440_gpiolib_register(struct platform_device *pdev,
 }
 /* unregister the gpiolib interface with the gpiolib subsystem */
-static int __init exynos5440_gpiolib_unregister(struct platform_device *pdev,
+static int exynos5440_gpiolib_unregister(struct platform_device *pdev,
                                struct exynos5440_pinctrl_priv_data *priv)
 {
        int ret = gpiochip_remove(priv->gc);
diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/pinctrl-mxs.c
index dd227d21dcf2..23af9f1f9c35 100644
--- a/drivers/pinctrl/pinctrl-mxs.c
+++ b/drivers/pinctrl/pinctrl-mxs.c
@@ -146,7 +146,7 @@ free:
 static void mxs_dt_free_map(struct pinctrl_dev *pctldev,
                            struct pinctrl_map *map, unsigned num_maps)
 {
-        int i;
+        u32 i;
        for (i = 0; i < num_maps; i++) {
                if (map[i].type == PIN_MAP_TYPE_MUX_GROUP)
@@ -203,7 +203,7 @@ static int mxs_pinctrl_enable(struct pinctrl_dev *pctldev, unsigned selector,
        void __iomem *reg;
        u8 bank, shift;
        u16 pin;
-        int i;
+        u32 i;
        for (i = 0; i < g->npins; i++) {
                bank = PINID_TO_BANK(g->pins[i]);
@@ -256,7 +256,7 @@ static int mxs_pinconf_group_set(struct pinctrl_dev *pctldev,
        void __iomem *reg;
        u8 ma, vol, pull, bank, shift;
        u16 pin;
-        int i;
+        u32 i;
        ma = CONFIG_TO_MA(config);
        vol = CONFIG_TO_VOL(config);
@@ -345,8 +345,7 @@ static int mxs_pinctrl_parse_group(struct platform_device *pdev,
        const char *propname = "fsl,pinmux-ids";
        char *group;
        int length = strlen(np->name) + SUFFIX_LEN;
-        int i;
+        u32 val, i;
-        u32 val;
        group = devm_kzalloc(&pdev->dev, length, GFP_KERNEL);
        if (!group)
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 1bb16ffb4e41..5767b18ebdff 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -676,7 +676,7 @@ int nmk_gpio_set_mode(int gpio, int gpio_mode)
 }
 EXPORT_SYMBOL(nmk_gpio_set_mode);
-static int nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev, int gpio)
+static int __maybe_unused nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev, int gpio)
 {
        int i;
        u16 reg;
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index f6a360b86eb6..5c32e880bcb2 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -30,7 +30,6 @@
 #define PCS_MUX_BITS_NAME               "pinctrl-single,bits"
 #define PCS_REG_NAME_LEN                ((sizeof(unsigned long) * 2) + 1)
 #define PCS_OFF_DISABLED                ~0U
-#define PCS_MAX_GPIO_VALUES             2
 /**
 * struct pcs_pingroup - pingroups for a function
@@ -78,16 +77,6 @@ struct pcs_function {
 };
 /**
- * struct pcs_gpio_range - pinctrl gpio range
- * @range:      subrange of the GPIO number space
- * @gpio_func:  gpio function value in the pinmux register
- */
-struct pcs_gpio_range {
-        struct pinctrl_gpio_range range;
-        int gpio_func;
-};
-/**
 * struct pcs_data - wrapper for data needed by pinctrl framework
 * @pa:         pindesc array
 * @cur:        index to current element
@@ -414,26 +403,9 @@ static void pcs_disable(struct pinctrl_dev *pctldev, unsigned fselector,
 }
 static int pcs_request_gpio(struct pinctrl_dev *pctldev,
-                            struct pinctrl_gpio_range *range, unsigned pin)
+                        struct pinctrl_gpio_range *range, unsigned offset)
 {
-        struct pcs_device *pcs = pinctrl_dev_get_drvdata(pctldev);
+        return -ENOTSUPP;
-        struct pcs_gpio_range *gpio = NULL;
-        int end, mux_bytes;
-        unsigned data;
-        gpio = container_of(range, struct pcs_gpio_range, range);
-        end = range->pin_base + range->npins - 1;
-        if (pin < range->pin_base || pin > end) {
-                dev_err(pctldev->dev,
-                        "pin %d isn't in the range of %d to %d\n",
-                        pin, range->pin_base, end);
-                return -EINVAL;
-        }
-        mux_bytes = pcs->width / BITS_PER_BYTE;
-        data = pcs->read(pcs->base + pin * mux_bytes) & ~pcs->fmask;
-        data |= gpio->gpio_func;
-        pcs->write(data, pcs->base + pin * mux_bytes);
-        return 0;
 }
 static struct pinmux_ops pcs_pinmux_ops = {
@@ -907,49 +879,6 @@ static void pcs_free_resources(struct pcs_device *pcs)
 static struct of_device_id pcs_of_match[];
-static int pcs_add_gpio_range(struct device_node *node, struct pcs_device *pcs)
-{
-        struct pcs_gpio_range *gpio;
-        struct device_node *child;
-        struct resource r;
-        const char name[] = "pinctrl-single";
-        u32 gpiores[PCS_MAX_GPIO_VALUES];
-        int ret, i = 0, mux_bytes = 0;
-        for_each_child_of_node(node, child) {
-                ret = of_address_to_resource(child, 0, &r);
-                if (ret < 0)
-                        continue;
-                memset(gpiores, 0, sizeof(u32) * PCS_MAX_GPIO_VALUES);
-                ret = of_property_read_u32_array(child, "pinctrl-single,gpio",
-                                                 gpiores, PCS_MAX_GPIO_VALUES);
-                if (ret < 0)
-                        continue;
-                gpio = devm_kzalloc(pcs->dev, sizeof(*gpio), GFP_KERNEL);
-                if (!gpio) {
-                        dev_err(pcs->dev, "failed to allocate pcs gpio\n");
-                        return -ENOMEM;
-                }
-                gpio->range.name = devm_kzalloc(pcs->dev, sizeof(name),
-                                                GFP_KERNEL);
-                if (!gpio->range.name) {
-                        dev_err(pcs->dev, "failed to allocate range name\n");
-                        return -ENOMEM;
-                }
-                memcpy((char *)gpio->range.name, name, sizeof(name));
-                gpio->range.id = i++;
-                gpio->range.base = gpiores[0];
-                gpio->gpio_func = gpiores[1];
-                mux_bytes = pcs->width / BITS_PER_BYTE;
-                gpio->range.pin_base = (r.start - pcs->res->start) / mux_bytes;
-                gpio->range.npins = (r.end - r.start) / mux_bytes + 1;
-                pinctrl_add_gpio_range(pcs->pctl, &gpio->range);
-        }
-        return 0;
-}
 static int pcs_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
@@ -1046,10 +975,6 @@ static int pcs_probe(struct platform_device *pdev)
                goto free;
        }
-        ret = pcs_add_gpio_range(np, pcs);
-        if (ret < 0)
-                goto free;
        dev_info(pcs->dev, "%i pins at pa %p size %u\n",
                 pcs->desc.npins, pcs->base, pcs->size);
diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
index 7481146a5b47..97c2be195efc 100644
--- a/drivers/platform/x86/ibm_rtl.c
+++ b/drivers/platform/x86/ibm_rtl.c
@@ -244,7 +244,7 @@ static int __init ibm_rtl_init(void) {
        if (force)
                pr_warn("module loaded by force\n");
        /* first ensure that we are running on IBM HW */
-        else if (efi_enabled || !dmi_check_system(ibm_rtl_dmi_table))
+        else if (efi_enabled(EFI_BOOT) || !dmi_check_system(ibm_rtl_dmi_table))
                return -ENODEV;
        /* Get the address for the Extended BIOS Data Area */
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index 71623a2ff3e8..d1f030053176 100644
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -26,6 +26,7 @@
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/ctype.h>
+#include <linux/efi.h>
 #include <acpi/video.h>
 /*
@@ -1544,6 +1545,9 @@ static int __init samsung_init(void)
        struct samsung_laptop *samsung;
        int ret;
+        if (efi_enabled(EFI_BOOT))
+                return -ENODEV;
        quirks = &samsung_unknown;
        if (!force && !dmi_check_system(samsung_dmi_table))
                return -ENODEV;
diff --git a/drivers/regulator/dbx500-prcmu.c b/drivers/regulator/dbx500-prcmu.c
index 261f3d2299bc..89bd2faaef8c 100644
--- a/drivers/regulator/dbx500-prcmu.c
+++ b/drivers/regulator/dbx500-prcmu.c
@@ -14,6 +14,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include "dbx500-prcmu.h"
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index b15d711bc8c6..9019d0e7ecb6 100644
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -728,7 +728,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
                        }
                }
                rdev = regulator_register(&ri->rinfo->desc, &config);
-                if (IS_ERR_OR_NULL(rdev)) {
+                if (IS_ERR(rdev)) {
                        dev_err(&pdev->dev,
                                "register regulator failed %s\n",
                                        ri->rinfo->desc.name);
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 923a9da9c829..f11f746f7a35 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -269,6 +269,16 @@ config RTC_DRV_X1205
          This driver can also be built as a module. If so, the module
          will be called rtc-x1205.
+config RTC_DRV_PALMAS
+        tristate "TI Palmas RTC driver"
+        depends on MFD_PALMAS
+        help
+          If you say yes here you get support for the RTC of TI PALMA series PMIC
+          chips.
+          This driver can also be built as a module. If so, the module
+          will be called rtc-palma.
 config RTC_DRV_PCF8523
        tristate "NXP PCF8523"
        help
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 4418ef3f9ecc..3b66c75f6c76 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -76,6 +76,7 @@ obj-$(CONFIG_RTC_DRV_MPC5121)	+= rtc-mpc5121.o
 obj-$(CONFIG_RTC_DRV_MV)        += rtc-mv.o
 obj-$(CONFIG_RTC_DRV_NUC900)    += rtc-nuc900.o
 obj-$(CONFIG_RTC_DRV_OMAP)      += rtc-omap.o
+obj-$(CONFIG_RTC_DRV_PALMAS)    += rtc-palmas.o
 obj-$(CONFIG_RTC_DRV_PCAP)      += rtc-pcap.o
 obj-$(CONFIG_RTC_DRV_PCF8523)   += rtc-pcf8523.o
 obj-$(CONFIG_RTC_DRV_PCF8563)   += rtc-pcf8563.o
diff --git a/drivers/rtc/rtc-palmas.c b/drivers/rtc/rtc-palmas.c
new file mode 100644
index 000000000000..59c42986254e
--- /dev/null
+++ b/drivers/rtc/rtc-palmas.c
@@ -0,0 +1,339 @@
+/*
+ * rtc-palmas.c -- Palmas Real Time Clock driver.
+ * RTC driver for TI Palma series devices like TPS65913,
+ * TPS65914 power management IC.
+ *
+ * Copyright (c) 2012, NVIDIA Corporation.
+ *
+ * Author: Laxman Dewangan <ldewangan@nvidia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
+ * whether express or implied; 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/bcd.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/mfd/palmas.h>
+#include <linux/module.h>
+#include <linux/rtc.h>
+#include <linux/types.h>
+#include <linux/platform_device.h>
+#include <linux/pm.h>
+struct palmas_rtc {
+        struct rtc_device       *rtc;
+        struct device           *dev;
+        unsigned int            irq;
+};
+/* Total number of RTC registers needed to set time*/
+#define PALMAS_NUM_TIME_REGS    (PALMAS_YEARS_REG - PALMAS_SECONDS_REG + 1)
+static int palmas_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned char rtc_data[PALMAS_NUM_TIME_REGS];
+        struct palmas *palmas = dev_get_drvdata(dev->parent);
+        int ret;
+        /* Copy RTC counting registers to static registers or latches */
+        ret = palmas_update_bits(palmas, PALMAS_RTC_BASE, PALMAS_RTC_CTRL_REG,
+                PALMAS_RTC_CTRL_REG_GET_TIME, PALMAS_RTC_CTRL_REG_GET_TIME);
+        if (ret < 0) {
+                dev_err(dev, "RTC CTRL reg update failed, err: %d\n", ret);
+                return ret;
+        }
+        ret = palmas_bulk_read(palmas, PALMAS_RTC_BASE, PALMAS_SECONDS_REG,
+                        rtc_data, PALMAS_NUM_TIME_REGS);
+        if (ret < 0) {
+                dev_err(dev, "RTC_SECONDS reg read failed, err = %d\n", ret);
+                return ret;
+        }
+        tm->tm_sec = bcd2bin(rtc_data[0]);
+        tm->tm_min = bcd2bin(rtc_data[1]);
+        tm->tm_hour = bcd2bin(rtc_data[2]);
+        tm->tm_mday = bcd2bin(rtc_data[3]);
+        tm->tm_mon = bcd2bin(rtc_data[4]) - 1;
+        tm->tm_year = bcd2bin(rtc_data[5]) + 100;
+        return ret;
+}
+static int palmas_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        unsigned char rtc_data[PALMAS_NUM_TIME_REGS];
+        struct palmas *palmas = dev_get_drvdata(dev->parent);
+        int ret;
+        rtc_data[0] = bin2bcd(tm->tm_sec);
+        rtc_data[1] = bin2bcd(tm->tm_min);
+        rtc_data[2] = bin2bcd(tm->tm_hour);
+        rtc_data[3] = bin2bcd(tm->tm_mday);
+        rtc_data[4] = bin2bcd(tm->tm_mon + 1);
+        rtc_data[5] = bin2bcd(tm->tm_year - 100);
+        /* Stop RTC while updating the RTC time registers */
+        ret = palmas_update_bits(palmas, PALMAS_RTC_BASE, PALMAS_RTC_CTRL_REG,
+                PALMAS_RTC_CTRL_REG_STOP_RTC, 0);
+        if (ret < 0) {
+                dev_err(dev, "RTC stop failed, err = %d\n", ret);
+                return ret;
+        }
+        ret = palmas_bulk_write(palmas, PALMAS_RTC_BASE, PALMAS_SECONDS_REG,
+                rtc_data, PALMAS_NUM_TIME_REGS);
+        if (ret < 0) {
+                dev_err(dev, "RTC_SECONDS reg write failed, err = %d\n", ret);
+                return ret;
+        }
+        /* Start back RTC */
+        ret = palmas_update_bits(palmas, PALMAS_RTC_BASE, PALMAS_RTC_CTRL_REG,
+                PALMAS_RTC_CTRL_REG_STOP_RTC, PALMAS_RTC_CTRL_REG_STOP_RTC);
+        if (ret < 0)
+                dev_err(dev, "RTC start failed, err = %d\n", ret);
+        return ret;
+}
+static int palmas_rtc_alarm_irq_enable(struct device *dev, unsigned enabled)
+{
+        struct palmas *palmas = dev_get_drvdata(dev->parent);
+        u8 val;
+        val = enabled ? PALMAS_RTC_INTERRUPTS_REG_IT_ALARM : 0;
+        return palmas_write(palmas, PALMAS_RTC_BASE,
+                PALMAS_RTC_INTERRUPTS_REG, val);
+}
+static int palmas_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        unsigned char alarm_data[PALMAS_NUM_TIME_REGS];
+        u32 int_val;
+        struct palmas *palmas = dev_get_drvdata(dev->parent);
+        int ret;
+        ret = palmas_bulk_read(palmas, PALMAS_RTC_BASE,
+                        PALMAS_ALARM_SECONDS_REG,
+                        alarm_data, PALMAS_NUM_TIME_REGS);
+        if (ret < 0) {
+                dev_err(dev, "RTC_ALARM_SECONDS read failed, err = %d\n", ret);
+                return ret;
+        }
+        alm->time.tm_sec = bcd2bin(alarm_data[0]);
+        alm->time.tm_min = bcd2bin(alarm_data[1]);
+        alm->time.tm_hour = bcd2bin(alarm_data[2]);
+        alm->time.tm_mday = bcd2bin(alarm_data[3]);
+        alm->time.tm_mon = bcd2bin(alarm_data[4]) - 1;
+        alm->time.tm_year = bcd2bin(alarm_data[5]) + 100;
+        ret = palmas_read(palmas, PALMAS_RTC_BASE, PALMAS_RTC_INTERRUPTS_REG,
+                        &int_val);
+        if (ret < 0) {
+                dev_err(dev, "RTC_INTERRUPTS reg read failed, err = %d\n", ret);
+                return ret;
+        }
+        if (int_val & PALMAS_RTC_INTERRUPTS_REG_IT_ALARM)
+                alm->enabled = 1;
+        return ret;
+}
+static int palmas_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        unsigned char alarm_data[PALMAS_NUM_TIME_REGS];
+        struct palmas *palmas = dev_get_drvdata(dev->parent);
+        int ret;
+        ret = palmas_rtc_alarm_irq_enable(dev, 0);
+        if (ret < 0) {
+                dev_err(dev, "Disable RTC alarm failed\n");
+                return ret;
+        }
+        alarm_data[0] = bin2bcd(alm->time.tm_sec);
+        alarm_data[1] = bin2bcd(alm->time.tm_min);
+        alarm_data[2] = bin2bcd(alm->time.tm_hour);
+        alarm_data[3] = bin2bcd(alm->time.tm_mday);
+        alarm_data[4] = bin2bcd(alm->time.tm_mon + 1);
+        alarm_data[5] = bin2bcd(alm->time.tm_year - 100);
+        ret = palmas_bulk_write(palmas, PALMAS_RTC_BASE,
+                PALMAS_ALARM_SECONDS_REG, alarm_data, PALMAS_NUM_TIME_REGS);
+        if (ret < 0) {
+                dev_err(dev, "ALARM_SECONDS_REG write failed, err = %d\n", ret);
+                return ret;
+        }
+        if (alm->enabled)
+                ret = palmas_rtc_alarm_irq_enable(dev, 1);
+        return ret;
+}
+static int palmas_clear_interrupts(struct device *dev)
+{
+        struct palmas *palmas = dev_get_drvdata(dev->parent);
+        unsigned int rtc_reg;
+        int ret;
+        ret = palmas_read(palmas, PALMAS_RTC_BASE, PALMAS_RTC_STATUS_REG,
+                                &rtc_reg);
+        if (ret < 0) {
+                dev_err(dev, "RTC_STATUS read failed, err = %d\n", ret);
+                return ret;
+        }
+        ret = palmas_write(palmas, PALMAS_RTC_BASE, PALMAS_RTC_STATUS_REG,
+                        rtc_reg);
+        if (ret < 0) {
+                dev_err(dev, "RTC_STATUS write failed, err = %d\n", ret);
+                return ret;
+        }
+        return 0;
+}
+static irqreturn_t palmas_rtc_interrupt(int irq, void *context)
+{
+        struct palmas_rtc *palmas_rtc = context;
+        struct device *dev = palmas_rtc->dev;
+        int ret;
+        ret = palmas_clear_interrupts(dev);
+        if (ret < 0) {
+                dev_err(dev, "RTC interrupt clear failed, err = %d\n", ret);
+                return IRQ_NONE;
+        }
+        rtc_update_irq(palmas_rtc->rtc, 1, RTC_IRQF | RTC_AF);
+        return IRQ_HANDLED;
+}
+static struct rtc_class_ops palmas_rtc_ops = {
+        .read_time      = palmas_rtc_read_time,
+        .set_time       = palmas_rtc_set_time,
+        .read_alarm     = palmas_rtc_read_alarm,
+        .set_alarm      = palmas_rtc_set_alarm,
+        .alarm_irq_enable = palmas_rtc_alarm_irq_enable,
+};
+static int palmas_rtc_probe(struct platform_device *pdev)
+{
+        struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
+        struct palmas_rtc *palmas_rtc = NULL;
+        int ret;
+        palmas_rtc = devm_kzalloc(&pdev->dev, sizeof(struct palmas_rtc),
+                        GFP_KERNEL);
+        if (!palmas_rtc)
+                return -ENOMEM;
+        /* Clear pending interrupts */
+        ret = palmas_clear_interrupts(&pdev->dev);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "clear RTC int failed, err = %d\n", ret);
+                return ret;
+        }
+        palmas_rtc->dev = &pdev->dev;
+        platform_set_drvdata(pdev, palmas_rtc);
+        /* Start RTC */
+        ret = palmas_update_bits(palmas, PALMAS_RTC_BASE, PALMAS_RTC_CTRL_REG,
+                        PALMAS_RTC_CTRL_REG_STOP_RTC,
+                        PALMAS_RTC_CTRL_REG_STOP_RTC);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "RTC_CTRL write failed, err = %d\n", ret);
+                return ret;
+        }
+        palmas_rtc->irq = platform_get_irq(pdev, 0);
+        palmas_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+                                &palmas_rtc_ops, THIS_MODULE);
+        if (IS_ERR(palmas_rtc->rtc)) {
+                ret = PTR_ERR(palmas_rtc->rtc);
+                dev_err(&pdev->dev, "RTC register failed, err = %d\n", ret);
+                return ret;
+        }
+        ret = request_threaded_irq(palmas_rtc->irq, NULL,
+                        palmas_rtc_interrupt,
+                        IRQF_TRIGGER_LOW | IRQF_ONESHOT |
+                        IRQF_EARLY_RESUME,
+                        dev_name(&pdev->dev), palmas_rtc);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "IRQ request failed, err = %d\n", ret);
+                rtc_device_unregister(palmas_rtc->rtc);
+                return ret;
+        }
+        device_set_wakeup_capable(&pdev->dev, 1);
+        return 0;
+}
+static int palmas_rtc_remove(struct platform_device *pdev)
+{
+        struct palmas_rtc *palmas_rtc = platform_get_drvdata(pdev);
+        palmas_rtc_alarm_irq_enable(&pdev->dev, 0);
+        free_irq(palmas_rtc->irq, palmas_rtc);
+        rtc_device_unregister(palmas_rtc->rtc);
+        return 0;
+}
+#ifdef CONFIG_PM_SLEEP
+static int palmas_rtc_suspend(struct device *dev)
+{
+        struct palmas_rtc *palmas_rtc = dev_get_drvdata(dev);
+        if (device_may_wakeup(dev))
+                enable_irq_wake(palmas_rtc->irq);
+        return 0;
+}
+static int palmas_rtc_resume(struct device *dev)
+{
+        struct palmas_rtc *palmas_rtc = dev_get_drvdata(dev);
+        if (device_may_wakeup(dev))
+                disable_irq_wake(palmas_rtc->irq);
+        return 0;
+}
+#endif
+static const struct dev_pm_ops palmas_rtc_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(palmas_rtc_suspend, palmas_rtc_resume)
+};
+static struct platform_driver palmas_rtc_driver = {
+        .probe          = palmas_rtc_probe,
+        .remove         = palmas_rtc_remove,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "palmas-rtc",
+                .pm     = &palmas_rtc_pm_ops,
+        },
+};
+module_platform_driver(palmas_rtc_driver);
+MODULE_ALIAS("platform:palmas_rtc");
+MODULE_DESCRIPTION("TI PALMAS series RTC driver");
+MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index d73fdcfeb45a..2839baa82a5a 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -633,7 +633,7 @@ static int isci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                return -ENOMEM;
        pci_set_drvdata(pdev, pci_info);
-        if (efi_enabled)
+        if (efi_enabled(EFI_RUNTIME_SERVICES))
                orom = isci_get_efi_var(pdev);
        if (!orom)
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index 2c9bce050aa9..5ca11b066b7e 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -101,6 +101,29 @@ static const struct backlight_ops max8925_backlight_ops = {
        .get_brightness = max8925_backlight_get_brightness,
 };
+#ifdef CONFIG_OF
+static int max8925_backlight_dt_init(struct platform_device *pdev,
+                              struct max8925_backlight_pdata *pdata)
+{
+        struct device_node *nproot = pdev->dev.parent->of_node, *np;
+        int dual_string;
+        if (!nproot)
+                return -ENODEV;
+        np = of_find_node_by_name(nproot, "backlight");
+        if (!np) {
+                dev_err(&pdev->dev, "failed to find backlight node\n");
+                return -ENODEV;
+        }
+        of_property_read_u32(np, "maxim,max8925-dual-string", &dual_string);
+        pdata->dual_string = dual_string;
+        return 0;
+}
+#else
+#define max8925_backlight_dt_init(x, y) (-1)
+#endif
 static int max8925_backlight_probe(struct platform_device *pdev)
 {
        struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
@@ -147,6 +170,13 @@ static int max8925_backlight_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, bl);
        value = 0;
+        if (pdev->dev.parent->of_node && !pdata) {
+                pdata = devm_kzalloc(&pdev->dev,
+                                     sizeof(struct max8925_backlight_pdata),
+                                     GFP_KERNEL);
+                max8925_backlight_dt_init(pdev, pdata);
+        }
        if (pdata) {
                if (pdata->lxw_scl)
                        value |= (1 << 7);
@@ -158,7 +188,6 @@ static int max8925_backlight_probe(struct platform_device *pdev)
        ret = max8925_set_bits(chip->i2c, data->reg_mode_cntl, 0xfe, value);
        if (ret < 0)
                goto out_brt;
        backlight_update_status(bl);
        return 0;
 out_brt:
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 7f809fd4a57f..26e1fdbddf69 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -364,6 +364,18 @@ config IMX2_WDT
          To compile this driver as a module, choose M here: the
          module will be called imx2_wdt.
+config UX500_WATCHDOG
+        tristate "ST-Ericsson Ux500 watchdog"
+        depends on MFD_DB8500_PRCMU
+        select WATCHDOG_CORE
+        default y
+        help
+          Say Y here to include Watchdog timer support for the watchdog
+          existing in the prcmu of ST-Ericsson Ux500 series platforms.
+          To compile this driver as a module, choose M here: the
+          module will be called ux500_wdt.
 # AVR32 Architecture
 config AT32AP700X_WDT
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 97bbdb3a4648..bec86ee6e9e3 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
 obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
 obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
 obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
+obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o
 # AVR32 Architecture
 obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
diff --git a/drivers/watchdog/ux500_wdt.c b/drivers/watchdog/ux500_wdt.c
new file mode 100644
index 000000000000..a614d84121c3
--- /dev/null
+++ b/drivers/watchdog/ux500_wdt.c
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2011-2013
+ *
+ * License Terms: GNU General Public License v2
+ *
+ * Author: Mathieu Poirier <mathieu.poirier@linaro.org> for ST-Ericsson
+ * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson
+ */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/moduleparam.h>
+#include <linux/miscdevice.h>
+#include <linux/err.h>
+#include <linux/uaccess.h>
+#include <linux/watchdog.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/ux500_wdt.h>
+#include <linux/mfd/dbx500-prcmu.h>
+#define WATCHDOG_TIMEOUT 600 /* 10 minutes */
+#define WATCHDOG_MIN    0
+#define WATCHDOG_MAX28  268435  /* 28 bit resolution in ms == 268435.455 s */
+#define WATCHDOG_MAX32  4294967 /* 32 bit resolution in ms == 4294967.295 s */
+static unsigned int timeout = WATCHDOG_TIMEOUT;
+module_param(timeout, uint, 0);
+MODULE_PARM_DESC(timeout,
+        "Watchdog timeout in seconds. default="
+                                __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0);
+MODULE_PARM_DESC(nowayout,
+        "Watchdog cannot be stopped once started (default="
+                                __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+static int ux500_wdt_start(struct watchdog_device *wdd)
+{
+        return prcmu_enable_a9wdog(PRCMU_WDOG_ALL);
+}
+static int ux500_wdt_stop(struct watchdog_device *wdd)
+{
+        return prcmu_disable_a9wdog(PRCMU_WDOG_ALL);
+}
+static int ux500_wdt_keepalive(struct watchdog_device *wdd)
+{
+        return prcmu_kick_a9wdog(PRCMU_WDOG_ALL);
+}
+static int ux500_wdt_set_timeout(struct watchdog_device *wdd,
+                                 unsigned int timeout)
+{
+        ux500_wdt_stop(wdd);
+        prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000);
+        ux500_wdt_start(wdd);
+        return 0;
+}
+static const struct watchdog_info ux500_wdt_info = {
+        .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
+        .identity = "Ux500 WDT",
+        .firmware_version = 1,
+};
+static const struct watchdog_ops ux500_wdt_ops = {
+        .owner = THIS_MODULE,
+        .start = ux500_wdt_start,
+        .stop  = ux500_wdt_stop,
+        .ping  = ux500_wdt_keepalive,
+        .set_timeout = ux500_wdt_set_timeout,
+};
+static struct watchdog_device ux500_wdt = {
+        .info = &ux500_wdt_info,
+        .ops = &ux500_wdt_ops,
+        .min_timeout = WATCHDOG_MIN,
+        .max_timeout = WATCHDOG_MAX32,
+};
+static int ux500_wdt_probe(struct platform_device *pdev)
+{
+        int ret;
+        struct ux500_wdt_data *pdata = pdev->dev.platform_data;
+        if (pdata) {
+                if (pdata->timeout > 0)
+                        timeout = pdata->timeout;
+                if (pdata->has_28_bits_resolution)
+                        ux500_wdt.max_timeout = WATCHDOG_MAX28;
+        }
+        watchdog_set_nowayout(&ux500_wdt, nowayout);
+        /* disable auto off on sleep */
+        prcmu_config_a9wdog(PRCMU_WDOG_CPU1, false);
+        /* set HW initial value */
+        prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000);
+        ret = watchdog_register_device(&ux500_wdt);
+        if (ret)
+                return ret;
+        dev_info(&pdev->dev, "initialized\n");
+        return 0;
+}
+static int ux500_wdt_remove(struct platform_device *dev)
+{
+        watchdog_unregister_device(&ux500_wdt);
+        return 0;
+}
+#ifdef CONFIG_PM
+static int ux500_wdt_suspend(struct platform_device *pdev,
+                             pm_message_t state)
+{
+        if (watchdog_active(&ux500_wdt)) {
+                ux500_wdt_stop(&ux500_wdt);
+                prcmu_config_a9wdog(PRCMU_WDOG_CPU1, true);
+                prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000);
+                ux500_wdt_start(&ux500_wdt);
+        }
+        return 0;
+}
+static int ux500_wdt_resume(struct platform_device *pdev)
+{
+        if (watchdog_active(&ux500_wdt)) {
+                ux500_wdt_stop(&ux500_wdt);
+                prcmu_config_a9wdog(PRCMU_WDOG_CPU1, false);
+                prcmu_load_a9wdog(PRCMU_WDOG_ALL, timeout * 1000);
+                ux500_wdt_start(&ux500_wdt);
+        }
+        return 0;
+}
+#else
+#define ux500_wdt_suspend NULL
+#define ux500_wdt_resume NULL
+#endif
+static struct platform_driver ux500_wdt_driver = {
+        .probe          = ux500_wdt_probe,
+        .remove         = ux500_wdt_remove,
+        .suspend        = ux500_wdt_suspend,
+        .resume         = ux500_wdt_resume,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "ux500_wdt",
+        },
+};
+module_platform_driver(ux500_wdt_driver);
+MODULE_AUTHOR("Jonas Aaberg <jonas.aberg@stericsson.com>");
+MODULE_DESCRIPTION("Ux500 Watchdog Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:ux500_wdt");