204 files changed, 3595 insertions, 2651 deletions

diff --git a/Documentation/ABI/stable/sysfs-bus-usb b/Documentation/ABI/stable/sysfs-bus-usb
index 2be603c52a24..a6b685724740 100644
--- a/Documentation/ABI/stable/sysfs-bus-usb
+++ b/Documentation/ABI/stable/sysfs-bus-usb
@@ -37,8 +37,8 @@ Description:
                 that the USB device has been connected to the machine.  This
                 file is read-only.
 Users:
-                PowerTOP <power@bughost.org>
-                http://www.lesswatts.org/projects/powertop/
+                PowerTOP <powertop@lists.01.org>
+                https://01.org/powertop/
 
 What:           /sys/bus/usb/device/.../power/active_duration
 Date:           January 2008
@@ -57,8 +57,8 @@ Description:
                 will give an integer percentage.  Note that this does not
                 account for counter wrap.
 Users:
-                PowerTOP <power@bughost.org>
-                http://www.lesswatts.org/projects/powertop/
+                PowerTOP <powertop@lists.01.org>
+                https://01.org/powertop/
 
 What:           /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend
 Date:           January 2008
diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power
index 9d43e7670841..efe449bdf811 100644
--- a/Documentation/ABI/testing/sysfs-devices-power
+++ b/Documentation/ABI/testing/sysfs-devices-power
@@ -1,6 +1,6 @@
 What:           /sys/devices/.../power/
 Date:           January 2009
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../power directory contains attributes
                 allowing the user space to check and modify some power
@@ -8,7 +8,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup
 Date:           January 2009
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../power/wakeup attribute allows the user
                 space to check if the device is enabled to wake up the system
@@ -34,7 +34,7 @@ Description:
 
 What:           /sys/devices/.../power/control
 Date:           January 2009
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../power/control attribute allows the user
                 space to control the run-time power management of the device.
@@ -53,7 +53,7 @@ Description:
 
 What:           /sys/devices/.../power/async
 Date:           January 2009
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../async attribute allows the user space to
                 enable or diasble the device's suspend and resume callbacks to
@@ -79,7 +79,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup_count
 Date:           September 2010
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_count attribute contains the number
                 of signaled wakeup events associated with the device.  This
@@ -88,7 +88,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup_active_count
 Date:           September 2010
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_active_count attribute contains the
                 number of times the processing of wakeup events associated with
@@ -98,7 +98,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup_abort_count
 Date:           February 2012
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_abort_count attribute contains the
                 number of times the processing of a wakeup event associated with
@@ -109,7 +109,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup_expire_count
 Date:           February 2012
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_expire_count attribute contains the
                 number of times a wakeup event associated with the device has
@@ -119,7 +119,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup_active
 Date:           September 2010
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_active attribute contains either 1,
                 or 0, depending on whether or not a wakeup event associated with
@@ -129,7 +129,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup_total_time_ms
 Date:           September 2010
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_total_time_ms attribute contains
                 the total time of processing wakeup events associated with the
@@ -139,7 +139,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup_max_time_ms
 Date:           September 2010
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_max_time_ms attribute contains
                 the maximum time of processing a single wakeup event associated
@@ -149,7 +149,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup_last_time_ms
 Date:           September 2010
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_last_time_ms attribute contains
                 the value of the monotonic clock corresponding to the time of
@@ -160,7 +160,7 @@ Description:
 
 What:           /sys/devices/.../power/wakeup_prevent_sleep_time_ms
 Date:           February 2012
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
                 contains the total time the device has been preventing
@@ -189,7 +189,7 @@ Description:
 
 What:           /sys/devices/.../power/pm_qos_latency_us
 Date:           March 2012
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../power/pm_qos_resume_latency_us attribute
                 contains the PM QoS resume latency limit for the given device,
@@ -207,7 +207,7 @@ Description:
 
 What:           /sys/devices/.../power/pm_qos_no_power_off
 Date:           September 2012
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../power/pm_qos_no_power_off attribute
                 is used for manipulating the PM QoS "no power off" flag.  If
@@ -222,7 +222,7 @@ Description:
 
 What:           /sys/devices/.../power/pm_qos_remote_wakeup
 Date:           September 2012
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/devices/.../power/pm_qos_remote_wakeup attribute
                 is used for manipulating the PM QoS "remote wakeup required"
diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power
index 217772615d02..205a73878441 100644
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
@@ -1,6 +1,6 @@
 What:           /sys/power/
 Date:           August 2006
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power directory will contain files that will
                 provide a unified interface to the power management
@@ -8,7 +8,7 @@ Description:
 
 What:           /sys/power/state
 Date:           August 2006
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/state file controls the system power state.
                 Reading from this file returns what states are supported,
@@ -22,7 +22,7 @@ Description:
 
 What:           /sys/power/disk
 Date:           September 2006
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/disk file controls the operating mode of the
                 suspend-to-disk mechanism.  Reading from this file returns
@@ -67,7 +67,7 @@ Description:
 
 What:           /sys/power/image_size
 Date:           August 2006
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/image_size file controls the size of the image
                 created by the suspend-to-disk mechanism.  It can be written a
@@ -84,7 +84,7 @@ Description:
 
 What:           /sys/power/pm_trace
 Date:           August 2006
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/pm_trace file controls the code which saves the
                 last PM event point in the RTC across reboots, so that you can
@@ -133,7 +133,7 @@ Description:
 
 What:           /sys/power/pm_async
 Date:           January 2009
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/pm_async file controls the switch allowing the
                 user space to enable or disable asynchronous suspend and resume
@@ -146,7 +146,7 @@ Description:
 
 What:           /sys/power/wakeup_count
 Date:           July 2010
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/wakeup_count file allows user space to put the
                 system into a sleep state while taking into account the
@@ -161,7 +161,7 @@ Description:
 
 What:           /sys/power/reserved_size
 Date:           May 2011
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/reserved_size file allows user space to control
                 the amount of memory reserved for allocations made by device
@@ -175,7 +175,7 @@ Description:
 
 What:           /sys/power/autosleep
 Date:           April 2012
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/autosleep file can be written one of the strings
                 returned by reads from /sys/power/state.  If that happens, a
@@ -192,7 +192,7 @@ Description:
 
 What:           /sys/power/wake_lock
 Date:           February 2012
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/wake_lock file allows user space to create
                 wakeup source objects and activate them on demand (if one of
@@ -219,7 +219,7 @@ Description:
 
 What:           /sys/power/wake_unlock
 Date:           February 2012
-Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Contact:        Rafael J. Wysocki <rjw@rjwysocki.net>
 Description:
                 The /sys/power/wake_unlock file allows user space to deactivate
                 wakeup sources created with the help of /sys/power/wake_lock.
diff --git a/Documentation/acpi/dsdt-override.txt b/Documentation/acpi/dsdt-override.txt
index febbb1ba4d23..784841caa6e6 100644
--- a/Documentation/acpi/dsdt-override.txt
+++ b/Documentation/acpi/dsdt-override.txt
@@ -4,4 +4,4 @@ CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel.
 
 When to use this method is described in detail on the
 Linux/ACPI home page:
-http://www.lesswatts.org/projects/acpi/overridingDSDT.php
+https://01.org/linux-acpi/documentation/overriding-dsdt
diff --git a/Documentation/devicetree/bindings/memory.txt b/Documentation/devicetree/bindings/memory.txt
deleted file mode 100644
index eb2469365593..000000000000
--- a/Documentation/devicetree/bindings/memory.txt
+++ /dev/null
@@ -1,168 +0,0 @@
-*** Memory binding ***
-
-The /memory node provides basic information about the address and size
-of the physical memory. This node is usually filled or updated by the
-bootloader, depending on the actual memory configuration of the given
-hardware.
-
-The memory layout is described by the following node:
-
-/ {
-        #address-cells = <(n)>;
-        #size-cells = <(m)>;
-        memory {
-                device_type = "memory";
-                reg =  <(baseaddr1) (size1)
-                        (baseaddr2) (size2)
-                        ...
-                        (baseaddrN) (sizeN)>;
-        };
-        ...
-};
-
-A memory node follows the typical device tree rules for "reg" property:
-n:              number of cells used to store base address value
-m:              number of cells used to store size value
-baseaddrX:      defines a base address of the defined memory bank
-sizeX:          the size of the defined memory bank
-
-
-More than one memory bank can be defined.
-
-
-*** Reserved memory regions ***
-
-In /memory/reserved-memory node one can create child nodes describing
-particular reserved (excluded from normal use) memory regions. Such
-memory regions are usually designed for the special usage by various
-device drivers. A good example are contiguous memory allocations or
-memory sharing with other operating system on the same hardware board.
-Those special memory regions might depend on the board configuration and
-devices used on the target system.
-
-Parameters for each memory region can be encoded into the device tree
-with the following convention:
-
-[(label):] (name) {
-        compatible = "linux,contiguous-memory-region", "reserved-memory-region";
-        reg = <(address) (size)>;
-        (linux,default-contiguous-region);
-};
-
-compatible:     one or more of:
-        - "linux,contiguous-memory-region" - enables binding of this
-          region to Contiguous Memory Allocator (special region for
-          contiguous memory allocations, shared with movable system
-          memory, Linux kernel-specific).
-        - "reserved-memory-region" - compatibility is defined, given
-          region is assigned for exclusive usage for by the respective
-          devices.
-
-reg:    standard property defining the base address and size of
-        the memory region
-
-linux,default-contiguous-region: property indicating that the region
-        is the default region for all contiguous memory
-        allocations, Linux specific (optional)
-
-It is optional to specify the base address, so if one wants to use
-autoconfiguration of the base address, '0' can be specified as a base
-address in the 'reg' property.
-
-The /memory/reserved-memory node must contain the same #address-cells
-and #size-cells value as the root node.
-
-
-*** Device node's properties ***
-
-Once regions in the /memory/reserved-memory node have been defined, they
-may be referenced by other device nodes. Bindings that wish to reference
-memory regions should explicitly document their use of the following
-property:
-
-memory-region = <&phandle_to_defined_region>;
-
-This property indicates that the device driver should use the memory
-region pointed by the given phandle.
-
-
-*** Example ***
-
-This example defines a memory consisting of 4 memory banks. 3 contiguous
-regions are defined for Linux kernel, one default of all device drivers
-(named contig_mem, placed at 0x72000000, 64MiB), one dedicated to the
-framebuffer device (labelled display_mem, placed at 0x78000000, 8MiB)
-and one for multimedia processing (labelled multimedia_mem, placed at
-0x77000000, 64MiB). 'display_mem' region is then assigned to fb@12300000
-device for DMA memory allocations (Linux kernel drivers will use CMA is
-available or dma-exclusive usage otherwise). 'multimedia_mem' is
-assigned to scaler@12500000 and codec@12600000 devices for contiguous
-memory allocations when CMA driver is enabled.
-
-The reason for creating a separate region for framebuffer device is to
-match the framebuffer base address to the one configured by bootloader,
-so once Linux kernel drivers starts no glitches on the displayed boot
-logo appears. Scaller and codec drivers should share the memory
-allocations.
-
-/ {
-        #address-cells = <1>;
-        #size-cells = <1>;
-
-        /* ... */
-
-        memory {
-                reg =  <0x40000000 0x10000000
-                        0x50000000 0x10000000
-                        0x60000000 0x10000000
-                        0x70000000 0x10000000>;
-
-                reserved-memory {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-
-                        /*
-                         * global autoconfigured region for contiguous allocations
-                         * (used only with Contiguous Memory Allocator)
-                         */
-                        contig_region@0 {
-                                compatible = "linux,contiguous-memory-region";
-                                reg = <0x0 0x4000000>;
-                                linux,default-contiguous-region;
-                        };
-
-                        /*
-                         * special region for framebuffer
-                         */
-                        display_region: region@78000000 {
-                                compatible = "linux,contiguous-memory-region", "reserved-memory-region";
-                                reg = <0x78000000 0x800000>;
-                        };
-
-                        /*
-                         * special region for multimedia processing devices
-                         */
-                        multimedia_region: region@77000000 {
-                                compatible = "linux,contiguous-memory-region";
-                                reg = <0x77000000 0x4000000>;
-                        };
-                };
-        };
-
-        /* ... */
-
-        fb0: fb@12300000 {
-                status = "okay";
-                memory-region = <&display_region>;
-        };
-
-        scaler: scaler@12500000 {
-                status = "okay";
-                memory-region = <&multimedia_region>;
-        };
-
-        codec: codec@12600000 {
-                status = "okay";
-                memory-region = <&multimedia_region>;
-        };
-};
diff --git a/Documentation/devicetree/bindings/regulator/as3722-regulator.txt b/Documentation/devicetree/bindings/regulator/as3722-regulator.txt
new file mode 100644
index 000000000000..caad0c8a258d
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/as3722-regulator.txt
@@ -0,0 +1,91 @@
+Regulator of AMS AS3722 PMIC.
+Name of the regulator subnode must be "regulators".
+
+Optional properties:
+--------------------
+The input supply of regulators are the optional properties on the
+regulator node. The AS3722 is having 7 DCDC step-down regulators as
+sd[0-6], 10 LDOs as ldo[0-7], ldo[9-11]. The input supply of these
+regulators are provided through following properties:
+vsup-sd2-supply: Input supply for SD2.
+vsup-sd3-supply: Input supply for SD3.
+vsup-sd4-supply: Input supply for SD4.
+vsup-sd5-supply: Input supply for SD5.
+vin-ldo0-supply: Input supply for LDO0.
+vin-ldo1-6-supply: Input supply for LDO1 and LDO6.
+vin-ldo2-5-7-supply: Input supply for LDO2, LDO5 and LDO7.
+vin-ldo3-4-supply: Input supply for LDO3 and LDO4.
+vin-ldo9-10-supply: Input supply for LDO9 and LDO10.
+vin-ldo11-supply: Input supply for LDO11.
+
+Optional nodes:
+--------------
+- regulators : Must contain a sub-node per regulator from the list below.
+               Each sub-node should contain the constraints and initialization
+               information for that regulator. See regulator.txt for a
+               description of standard properties for these sub-nodes.
+               Additional custom properties  are listed below.
+               sd[0-6], ldo[0-7], ldo[9-11].
+
+               Optional sub-node properties:
+               ----------------------------
+                ams,ext-control: External control of the rail. The option of
+                        this properties will tell which external input is
+                        controlling this rail. Valid values are 0, 1, 2 ad 3.
+                        0: There is no external control of this rail.
+                        1: Rail is controlled by ENABLE1 input pin.
+                        2: Rail is controlled by ENABLE2 input pin.
+                        3: Rail is controlled by ENABLE3 input pin.
+                ams,enable-tracking: Enable tracking with SD1, only supported
+                        by LDO3.
+
+Example:
+-------
+        ams3722: ams3722 {
+                compatible = "ams,as3722";
+                reg = <0x40>;
+                ...
+
+                regulators {
+                        vsup-sd2-supply = <...>;
+                        ...
+
+                        sd0 {
+                                regulator-name = "vdd_cpu";
+                                regulator-min-microvolt = <700000>;
+                                regulator-max-microvolt = <1400000>;
+                                regulator-always-on;
+                                ams,ext-control = <2>;
+                        };
+
+                        sd1 {
+                                regulator-name = "vdd_core";
+                                regulator-min-microvolt = <700000>;
+                                regulator-max-microvolt = <1400000>;
+                                regulator-always-on;
+                                ams,ext-control = <1>;
+                        };
+
+                        sd2 {
+                                regulator-name = "vddio_ddr";
+                                regulator-min-microvolt = <1350000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-always-on;
+                        };
+
+                        sd4 {
+                                regulator-name = "avdd-hdmi-pex";
+                                regulator-min-microvolt = <1050000>;
+                                regulator-max-microvolt = <1050000>;
+                                regulator-always-on;
+                        };
+
+                        sd5 {
+                                regulator-name = "vdd-1v8";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+                        ....
+                };
+        };
diff --git a/Documentation/devicetree/bindings/regulator/da9210.txt b/Documentation/devicetree/bindings/regulator/da9210.txt
new file mode 100644
index 000000000000..f120f229d67d
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/da9210.txt
@@ -0,0 +1,21 @@
+* Dialog Semiconductor DA9210 Voltage Regulator
+
+Required properties:
+
+- compatible:   must be "diasemi,da9210"
+- reg:          the i2c slave address of the regulator. It should be 0x68.
+
+Any standard regulator properties can be used to configure the single da9210
+DCDC.
+
+Example:
+
+        da9210@68 {
+                compatible = "diasemi,da9210";
+                reg = <0x68>;
+
+                regulator-min-microvolt = <900000>;
+                regulator-max-microvolt = <1000000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
diff --git a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
index 875639ae0606..42e6b6bc48ff 100644
--- a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
+++ b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
@@ -26,11 +26,17 @@ Optional nodes:
 
                For ti,palmas-pmic - smps12, smps123, smps3 depending on OTP,
                smps45, smps457, smps7 depending on variant, smps6, smps[8-9],
-               smps10_out2, smps10_out1, do[1-9], ldoln, ldousb.
+               smps10_out2, smps10_out1, ldo[1-9], ldoln, ldousb.
 
                Optional sub-node properties:
                ti,warm-reset - maintain voltage during warm reset(boolean)
-               ti,roof-floor - control voltage selection by pin(boolean)
+               ti,roof-floor - This takes as optional argument on platform supporting
+               the rail from desired external control. If there is no argument then
+               it will be assume that it is controlled by NSLEEP pin.
+               The valid value for external pins are:
+                        ENABLE1 then 1,
+                        ENABLE2 then 2 or
+                        NSLEEP then 3.
                ti,mode-sleep - mode to adopt in pmic sleep 0 - off, 1 - auto,
                2 - eco, 3 - forced pwm
                ti,smps-range - OTP has the wrong range set for the hardware so override
@@ -61,7 +67,7 @@ pmic {
                         regulator-always-on;
                         regulator-boot-on;
                         ti,warm-reset;
-                        ti,roof-floor;
+                        ti,roof-floor = <1>; /* ENABLE1 control */
                         ti,mode-sleep = <0>;
                         ti,smps-range = <1>;
                 };
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index 2bd8f0978765..e2c7f1e7251a 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -14,6 +14,11 @@ Optional properties:
 - regulator-ramp-delay: ramp delay for regulator(in uV/uS)
   For hardwares which support disabling ramp rate, it should be explicitly
   intialised to zero (regulator-ramp-delay = <0>) for disabling ramp delay.
+- regulator-enable-ramp-delay: The time taken, in microseconds, for the supply
+  rail to reach the target voltage, plus/minus whatever tolerance the board
+  design requires. This property describes the total system ramp time
+  required due to the combination of internal ramping of the regulator itself,
+  and board design issues such as trace capacitance and load on the supply.
 
 Deprecated properties:
 - regulator-compatible: If a regulator chip contains multiple
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt
index fcb34a5697ea..3d9c2a766230 100644
--- a/Documentation/driver-model/devres.txt
+++ b/Documentation/driver-model/devres.txt
@@ -283,6 +283,7 @@ REGULATOR
   devm_regulator_get()
   devm_regulator_put()
   devm_regulator_bulk_get()
+  devm_regulator_register()
 
 CLOCK
   devm_clk_get()
diff --git a/MAINTAINERS b/MAINTAINERS
index 8a0cbf3cf2c8..a7c34ef3509d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -237,11 +237,11 @@ F:	drivers/platform/x86/acer-wmi.c
 
 ACPI
 M:      Len Brown <lenb@kernel.org>
-M:      Rafael J. Wysocki <rjw@sisk.pl>
+M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
-Q:      http://patchwork.kernel.org/project/linux-acpi/list/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
+W:      https://01.org/linux-acpi
+Q:      https://patchwork.kernel.org/project/linux-acpi/list/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 S:      Supported
 F:      drivers/acpi/
 F:      drivers/pnp/pnpacpi/
@@ -256,21 +256,21 @@ F:	drivers/pci/*/*/*acpi*
 ACPI FAN DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
+W:      https://01.org/linux-acpi
 S:      Supported
 F:      drivers/acpi/fan.c
 
 ACPI THERMAL DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
+W:      https://01.org/linux-acpi
 S:      Supported
 F:      drivers/acpi/*thermal*
 
 ACPI VIDEO DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
+W:      https://01.org/linux-acpi
 S:      Supported
 F:      drivers/acpi/video.c
 
@@ -2300,7 +2300,7 @@ S:	Maintained
 F:      drivers/net/ethernet/ti/cpmac.c
 
 CPU FREQUENCY DRIVERS
-M:      Rafael J. Wysocki <rjw@sisk.pl>
+M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 M:      Viresh Kumar <viresh.kumar@linaro.org>
 L:      cpufreq@vger.kernel.org
 L:      linux-pm@vger.kernel.org
@@ -2331,7 +2331,7 @@ S:      Maintained
 F:      drivers/cpuidle/cpuidle-big_little.c
 
 CPUIDLE DRIVERS
-M:      Rafael J. Wysocki <rjw@sisk.pl>
+M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 M:      Daniel Lezcano <daniel.lezcano@linaro.org>
 L:      linux-pm@vger.kernel.org
 S:      Maintained
@@ -3553,7 +3553,7 @@ F:	fs/freevxfs/
 
 FREEZER
 M:      Pavel Machek <pavel@ucw.cz>
-M:      "Rafael J. Wysocki" <rjw@sisk.pl>
+M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      Documentation/power/freezing-of-tasks.txt
@@ -3624,6 +3624,12 @@ L:	linux-scsi@vger.kernel.org
 S:      Odd Fixes (e.g., new signatures)
 F:      drivers/scsi/fdomain.*
 
+GCOV BASED KERNEL PROFILING
+M:      Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+S:      Maintained
+F:      kernel/gcov/
+F:      Documentation/gcov.txt
+
 GDT SCSI DISK ARRAY CONTROLLER DRIVER
 M:      Achim Leubner <achim_leubner@adaptec.com>
 L:      linux-scsi@vger.kernel.org
@@ -3889,7 +3895,7 @@ F:	drivers/video/hgafb.c
 
 HIBERNATION (aka Software Suspend, aka swsusp)
 M:      Pavel Machek <pavel@ucw.cz>
-M:      "Rafael J. Wysocki" <rjw@sisk.pl>
+M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      arch/x86/power/
@@ -4339,7 +4345,7 @@ F:	drivers/video/i810/
 INTEL MENLOW THERMAL DRIVER
 M:      Sujith Thomas <sujith.thomas@intel.com>
 L:      platform-driver-x86@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
+W:      https://01.org/linux-acpi
 S:      Supported
 F:      drivers/platform/x86/intel_menlow.c
 
@@ -8095,7 +8101,7 @@ F:	drivers/sh/
 SUSPEND TO RAM
 M:      Len Brown <len.brown@intel.com>
 M:      Pavel Machek <pavel@ucw.cz>
-M:      "Rafael J. Wysocki" <rjw@sisk.pl>
+M:      "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      Documentation/power/
diff --git a/Makefile b/Makefile
index deec08b7612b..126321d2e6ad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 12
 SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
 NAME = One Giant Leap for Frogkind
 
 # *DOCUMENTATION*
diff --git a/arch/arm/common/mcpm_entry.c b/arch/arm/common/mcpm_entry.c
index 370236dd1a03..990250965f2c 100644
--- a/arch/arm/common/mcpm_entry.c
+++ b/arch/arm/common/mcpm_entry.c
@@ -51,7 +51,8 @@ void mcpm_cpu_power_down(void)
 {
         phys_reset_t phys_reset;
 
-        BUG_ON(!platform_ops);
+        if (WARN_ON_ONCE(!platform_ops || !platform_ops->power_down))
+                return;
         BUG_ON(!irqs_disabled());
 
         /*
@@ -93,7 +94,8 @@ void mcpm_cpu_suspend(u64 expected_residency)
 {
         phys_reset_t phys_reset;
 
-        BUG_ON(!platform_ops);
+        if (WARN_ON_ONCE(!platform_ops || !platform_ops->suspend))
+                return;
         BUG_ON(!irqs_disabled());
 
         /* Very similar to mcpm_cpu_power_down() */
diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c
index d56c932580eb..025f6ce38596 100644
--- a/arch/arm/common/sharpsl_param.c
+++ b/arch/arm/common/sharpsl_param.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <asm/mach/sharpsl_param.h>
+#include <asm/memory.h>
 
 /*
  * Certain hardware parameters determined at the time of device manufacture,
@@ -25,8 +26,10 @@
  */
 #ifdef CONFIG_ARCH_SA1100
 #define PARAM_BASE      0xe8ffc000
+#define param_start(x)  (void *)(x)
 #else
 #define PARAM_BASE      0xa0000a00
+#define param_start(x)  __va(x)
 #endif
 #define MAGIC_CHG(a,b,c,d) ( ( d << 24 ) | ( c << 16 )  | ( b << 8 ) | a )
 
@@ -41,7 +44,7 @@ EXPORT_SYMBOL(sharpsl_param);
 
 void sharpsl_save_param(void)
 {
-        memcpy(&sharpsl_param, (void *)PARAM_BASE, sizeof(struct sharpsl_param_info));
+        memcpy(&sharpsl_param, param_start(PARAM_BASE), sizeof(struct sharpsl_param_info));
 
         if (sharpsl_param.comadj_keyword != COMADJ_MAGIC)
                 sharpsl_param.comadj=-1;
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index d3db39860b9c..59ceae8f3c95 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -31,5 +31,4 @@ generic-y += termbits.h
 generic-y += termios.h
 generic-y += timex.h
 generic-y += trace_clock.h
-generic-y += types.h
 generic-y += unaligned.h
diff --git a/arch/arm/include/asm/mcpm.h b/arch/arm/include/asm/mcpm.h
index 0f7b7620e9a5..fc82a88f5b69 100644
--- a/arch/arm/include/asm/mcpm.h
+++ b/arch/arm/include/asm/mcpm.h
@@ -76,8 +76,11 @@ int mcpm_cpu_power_up(unsigned int cpu, unsigned int cluster);
  *
  * This must be called with interrupts disabled.
  *
- * This does not return.  Re-entry in the kernel is expected via
- * mcpm_entry_point.
+ * On success this does not return.  Re-entry in the kernel is expected
+ * via mcpm_entry_point.
+ *
+ * This will return if mcpm_platform_register() has not been called
+ * previously in which case the caller should take appropriate action.
  */
 void mcpm_cpu_power_down(void);
 
@@ -98,8 +101,11 @@ void mcpm_cpu_power_down(void);
  *
  * This must be called with interrupts disabled.
  *
- * This does not return.  Re-entry in the kernel is expected via
- * mcpm_entry_point.
+ * On success this does not return.  Re-entry in the kernel is expected
+ * via mcpm_entry_point.
+ *
+ * This will return if mcpm_platform_register() has not been called
+ * previously in which case the caller should take appropriate action.
  */
 void mcpm_cpu_suspend(u64 expected_residency);
 
diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h
index f1d96d4e8092..73ddd7239b33 100644
--- a/arch/arm/include/asm/syscall.h
+++ b/arch/arm/include/asm/syscall.h
@@ -57,6 +57,9 @@ static inline void syscall_get_arguments(struct task_struct *task,
                                          unsigned int i, unsigned int n,
                                          unsigned long *args)
 {
+        if (n == 0)
+                return;
+
         if (i + n > SYSCALL_MAX_ARGS) {
                 unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i;
                 unsigned int n_bad = n + i - SYSCALL_MAX_ARGS;
@@ -81,6 +84,9 @@ static inline void syscall_set_arguments(struct task_struct *task,
                                          unsigned int i, unsigned int n,
                                          const unsigned long *args)
 {
+        if (n == 0)
+                return;
+
         if (i + n > SYSCALL_MAX_ARGS) {
                 pr_warning("%s called with max args %d, handling only %d\n",
                            __func__, i + n, SYSCALL_MAX_ARGS);
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 2c7cc1e03473..476de57dcef2 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -487,7 +487,26 @@ __fixup_smp:
         mrc     p15, 0, r0, c0, c0, 5   @ read MPIDR
         and     r0, r0, #0xc0000000     @ multiprocessing extensions and
         teq     r0, #0x80000000         @ not part of a uniprocessor system?
-        moveq   pc, lr                  @ yes, assume SMP
+        bne    __fixup_smp_on_up        @ no, assume UP
+
+        @ Core indicates it is SMP. Check for Aegis SOC where a single
+        @ Cortex-A9 CPU is present but SMP operations fault.
+        mov     r4, #0x41000000
+        orr     r4, r4, #0x0000c000
+        orr     r4, r4, #0x00000090
+        teq     r3, r4                  @ Check for ARM Cortex-A9
+        movne   pc, lr                  @ Not ARM Cortex-A9,
+
+        @ If a future SoC *does* use 0x0 as the PERIPH_BASE, then the
+        @ below address check will need to be #ifdef'd or equivalent
+        @ for the Aegis platform.
+        mrc     p15, 4, r0, c15, c0     @ get SCU base address
+        teq     r0, #0x0                @ '0' on actual UP A9 hardware
+        beq     __fixup_smp_on_up       @ So its an A9 UP
+        ldr     r0, [r0, #4]            @ read SCU Config
+        and     r0, r0, #0x3            @ number of CPUs
+        teq     r0, #0x0                @ is 1?
+        movne   pc, lr
 
 __fixup_smp_on_up:
         adr     r0, 1f
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index eb8e5a1aca42..f27ca3b89f4c 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -310,10 +310,6 @@ static struct regulator_consumer_supply wallvdd_consumers[] = {
 
         REGULATOR_SUPPLY("SPKVDDL", "spi0.1"),
         REGULATOR_SUPPLY("SPKVDDR", "spi0.1"),
-        REGULATOR_SUPPLY("SPKVDDL", "wm5102-codec"),
-        REGULATOR_SUPPLY("SPKVDDR", "wm5102-codec"),
-        REGULATOR_SUPPLY("SPKVDDL", "wm5110-codec"),
-        REGULATOR_SUPPLY("SPKVDDR", "wm5110-codec"),
 
         REGULATOR_SUPPLY("DC1VDD", "0-0034"),
         REGULATOR_SUPPLY("DC2VDD", "0-0034"),
@@ -653,14 +649,6 @@ static struct regulator_consumer_supply pvdd_1v8_consumers[] = {
         REGULATOR_SUPPLY("DBVDD3", "spi0.1"),
         REGULATOR_SUPPLY("LDOVDD", "spi0.1"),
         REGULATOR_SUPPLY("CPVDD", "spi0.1"),
-
-        REGULATOR_SUPPLY("DBVDD2", "wm5102-codec"),
-        REGULATOR_SUPPLY("DBVDD3", "wm5102-codec"),
-        REGULATOR_SUPPLY("CPVDD", "wm5102-codec"),
-
-        REGULATOR_SUPPLY("DBVDD2", "wm5110-codec"),
-        REGULATOR_SUPPLY("DBVDD3", "wm5110-codec"),
-        REGULATOR_SUPPLY("CPVDD", "wm5110-codec"),
 };
 
 static struct regulator_init_data pvdd_1v8 = {
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index f5e1a8471714..1272ed202dde 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1232,7 +1232,8 @@ __iommu_create_mapping(struct device *dev, struct page **pages, size_t size)
                                 break;
 
                 len = (j - i) << PAGE_SHIFT;
-                ret = iommu_map(mapping->domain, iova, phys, len, 0);
+                ret = iommu_map(mapping->domain, iova, phys, len,
+                                IOMMU_READ|IOMMU_WRITE);
                 if (ret < 0)
                         goto fail;
                 iova += len;
@@ -1431,6 +1432,27 @@ static int arm_iommu_get_sgtable(struct device *dev, struct sg_table *sgt,
                                          GFP_KERNEL);
 }
 
+static int __dma_direction_to_prot(enum dma_data_direction dir)
+{
+        int prot;
+
+        switch (dir) {
+        case DMA_BIDIRECTIONAL:
+                prot = IOMMU_READ | IOMMU_WRITE;
+                break;
+        case DMA_TO_DEVICE:
+                prot = IOMMU_READ;
+                break;
+        case DMA_FROM_DEVICE:
+                prot = IOMMU_WRITE;
+                break;
+        default:
+                prot = 0;
+        }
+
+        return prot;
+}
+
 /*
  * Map a part of the scatter-gather list into contiguous io address space
  */
@@ -1444,6 +1466,7 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg,
         int ret = 0;
         unsigned int count;
         struct scatterlist *s;
+        int prot;
 
         size = PAGE_ALIGN(size);
         *handle = DMA_ERROR_CODE;
@@ -1460,7 +1483,9 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg,
                         !dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs))
                         __dma_page_cpu_to_dev(sg_page(s), s->offset, s->length, dir);
 
-                ret = iommu_map(mapping->domain, iova, phys, len, 0);
+                prot = __dma_direction_to_prot(dir);
+
+                ret = iommu_map(mapping->domain, iova, phys, len, prot);
                 if (ret < 0)
                         goto fail;
                 count += len >> PAGE_SHIFT;
@@ -1665,19 +1690,7 @@ static dma_addr_t arm_coherent_iommu_map_page(struct device *dev, struct page *p
         if (dma_addr == DMA_ERROR_CODE)
                 return dma_addr;
 
-        switch (dir) {
-        case DMA_BIDIRECTIONAL:
-                prot = IOMMU_READ | IOMMU_WRITE;
-                break;
-        case DMA_TO_DEVICE:
-                prot = IOMMU_READ;
-                break;
-        case DMA_FROM_DEVICE:
-                prot = IOMMU_WRITE;
-                break;
-        default:
-                prot = 0;
-        }
+        prot = __dma_direction_to_prot(dir);
 
         ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len, prot);
         if (ret < 0)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index febaee7ca57b..18ec4c504abf 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -17,7 +17,6 @@
 #include <linux/nodemask.h>
 #include <linux/initrd.h>
 #include <linux/of_fdt.h>
-#include <linux/of_reserved_mem.h>
 #include <linux/highmem.h>
 #include <linux/gfp.h>
 #include <linux/memblock.h>
@@ -379,8 +378,6 @@ void __init arm_memblock_init(struct meminfo *mi,
         if (mdesc->reserve)
                 mdesc->reserve();
 
-        early_init_dt_scan_reserved_mem();
-
         /*
          * reserve memory for DMA contigouos allocations,
          * must come from DMA area inside low memory
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 145d703227bf..f67e839f06c8 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1033,6 +1033,7 @@ config X86_REBOOTFIXUPS
 
 config MICROCODE
         tristate "CPU microcode loading support"
+        depends on CPU_SUP_AMD || CPU_SUP_INTEL
         select FW_LOADER
         ---help---
 
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 1191ac1c9d25..a419814cea57 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -113,7 +113,7 @@ static int __init early_get_pnodeid(void)
                 break;
         case UV3_HUB_PART_NUMBER:
         case UV3_HUB_PART_NUMBER_X:
-                uv_min_hub_revision_id += UV3_HUB_REVISION_BASE - 1;
+                uv_min_hub_revision_id += UV3_HUB_REVISION_BASE;
                 break;
         }
 
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 697b93af02dd..a0e2a8a80c94 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -775,11 +775,22 @@ void __init kvm_spinlock_init(void)
         if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
                 return;
 
-        printk(KERN_INFO "KVM setup paravirtual spinlock\n");
+        pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);
+        pv_lock_ops.unlock_kick = kvm_unlock_kick;
+}
+
+static __init int kvm_spinlock_init_jump(void)
+{
+        if (!kvm_para_available())
+                return 0;
+        if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
+                return 0;
 
         static_key_slow_inc(&paravirt_ticketlocks_enabled);
+        printk(KERN_INFO "KVM setup paravirtual spinlock\n");
 
-        pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);
-        pv_lock_ops.unlock_kick = kvm_unlock_kick;
+        return 0;
 }
+early_initcall(kvm_spinlock_init_jump);
+
 #endif  /* CONFIG_PARAVIRT_SPINLOCKS */
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index d1e4777b4e75..31d04758b76f 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -278,6 +278,15 @@ static void __init xen_smp_prepare_boot_cpu(void)
                    old memory can be recycled */
                 make_lowmem_page_readwrite(xen_initial_gdt);
 
+#ifdef CONFIG_X86_32
+                /*
+                 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
+                 * expects __USER_DS
+                 */
+                loadsegment(ds, __USER_DS);
+                loadsegment(es, __USER_DS);
+#endif
+
                 xen_filter_cpu_maps();
                 xen_setup_vcpu_info_placement();
         }
diff --git a/block/partitions/efi.c b/block/partitions/efi.c
index 1eb09ee5311b..a8287b49d062 100644
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -222,11 +222,16 @@ check_hybrid:
          * the disk size.
          *
          * Hybrid MBRs do not necessarily comply with this.
+         *
+         * Consider a bad value here to be a warning to support dd'ing
+         * an image from a smaller disk to a larger disk.
          */
         if (ret == GPT_MBR_PROTECTIVE) {
                 sz = le32_to_cpu(mbr->partition_record[part].size_in_lba);
                 if (sz != (uint32_t) total_sectors - 1 && sz != 0xFFFFFFFF)
-                        ret = 0;
+                        pr_debug("GPT: mbr size in lba (%u) different than whole disk (%u).\n",
+                                 sz, min_t(uint32_t,
+                                           total_sectors - 1, 0xFFFFFFFF));
         }
 done:
         return ret;
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 22327e6a7236..6efe2ac6902f 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -24,7 +24,7 @@ menuconfig ACPI
           are configured, ACPI is used.
 
           The project home page for the Linux ACPI subsystem is here:
-          <http://www.lesswatts.org/projects/acpi/>
+          <https://01.org/linux-acpi>
 
           Linux support for ACPI is based on Intel Corporation's ACPI
           Component Architecture (ACPI CA).  For more information on the
@@ -123,9 +123,9 @@ config ACPI_BUTTON
         default y
         help
           This driver handles events on the power, sleep, and lid buttons.
-          A daemon reads /proc/acpi/event and perform user-defined actions
-          such as shutting down the system.  This is necessary for
-          software-controlled poweroff.
+          A daemon reads events from input devices or via netlink and
+          performs user-defined actions such as shutting down the system.
+          This is necessary for software-controlled poweroff.
 
           To compile this driver as a module, choose M here:
           the module will be called button.
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 59d3202f6b36..a94383d1f350 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -1025,60 +1025,4 @@ void acpi_dev_pm_detach(struct device *dev, bool power_off)
         }
 }
 EXPORT_SYMBOL_GPL(acpi_dev_pm_detach);
-
-/**
- * acpi_dev_pm_add_dependent - Add physical device depending for PM.
- * @handle: Handle of ACPI device node.
- * @depdev: Device depending on that node for PM.
- */
-void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev)
-{
-        struct acpi_device_physical_node *dep;
-        struct acpi_device *adev;
-
-        if (!depdev || acpi_bus_get_device(handle, &adev))
-                return;
-
-        mutex_lock(&adev->physical_node_lock);
-
-        list_for_each_entry(dep, &adev->power_dependent, node)
-                if (dep->dev == depdev)
-                        goto out;
-
-        dep = kzalloc(sizeof(*dep), GFP_KERNEL);
-        if (dep) {
-                dep->dev = depdev;
-                list_add_tail(&dep->node, &adev->power_dependent);
-        }
-
- out:
-        mutex_unlock(&adev->physical_node_lock);
-}
-EXPORT_SYMBOL_GPL(acpi_dev_pm_add_dependent);
-
-/**
- * acpi_dev_pm_remove_dependent - Remove physical device depending for PM.
- * @handle: Handle of ACPI device node.
- * @depdev: Device depending on that node for PM.
- */
-void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev)
-{
-        struct acpi_device_physical_node *dep;
-        struct acpi_device *adev;
-
-        if (!depdev || acpi_bus_get_device(handle, &adev))
-                return;
-
-        mutex_lock(&adev->physical_node_lock);
-
-        list_for_each_entry(dep, &adev->power_dependent, node)
-                if (dep->dev == depdev) {
-                        list_del(&dep->node);
-                        kfree(dep);
-                        break;
-                }
-
-        mutex_unlock(&adev->physical_node_lock);
-}
-EXPORT_SYMBOL_GPL(acpi_dev_pm_remove_dependent);
 #endif /* CONFIG_PM */
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 0dbe5cdf3396..c2ad391d8041 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -59,16 +59,9 @@ ACPI_MODULE_NAME("power");
 #define ACPI_POWER_RESOURCE_STATE_ON    0x01
 #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
 
-struct acpi_power_dependent_device {
-        struct list_head node;
-        struct acpi_device *adev;
-        struct work_struct work;
-};
-
 struct acpi_power_resource {
         struct acpi_device device;
         struct list_head list_node;
-        struct list_head dependent;
         char *name;
         u32 system_level;
         u32 order;
@@ -233,32 +226,6 @@ static int acpi_power_get_list_state(struct list_head *list, int *state)
         return 0;
 }
 
-static void acpi_power_resume_dependent(struct work_struct *work)
-{
-        struct acpi_power_dependent_device *dep;
-        struct acpi_device_physical_node *pn;
-        struct acpi_device *adev;
-        int state;
-
-        dep = container_of(work, struct acpi_power_dependent_device, work);
-        adev = dep->adev;
-        if (acpi_power_get_inferred_state(adev, &state))
-                return;
-
-        if (state > ACPI_STATE_D0)
-                return;
-
-        mutex_lock(&adev->physical_node_lock);
-
-        list_for_each_entry(pn, &adev->physical_node_list, node)
-                pm_request_resume(pn->dev);
-
-        list_for_each_entry(pn, &adev->power_dependent, node)
-                pm_request_resume(pn->dev);
-
-        mutex_unlock(&adev->physical_node_lock);
-}
-
 static int __acpi_power_on(struct acpi_power_resource *resource)
 {
         acpi_status status = AE_OK;
@@ -283,14 +250,8 @@ static int acpi_power_on_unlocked(struct acpi_power_resource *resource)
                                   resource->name));
         } else {
                 result = __acpi_power_on(resource);
-                if (result) {
+                if (result)
                         resource->ref_count--;
-                } else {
-                        struct acpi_power_dependent_device *dep;
-
-                        list_for_each_entry(dep, &resource->dependent, node)
-                                schedule_work(&dep->work);
-                }
         }
         return result;
 }
@@ -390,52 +351,6 @@ static int acpi_power_on_list(struct list_head *list)
         return result;
 }
 
-static void acpi_power_add_dependent(struct acpi_power_resource *resource,
-                                     struct acpi_device *adev)
-{
-        struct acpi_power_dependent_device *dep;
-
-        mutex_lock(&resource->resource_lock);
-
-        list_for_each_entry(dep, &resource->dependent, node)
-                if (dep->adev == adev)
-                        goto out;
-
-        dep = kzalloc(sizeof(*dep), GFP_KERNEL);
-        if (!dep)
-                goto out;
-
-        dep->adev = adev;
-        INIT_WORK(&dep->work, acpi_power_resume_dependent);
-        list_add_tail(&dep->node, &resource->dependent);
-
- out:
-        mutex_unlock(&resource->resource_lock);
-}
-
-static void acpi_power_remove_dependent(struct acpi_power_resource *resource,
-                                        struct acpi_device *adev)
-{
-        struct acpi_power_dependent_device *dep;
-        struct work_struct *work = NULL;
-
-        mutex_lock(&resource->resource_lock);
-
-        list_for_each_entry(dep, &resource->dependent, node)
-                if (dep->adev == adev) {
-                        list_del(&dep->node);
-                        work = &dep->work;
-                        break;
-                }
-
-        mutex_unlock(&resource->resource_lock);
-
-        if (work) {
-                cancel_work_sync(work);
-                kfree(dep);
-        }
-}
-
 static struct attribute *attrs[] = {
         NULL,
 };
@@ -524,8 +439,6 @@ static void acpi_power_expose_hide(struct acpi_device *adev,
 
 void acpi_power_add_remove_device(struct acpi_device *adev, bool add)
 {
-        struct acpi_device_power_state *ps;
-        struct acpi_power_resource_entry *entry;
         int state;
 
         if (adev->wakeup.flags.valid)
@@ -535,16 +448,6 @@ void acpi_power_add_remove_device(struct acpi_device *adev, bool add)
         if (!adev->power.flags.power_resources)
                 return;
 
-        ps = &adev->power.states[ACPI_STATE_D0];
-        list_for_each_entry(entry, &ps->resources, node) {
-                struct acpi_power_resource *resource = entry->resource;
-
-                if (add)
-                        acpi_power_add_dependent(resource, adev);
-                else
-                        acpi_power_remove_dependent(resource, adev);
-        }
-
         for (state = ACPI_STATE_D0; state <= ACPI_STATE_D3_HOT; state++)
                 acpi_power_expose_hide(adev,
                                        &adev->power.states[state].resources,
@@ -882,7 +785,6 @@ int acpi_add_power_resource(acpi_handle handle)
         acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER,
                                 ACPI_STA_DEFAULT);
         mutex_init(&resource->resource_lock);
-        INIT_LIST_HEAD(&resource->dependent);
         INIT_LIST_HEAD(&resource->list_node);
         resource->name = device->pnp.bus_id;
         strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
@@ -936,8 +838,10 @@ void acpi_resume_power_resources(void)
                 mutex_lock(&resource->resource_lock);
 
                 result = acpi_power_get_state(resource->device.handle, &state);
-                if (result)
+                if (result) {
+                        mutex_unlock(&resource->resource_lock);
                         continue;
+                }
 
                 if (state == ACPI_POWER_RESOURCE_STATE_OFF
                     && resource->ref_count) {
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 407ad13cac2f..fee8a297c7d9 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -999,7 +999,6 @@ int acpi_device_add(struct acpi_device *device,
         INIT_LIST_HEAD(&device->wakeup_list);
         INIT_LIST_HEAD(&device->physical_node_list);
         mutex_init(&device->physical_node_lock);
-        INIT_LIST_HEAD(&device->power_dependent);
 
         new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL);
         if (!new_bus_id) {
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 4ba8b0405572..ab714d2ad978 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -1035,17 +1035,3 @@ void ata_acpi_on_disable(struct ata_device *dev)
 {
         ata_acpi_clear_gtf(dev);
 }
-
-void ata_scsi_acpi_bind(struct ata_device *dev)
-{
-        acpi_handle handle = ata_dev_acpi_handle(dev);
-        if (handle)
-                acpi_dev_pm_add_dependent(handle, &dev->sdev->sdev_gendev);
-}
-
-void ata_scsi_acpi_unbind(struct ata_device *dev)
-{
-        acpi_handle handle = ata_dev_acpi_handle(dev);
-        if (handle)
-                acpi_dev_pm_remove_dependent(handle, &dev->sdev->sdev_gendev);
-}
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 97a0cef12959..db6dfcfa3e2e 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3679,7 +3679,6 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
                         if (!IS_ERR(sdev)) {
                                 dev->sdev = sdev;
                                 scsi_device_put(sdev);
-                                ata_scsi_acpi_bind(dev);
                         } else {
                                 dev->sdev = NULL;
                         }
@@ -3767,8 +3766,6 @@ static void ata_scsi_remove_dev(struct ata_device *dev)
         struct scsi_device *sdev;
         unsigned long flags;
 
-        ata_scsi_acpi_unbind(dev);
-
         /* Alas, we need to grab scan_mutex to ensure SCSI device
          * state doesn't change underneath us and thus
          * scsi_device_get() always succeeds.  The mutex locking can
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index eeeb77845d48..45b5ab3a95d5 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -121,8 +121,6 @@ extern void ata_acpi_set_state(struct ata_port *ap, pm_message_t state);
 extern void ata_acpi_bind_port(struct ata_port *ap);
 extern void ata_acpi_bind_dev(struct ata_device *dev);
 extern acpi_handle ata_dev_acpi_handle(struct ata_device *dev);
-extern void ata_scsi_acpi_bind(struct ata_device *dev);
-extern void ata_scsi_acpi_unbind(struct ata_device *dev);
 #else
 static inline void ata_acpi_dissociate(struct ata_host *host) { }
 static inline int ata_acpi_on_suspend(struct ata_port *ap) { return 0; }
@@ -133,8 +131,6 @@ static inline void ata_acpi_set_state(struct ata_port *ap,
                                       pm_message_t state) { }
 static inline void ata_acpi_bind_port(struct ata_port *ap) {}
 static inline void ata_acpi_bind_dev(struct ata_device *dev) {}
-static inline void ata_scsi_acpi_bind(struct ata_device *dev) {}
-static inline void ata_scsi_acpi_unbind(struct ata_device *dev) {}
 #endif
 
 /* libata-scsi.c */
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 9e59f6535c44..bece691cb5d9 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -333,8 +333,10 @@ store_mem_state(struct device *dev,
                 online_type = ONLINE_KEEP;
         else if (!strncmp(buf, "offline", min_t(int, count, 7)))
                 online_type = -1;
-        else
-                return -EINVAL;
+        else {
+                ret = -EINVAL;
+                goto err;
+        }
 
         switch (online_type) {
         case ONLINE_KERNEL:
@@ -357,6 +359,7 @@ store_mem_state(struct device *dev,
                 ret = -EINVAL; /* should never happen */
         }
 
+err:
         unlock_device_hotplug();
 
         if (ret)
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index 06189e55b4e5..94c280d36e8b 100644
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
+#include <xen/xen.h>
 #include <xen/events.h>
 #include <xen/interface/io/tpmif.h>
 #include <xen/grant_table.h>
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 32b3479a2405..badf6206b2b2 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -383,6 +383,7 @@ static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max)
 static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
 {
         int max_perf, min_perf;
+        u64 val;
 
         intel_pstate_get_min_max(cpu, &min_perf, &max_perf);
 
@@ -394,11 +395,11 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
         trace_cpu_frequency(pstate * 100000, cpu->cpu);
 
         cpu->pstate.current_pstate = pstate;
+        val = pstate << 8;
         if (limits.no_turbo)
-                wrmsrl(MSR_IA32_PERF_CTL, BIT(32) | (pstate << 8));
-        else
-                wrmsrl(MSR_IA32_PERF_CTL, pstate << 8);
+                val |= (u64)1 << 32;
 
+        wrmsrl(MSR_IA32_PERF_CTL, val);
 }
 
 static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps)
@@ -637,8 +638,8 @@ static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)
 
 static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
 {
-        int rc, min_pstate, max_pstate;
         struct cpudata *cpu;
+        int rc;
 
         rc = intel_pstate_init_cpu(policy->cpu);
         if (rc)
@@ -652,9 +653,8 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
         else
                 policy->policy = CPUFREQ_POLICY_POWERSAVE;
 
-        intel_pstate_get_min_max(cpu, &min_pstate, &max_pstate);
-        policy->min = min_pstate * 100000;
-        policy->max = max_pstate * 100000;
+        policy->min = cpu->pstate.min_pstate * 100000;
+        policy->max = cpu->pstate.turbo_pstate * 100000;
 
         /* cpuinfo and default policy values */
         policy->cpuinfo.min_freq = cpu->pstate.min_pstate * 100000;
diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c
index 8a72b0c555f8..15631f92ab7d 100644
--- a/drivers/cpufreq/s3c64xx-cpufreq.c
+++ b/drivers/cpufreq/s3c64xx-cpufreq.c
@@ -166,7 +166,7 @@ static void __init s3c64xx_cpufreq_config_regulator(void)
                 if (freq->frequency == CPUFREQ_ENTRY_INVALID)
                         continue;
 
-                dvfs = &s3c64xx_dvfs_table[freq->index];
+                dvfs = &s3c64xx_dvfs_table[freq->driver_data];
                 found = 0;
 
                 for (i = 0; i < count; i++) {
diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index 2d9ca6055e5e..41b5913ddabe 100644
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -248,14 +248,15 @@ static void lp_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
         struct lp_gpio *lg = irq_data_get_irq_handler_data(data);
         struct irq_chip *chip = irq_data_get_irq_chip(data);
         u32 base, pin, mask;
-        unsigned long reg, pending;
+        unsigned long reg, ena, pending;
         unsigned virq;
 
         /* check from GPIO controller which pin triggered the interrupt */
         for (base = 0; base < lg->chip.ngpio; base += 32) {
                 reg = lp_gpio_reg(&lg->chip, base, LP_INT_STAT);
+                ena = lp_gpio_reg(&lg->chip, base, LP_INT_ENABLE);
 
-                while ((pending = inl(reg))) {
+                while ((pending = (inl(reg) & inl(ena)))) {
                         pin = __ffs(pending);
                         mask = BIT(pin);
                         /* Clear before handling so we don't lose an edge */
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 86ef3461ec06..0dee0e0c247a 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -136,7 +136,7 @@ static struct gpio_desc *gpio_to_desc(unsigned gpio)
  */
 static int desc_to_gpio(const struct gpio_desc *desc)
 {
-        return desc->chip->base + gpio_chip_hwgpio(desc);
+        return desc - &gpio_desc[0];
 }
 
 
@@ -1398,7 +1398,7 @@ static int gpiod_request(struct gpio_desc *desc, const char *label)
         int                     status = -EPROBE_DEFER;
         unsigned long           flags;
 
-        if (!desc || !desc->chip) {
+        if (!desc) {
                 pr_warn("%s: invalid GPIO\n", __func__);
                 return -EINVAL;
         }
@@ -1406,6 +1406,8 @@ static int gpiod_request(struct gpio_desc *desc, const char *label)
         spin_lock_irqsave(&gpio_lock, flags);
 
         chip = desc->chip;
+        if (chip == NULL)
+                goto done;
 
         if (!try_module_get(chip->owner))
                 goto done;
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index a7b30be86ae0..52605c0ea3a6 100644
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -525,8 +525,10 @@ static int adf4350_probe(struct spi_device *spi)
         }
 
         indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
-        if (indio_dev == NULL)
-                return -ENOMEM;
+        if (indio_dev == NULL) {
+                ret =  -ENOMEM;
+                goto error_disable_clk;
+        }
 
         st = iio_priv(indio_dev);
 
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 2710f7245c3b..2db7dcd826b9 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -477,6 +477,9 @@ void iio_disable_all_buffers(struct iio_dev *indio_dev)
         indio_dev->currentmode = INDIO_DIRECT_MODE;
         if (indio_dev->setup_ops->postdisable)
                 indio_dev->setup_ops->postdisable(indio_dev);
+
+        if (indio_dev->available_scan_masks == NULL)
+                kfree(indio_dev->active_scan_mask);
 }
 
 int iio_update_buffers(struct iio_dev *indio_dev,
diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c
index d5d1929753e4..cedda25232be 100644
--- a/drivers/infiniband/hw/amso1100/c2_ae.c
+++ b/drivers/infiniband/hw/amso1100/c2_ae.c
@@ -141,7 +141,7 @@ static const char *to_qp_state_str(int state)
                 return "C2_QP_STATE_ERROR";
         default:
                 return "<invalid QP state>";
-        };
+        }
 }
 
 void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 3f831de9a4d8..b1a6cb3a2809 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -164,6 +164,7 @@ int mlx5_vector2eqn(struct mlx5_ib_dev *dev, int vector, int *eqn, int *irqn)
 static int alloc_comp_eqs(struct mlx5_ib_dev *dev)
 {
         struct mlx5_eq_table *table = &dev->mdev.priv.eq_table;
+        char name[MLX5_MAX_EQ_NAME];
         struct mlx5_eq *eq, *n;
         int ncomp_vec;
         int nent;
@@ -180,11 +181,10 @@ static int alloc_comp_eqs(struct mlx5_ib_dev *dev)
                         goto clean;
                 }
 
-                snprintf(eq->name, MLX5_MAX_EQ_NAME, "mlx5_comp%d", i);
+                snprintf(name, MLX5_MAX_EQ_NAME, "mlx5_comp%d", i);
                 err = mlx5_create_map_eq(&dev->mdev, eq,
                                          i + MLX5_EQ_VEC_COMP_BASE, nent, 0,
-                                         eq->name,
-                                         &dev->mdev.priv.uuari.uars[0]);
+                                         name, &dev->mdev.priv.uuari.uars[0]);
                 if (err) {
                         kfree(eq);
                         goto clean;
@@ -301,9 +301,8 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
         props->max_srq_sge         = max_rq_sg - 1;
         props->max_fast_reg_page_list_len = (unsigned int)-1;
         props->local_ca_ack_delay  = dev->mdev.caps.local_ca_ack_delay;
-        props->atomic_cap          = dev->mdev.caps.flags & MLX5_DEV_CAP_FLAG_ATOMIC ?
-                IB_ATOMIC_HCA : IB_ATOMIC_NONE;
-        props->masked_atomic_cap   = IB_ATOMIC_HCA;
+        props->atomic_cap          = IB_ATOMIC_NONE;
+        props->masked_atomic_cap   = IB_ATOMIC_NONE;
         props->max_pkeys           = be16_to_cpup((__be16 *)(out_mad->data + 28));
         props->max_mcast_grp       = 1 << dev->mdev.caps.log_max_mcg;
         props->max_mcast_qp_attach = dev->mdev.caps.max_qp_mcg;
@@ -1006,6 +1005,11 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, enum mlx5_dev_event event,
         ibev.device           = &ibdev->ib_dev;
         ibev.element.port_num = port;
 
+        if (port < 1 || port > ibdev->num_ports) {
+                mlx5_ib_warn(ibdev, "warning: event on port %d\n", port);
+                return;
+        }
+
         if (ibdev->ib_active)
                 ib_dispatch_event(&ibev);
 }
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index bd41df95b6f0..3453580b1eb2 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -42,6 +42,10 @@ enum {
         DEF_CACHE_SIZE  = 10,
 };
 
+enum {
+        MLX5_UMR_ALIGN  = 2048
+};
+
 static __be64 *mr_align(__be64 *ptr, int align)
 {
         unsigned long mask = align - 1;
@@ -61,13 +65,11 @@ static int order2idx(struct mlx5_ib_dev *dev, int order)
 
 static int add_keys(struct mlx5_ib_dev *dev, int c, int num)
 {
-        struct device *ddev = dev->ib_dev.dma_device;
         struct mlx5_mr_cache *cache = &dev->cache;
         struct mlx5_cache_ent *ent = &cache->ent[c];
         struct mlx5_create_mkey_mbox_in *in;
         struct mlx5_ib_mr *mr;
         int npages = 1 << ent->order;
-        int size = sizeof(u64) * npages;
         int err = 0;
         int i;
 
@@ -83,21 +85,6 @@ static int add_keys(struct mlx5_ib_dev *dev, int c, int num)
                 }
                 mr->order = ent->order;
                 mr->umred = 1;
-                mr->pas = kmalloc(size + 0x3f, GFP_KERNEL);
-                if (!mr->pas) {
-                        kfree(mr);
-                        err = -ENOMEM;
-                        goto out;
-                }
-                mr->dma = dma_map_single(ddev, mr_align(mr->pas, 0x40), size,
-                                         DMA_TO_DEVICE);
-                if (dma_mapping_error(ddev, mr->dma)) {
-                        kfree(mr->pas);
-                        kfree(mr);
-                        err = -ENOMEM;
-                        goto out;
-                }
-
                 in->seg.status = 1 << 6;
                 in->seg.xlt_oct_size = cpu_to_be32((npages + 1) / 2);
                 in->seg.qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);
@@ -108,8 +95,6 @@ static int add_keys(struct mlx5_ib_dev *dev, int c, int num)
                                             sizeof(*in));
                 if (err) {
                         mlx5_ib_warn(dev, "create mkey failed %d\n", err);
-                        dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
-                        kfree(mr->pas);
                         kfree(mr);
                         goto out;
                 }
@@ -129,11 +114,9 @@ out:
 
 static void remove_keys(struct mlx5_ib_dev *dev, int c, int num)
 {
-        struct device *ddev = dev->ib_dev.dma_device;
         struct mlx5_mr_cache *cache = &dev->cache;
         struct mlx5_cache_ent *ent = &cache->ent[c];
         struct mlx5_ib_mr *mr;
-        int size;
         int err;
         int i;
 
@@ -149,14 +132,10 @@ static void remove_keys(struct mlx5_ib_dev *dev, int c, int num)
                 ent->size--;
                 spin_unlock(&ent->lock);
                 err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr);
-                if (err) {
+                if (err)
                         mlx5_ib_warn(dev, "failed destroy mkey\n");
-                } else {
-                        size = ALIGN(sizeof(u64) * (1 << mr->order), 0x40);
-                        dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
-                        kfree(mr->pas);
+                else
                         kfree(mr);
-                }
         }
 }
 
@@ -408,13 +387,12 @@ static void free_cached_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr)
 
 static void clean_keys(struct mlx5_ib_dev *dev, int c)
 {
-        struct device *ddev = dev->ib_dev.dma_device;
         struct mlx5_mr_cache *cache = &dev->cache;
         struct mlx5_cache_ent *ent = &cache->ent[c];
         struct mlx5_ib_mr *mr;
-        int size;
         int err;
 
+        cancel_delayed_work(&ent->dwork);
         while (1) {
                 spin_lock(&ent->lock);
                 if (list_empty(&ent->head)) {
@@ -427,14 +405,10 @@ static void clean_keys(struct mlx5_ib_dev *dev, int c)
                 ent->size--;
                 spin_unlock(&ent->lock);
                 err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr);
-                if (err) {
+                if (err)
                         mlx5_ib_warn(dev, "failed destroy mkey\n");
-                } else {
-                        size = ALIGN(sizeof(u64) * (1 << mr->order), 0x40);
-                        dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
-                        kfree(mr->pas);
+                else
                         kfree(mr);
-                }
         }
 }
 
@@ -540,13 +514,15 @@ int mlx5_mr_cache_cleanup(struct mlx5_ib_dev *dev)
         int i;
 
         dev->cache.stopped = 1;
-        destroy_workqueue(dev->cache.wq);
+        flush_workqueue(dev->cache.wq);
 
         mlx5_mr_cache_debugfs_cleanup(dev);
 
         for (i = 0; i < MAX_MR_CACHE_ENTRIES; i++)
                 clean_keys(dev, i);
 
+        destroy_workqueue(dev->cache.wq);
+
         return 0;
 }
 
@@ -675,10 +651,12 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
                                   int page_shift, int order, int access_flags)
 {
         struct mlx5_ib_dev *dev = to_mdev(pd->device);
+        struct device *ddev = dev->ib_dev.dma_device;
         struct umr_common *umrc = &dev->umrc;
         struct ib_send_wr wr, *bad;
         struct mlx5_ib_mr *mr;
         struct ib_sge sg;
+        int size = sizeof(u64) * npages;
         int err;
         int i;
 
@@ -697,7 +675,22 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
         if (!mr)
                 return ERR_PTR(-EAGAIN);
 
-        mlx5_ib_populate_pas(dev, umem, page_shift, mr_align(mr->pas, 0x40), 1);
+        mr->pas = kmalloc(size + MLX5_UMR_ALIGN - 1, GFP_KERNEL);
+        if (!mr->pas) {
+                err = -ENOMEM;
+                goto error;
+        }
+
+        mlx5_ib_populate_pas(dev, umem, page_shift,
+                             mr_align(mr->pas, MLX5_UMR_ALIGN), 1);
+
+        mr->dma = dma_map_single(ddev, mr_align(mr->pas, MLX5_UMR_ALIGN), size,
+                                 DMA_TO_DEVICE);
+        if (dma_mapping_error(ddev, mr->dma)) {
+                kfree(mr->pas);
+                err = -ENOMEM;
+                goto error;
+        }
 
         memset(&wr, 0, sizeof(wr));
         wr.wr_id = (u64)(unsigned long)mr;
@@ -718,6 +711,9 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
         wait_for_completion(&mr->done);
         up(&umrc->sem);
 
+        dma_unmap_single(ddev, mr->dma, size, DMA_TO_DEVICE);
+        kfree(mr->pas);
+
         if (mr->status != IB_WC_SUCCESS) {
                 mlx5_ib_warn(dev, "reg umr failed\n");
                 err = -EFAULT;
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 045f8cdbd303..5659ea880741 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -203,7 +203,7 @@ static int sq_overhead(enum ib_qp_type qp_type)
 
         switch (qp_type) {
         case IB_QPT_XRC_INI:
-                size = sizeof(struct mlx5_wqe_xrc_seg);
+                size += sizeof(struct mlx5_wqe_xrc_seg);
                 /* fall through */
         case IB_QPT_RC:
                 size += sizeof(struct mlx5_wqe_ctrl_seg) +
@@ -211,20 +211,23 @@ static int sq_overhead(enum ib_qp_type qp_type)
                         sizeof(struct mlx5_wqe_raddr_seg);
                 break;
 
+        case IB_QPT_XRC_TGT:
+                return 0;
+
         case IB_QPT_UC:
-                size = sizeof(struct mlx5_wqe_ctrl_seg) +
+                size += sizeof(struct mlx5_wqe_ctrl_seg) +
                         sizeof(struct mlx5_wqe_raddr_seg);
                 break;
 
         case IB_QPT_UD:
         case IB_QPT_SMI:
         case IB_QPT_GSI:
-                size = sizeof(struct mlx5_wqe_ctrl_seg) +
+                size += sizeof(struct mlx5_wqe_ctrl_seg) +
                         sizeof(struct mlx5_wqe_datagram_seg);
                 break;
 
         case MLX5_IB_QPT_REG_UMR:
-                size = sizeof(struct mlx5_wqe_ctrl_seg) +
+                size += sizeof(struct mlx5_wqe_ctrl_seg) +
                         sizeof(struct mlx5_wqe_umr_ctrl_seg) +
                         sizeof(struct mlx5_mkey_seg);
                 break;
@@ -270,7 +273,8 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
                 return wqe_size;
 
         if (wqe_size > dev->mdev.caps.max_sq_desc_sz) {
-                mlx5_ib_dbg(dev, "\n");
+                mlx5_ib_dbg(dev, "wqe_size(%d) > max_sq_desc_sz(%d)\n",
+                            wqe_size, dev->mdev.caps.max_sq_desc_sz);
                 return -EINVAL;
         }
 
@@ -280,9 +284,15 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
 
         wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size);
         qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB;
+        if (qp->sq.wqe_cnt > dev->mdev.caps.max_wqes) {
+                mlx5_ib_dbg(dev, "wqe count(%d) exceeds limits(%d)\n",
+                            qp->sq.wqe_cnt, dev->mdev.caps.max_wqes);
+                return -ENOMEM;
+        }
         qp->sq.wqe_shift = ilog2(MLX5_SEND_WQE_BB);
         qp->sq.max_gs = attr->cap.max_send_sge;
-        qp->sq.max_post = 1 << ilog2(wq_size / wqe_size);
+        qp->sq.max_post = wq_size / wqe_size;
+        attr->cap.max_send_wr = qp->sq.max_post;
 
         return wq_size;
 }
@@ -1280,6 +1290,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q
                                           MLX5_QP_OPTPAR_Q_KEY,
                         [MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_PKEY_INDEX    |
                                            MLX5_QP_OPTPAR_Q_KEY,
+                        [MLX5_QP_ST_XRC] = MLX5_QP_OPTPAR_ALT_ADDR_PATH |
+                                          MLX5_QP_OPTPAR_RRE            |
+                                          MLX5_QP_OPTPAR_RAE            |
+                                          MLX5_QP_OPTPAR_RWE            |
+                                          MLX5_QP_OPTPAR_PKEY_INDEX,
                 },
         },
         [MLX5_QP_STATE_RTR] = {
@@ -1314,6 +1329,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q
                 [MLX5_QP_STATE_RTS] = {
                         [MLX5_QP_ST_UD]  = MLX5_QP_OPTPAR_Q_KEY,
                         [MLX5_QP_ST_MLX] = MLX5_QP_OPTPAR_Q_KEY,
+                        [MLX5_QP_ST_UC]  = MLX5_QP_OPTPAR_RWE,
+                        [MLX5_QP_ST_RC]  = MLX5_QP_OPTPAR_RNR_TIMEOUT   |
+                                           MLX5_QP_OPTPAR_RWE           |
+                                           MLX5_QP_OPTPAR_RAE           |
+                                           MLX5_QP_OPTPAR_RRE,
                 },
         },
 };
@@ -1651,29 +1671,6 @@ static __always_inline void set_raddr_seg(struct mlx5_wqe_raddr_seg *rseg,
         rseg->reserved = 0;
 }
 
-static void set_atomic_seg(struct mlx5_wqe_atomic_seg *aseg, struct ib_send_wr *wr)
-{
-        if (wr->opcode == IB_WR_ATOMIC_CMP_AND_SWP) {
-                aseg->swap_add = cpu_to_be64(wr->wr.atomic.swap);
-                aseg->compare  = cpu_to_be64(wr->wr.atomic.compare_add);
-        } else if (wr->opcode == IB_WR_MASKED_ATOMIC_FETCH_AND_ADD) {
-                aseg->swap_add = cpu_to_be64(wr->wr.atomic.compare_add);
-                aseg->compare  = cpu_to_be64(wr->wr.atomic.compare_add_mask);
-        } else {
-                aseg->swap_add = cpu_to_be64(wr->wr.atomic.compare_add);
-                aseg->compare  = 0;
-        }
-}
-
-static void set_masked_atomic_seg(struct mlx5_wqe_masked_atomic_seg *aseg,
-                                  struct ib_send_wr *wr)
-{
-        aseg->swap_add          = cpu_to_be64(wr->wr.atomic.swap);
-        aseg->swap_add_mask     = cpu_to_be64(wr->wr.atomic.swap_mask);
-        aseg->compare           = cpu_to_be64(wr->wr.atomic.compare_add);
-        aseg->compare_mask      = cpu_to_be64(wr->wr.atomic.compare_add_mask);
-}
-
 static void set_datagram_seg(struct mlx5_wqe_datagram_seg *dseg,
                              struct ib_send_wr *wr)
 {
@@ -2063,28 +2060,11 @@ int mlx5_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
 
                         case IB_WR_ATOMIC_CMP_AND_SWP:
                         case IB_WR_ATOMIC_FETCH_AND_ADD:
-                                set_raddr_seg(seg, wr->wr.atomic.remote_addr,
-                                              wr->wr.atomic.rkey);
-                                seg  += sizeof(struct mlx5_wqe_raddr_seg);
-
-                                set_atomic_seg(seg, wr);
-                                seg  += sizeof(struct mlx5_wqe_atomic_seg);
-
-                                size += (sizeof(struct mlx5_wqe_raddr_seg) +
-                                         sizeof(struct mlx5_wqe_atomic_seg)) / 16;
-                                break;
-
                         case IB_WR_MASKED_ATOMIC_CMP_AND_SWP:
-                                set_raddr_seg(seg, wr->wr.atomic.remote_addr,
-                                              wr->wr.atomic.rkey);
-                                seg  += sizeof(struct mlx5_wqe_raddr_seg);
-
-                                set_masked_atomic_seg(seg, wr);
-                                seg  += sizeof(struct mlx5_wqe_masked_atomic_seg);
-
-                                size += (sizeof(struct mlx5_wqe_raddr_seg) +
-                                         sizeof(struct mlx5_wqe_masked_atomic_seg)) / 16;
-                                break;
+                                mlx5_ib_warn(dev, "Atomic operations are not supported yet\n");
+                                err = -ENOSYS;
+                                *bad_wr = wr;
+                                goto out;
 
                         case IB_WR_LOCAL_INV:
                                 next_fence = MLX5_FENCE_MODE_INITIATOR_SMALL;
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index 84d297afd6a9..0aa478bc291a 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -295,7 +295,7 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
         mlx5_vfree(in);
         if (err) {
                 mlx5_ib_dbg(dev, "create SRQ failed, err %d\n", err);
-                goto err_srq;
+                goto err_usr_kern_srq;
         }
 
         mlx5_ib_dbg(dev, "create SRQ with srqn 0x%x\n", srq->msrq.srqn);
@@ -316,6 +316,8 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
 
 err_core:
         mlx5_core_destroy_srq(&dev->mdev, &srq->msrq);
+
+err_usr_kern_srq:
         if (pd->uobject)
                 destroy_srq_user(pd, srq);
         else
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c
index 7c9d35f39d75..690201738993 100644
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
@@ -357,7 +357,7 @@ static int mthca_eq_int(struct mthca_dev *dev, struct mthca_eq *eq)
                         mthca_warn(dev, "Unhandled event %02x(%02x) on EQ %d\n",
                                    eqe->type, eqe->subtype, eq->eqn);
                         break;
-                };
+                }
 
                 set_eqe_hw(eqe);
                 ++eq->cons_index;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 4ed8235d2d36..50219ab2279d 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -150,7 +150,7 @@ enum ib_qp_state get_ibqp_state(enum ocrdma_qp_state qps)
                 return IB_QPS_SQE;
         case OCRDMA_QPS_ERR:
                 return IB_QPS_ERR;
-        };
+        }
         return IB_QPS_ERR;
 }
 
@@ -171,7 +171,7 @@ static enum ocrdma_qp_state get_ocrdma_qp_state(enum ib_qp_state qps)
                 return OCRDMA_QPS_SQE;
         case IB_QPS_ERR:
                 return OCRDMA_QPS_ERR;
-        };
+        }
         return OCRDMA_QPS_ERR;
 }
 
@@ -1982,7 +1982,7 @@ int ocrdma_mbx_create_qp(struct ocrdma_qp *qp, struct ib_qp_init_attr *attrs,
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_CREATE_QP, sizeof(*cmd));
         if (!cmd)
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 56e004940f18..0ce7674621ea 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -531,7 +531,7 @@ static void ocrdma_event_handler(struct ocrdma_dev *dev, u32 event)
         case BE_DEV_DOWN:
                 ocrdma_close(dev);
                 break;
-        };
+        }
 }
 
 static struct ocrdma_driver ocrdma_drv = {
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 6e982bb43c31..69f1d1221a6b 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -141,7 +141,7 @@ static inline void get_link_speed_and_width(struct ocrdma_dev *dev,
                 /* Unsupported */
                 *ib_speed = IB_SPEED_SDR;
                 *ib_width = IB_WIDTH_1X;
-        };
+        }
 }
 
 
@@ -2331,7 +2331,7 @@ static enum ib_wc_status ocrdma_to_ibwc_err(u16 status)
         default:
                 ibwc_status = IB_WC_GENERAL_ERR;
                 break;
-        };
+        }
         return ibwc_status;
 }
 
@@ -2370,7 +2370,7 @@ static void ocrdma_update_wc(struct ocrdma_qp *qp, struct ib_wc *ibwc,
                 pr_err("%s() invalid opcode received = 0x%x\n",
                        __func__, hdr->cw & OCRDMA_WQE_OPCODE_MASK);
                 break;
-        };
+        }
 }
 
 static void ocrdma_set_cqe_status_flushed(struct ocrdma_qp *qp,
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index 4caa8e6d59d7..2d2b1b7588d7 100644
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -269,6 +269,14 @@ static chunk_t area_location(struct pstore *ps, chunk_t area)
         return NUM_SNAPSHOT_HDR_CHUNKS + ((ps->exceptions_per_area + 1) * area);
 }
 
+static void skip_metadata(struct pstore *ps)
+{
+        uint32_t stride = ps->exceptions_per_area + 1;
+        chunk_t next_free = ps->next_free;
+        if (sector_div(next_free, stride) == NUM_SNAPSHOT_HDR_CHUNKS)
+                ps->next_free++;
+}
+
 /*
  * Read or write a metadata area.  Remembering to skip the first
  * chunk which holds the header.
@@ -502,6 +510,8 @@ static int read_exceptions(struct pstore *ps,
 
         ps->current_area--;
 
+        skip_metadata(ps);
+
         return 0;
 }
 
@@ -616,8 +626,6 @@ static int persistent_prepare_exception(struct dm_exception_store *store,
                                         struct dm_exception *e)
 {
         struct pstore *ps = get_info(store);
-        uint32_t stride;
-        chunk_t next_free;
         sector_t size = get_dev_size(dm_snap_cow(store->snap)->bdev);
 
         /* Is there enough room ? */
@@ -630,10 +638,8 @@ static int persistent_prepare_exception(struct dm_exception_store *store,
          * Move onto the next free pending, making sure to take
          * into account the location of the metadata chunks.
          */
-        stride = (ps->exceptions_per_area + 1);
-        next_free = ++ps->next_free;
-        if (sector_div(next_free, stride) == 1)
-                ps->next_free++;
+        ps->next_free++;
+        skip_metadata(ps);
 
         atomic_inc(&ps->pending_count);
         return 0;
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 5ac3aa48473b..022b1863d36c 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -569,13 +569,25 @@ static struct mfd_cell early_devs[] = {
         { .name = "arizona-ldo1" },
 };
 
+static const char *wm5102_supplies[] = {
+        "DBVDD2",
+        "DBVDD3",
+        "CPVDD",
+        "SPKVDDL",
+        "SPKVDDR",
+};
+
 static struct mfd_cell wm5102_devs[] = {
         { .name = "arizona-micsupp" },
         { .name = "arizona-extcon" },
         { .name = "arizona-gpio" },
         { .name = "arizona-haptics" },
         { .name = "arizona-pwm" },
-        { .name = "wm5102-codec" },
+        {
+                .name = "wm5102-codec",
+                .parent_supplies = wm5102_supplies,
+                .num_parent_supplies = ARRAY_SIZE(wm5102_supplies),
+        },
 };
 
 static struct mfd_cell wm5110_devs[] = {
@@ -584,7 +596,17 @@ static struct mfd_cell wm5110_devs[] = {
         { .name = "arizona-gpio" },
         { .name = "arizona-haptics" },
         { .name = "arizona-pwm" },
-        { .name = "wm5110-codec" },
+        {
+                .name = "wm5110-codec",
+                .parent_supplies = wm5102_supplies,
+                .num_parent_supplies = ARRAY_SIZE(wm5102_supplies),
+        },
+};
+
+static const char *wm8997_supplies[] = {
+        "DBVDD2",
+        "CPVDD",
+        "SPKVDD",
 };
 
 static struct mfd_cell wm8997_devs[] = {
@@ -593,7 +615,11 @@ static struct mfd_cell wm8997_devs[] = {
         { .name = "arizona-gpio" },
         { .name = "arizona-haptics" },
         { .name = "arizona-pwm" },
-        { .name = "wm8997-codec" },
+        {
+                .name = "wm8997-codec",
+                .parent_supplies = wm8997_supplies,
+                .num_parent_supplies = ARRAY_SIZE(wm8997_supplies),
+        },
 };
 
 int arizona_dev_init(struct arizona *arizona)
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index f421586f29fb..adc8ea36e7c4 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 #include <linux/irqdomain.h>
 #include <linux/of.h>
+#include <linux/regulator/consumer.h>
 
 static struct device_type mfd_dev_type = {
         .name   = "mfd_device",
@@ -99,6 +100,13 @@ static int mfd_add_device(struct device *parent, int id,
         pdev->dev.dma_mask = parent->dma_mask;
         pdev->dev.dma_parms = parent->dma_parms;
 
+        ret = devm_regulator_bulk_register_supply_alias(
+                        &pdev->dev, cell->parent_supplies,
+                        parent, cell->parent_supplies,
+                        cell->num_parent_supplies);
+        if (ret < 0)
+                goto fail_res;
+
         if (parent->of_node && cell->of_compatible) {
                 for_each_child_of_node(parent->of_node, np) {
                         if (of_device_is_compatible(np, cell->of_compatible)) {
@@ -112,12 +120,12 @@ static int mfd_add_device(struct device *parent, int id,
                 ret = platform_device_add_data(pdev,
                                         cell->platform_data, cell->pdata_size);
                 if (ret)
-                        goto fail_res;
+                        goto fail_alias;
         }
 
         ret = mfd_platform_add_cell(pdev, cell);
         if (ret)
-                goto fail_res;
+                goto fail_alias;
 
         for (r = 0; r < cell->num_resources; r++) {
                 res[r].name = cell->resources[r].name;
@@ -152,17 +160,17 @@ static int mfd_add_device(struct device *parent, int id,
                 if (!cell->ignore_resource_conflicts) {
                         ret = acpi_check_resource_conflict(&res[r]);
                         if (ret)
-                                goto fail_res;
+                                goto fail_alias;
                 }
         }
 
         ret = platform_device_add_resources(pdev, res, cell->num_resources);
         if (ret)
-                goto fail_res;
+                goto fail_alias;
 
         ret = platform_device_add(pdev);
         if (ret)
-                goto fail_res;
+                goto fail_alias;
 
         if (cell->pm_runtime_no_callbacks)
                 pm_runtime_no_callbacks(&pdev->dev);
@@ -171,6 +179,10 @@ static int mfd_add_device(struct device *parent, int id,
 
         return 0;
 
+fail_alias:
+        devm_regulator_bulk_unregister_supply_alias(&pdev->dev,
+                                                    cell->parent_supplies,
+                                                    cell->num_parent_supplies);
 fail_res:
         kfree(res);
 fail_device:
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 5472cbd34028..6ca30739625f 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -180,28 +180,32 @@ static int verify_block_sig(struct mlx5_cmd_prot_block *block)
         return 0;
 }
 
-static void calc_block_sig(struct mlx5_cmd_prot_block *block, u8 token)
+static void calc_block_sig(struct mlx5_cmd_prot_block *block, u8 token,
+                           int csum)
 {
         block->token = token;
-        block->ctrl_sig = ~xor8_buf(block->rsvd0, sizeof(*block) - sizeof(block->data) - 2);
-        block->sig = ~xor8_buf(block, sizeof(*block) - 1);
+        if (csum) {
+                block->ctrl_sig = ~xor8_buf(block->rsvd0, sizeof(*block) -
+                                            sizeof(block->data) - 2);
+                block->sig = ~xor8_buf(block, sizeof(*block) - 1);
+        }
 }
 
-static void calc_chain_sig(struct mlx5_cmd_msg *msg, u8 token)
+static void calc_chain_sig(struct mlx5_cmd_msg *msg, u8 token, int csum)
 {
         struct mlx5_cmd_mailbox *next = msg->next;
 
         while (next) {
-                calc_block_sig(next->buf, token);
+                calc_block_sig(next->buf, token, csum);
                 next = next->next;
         }
 }
 
-static void set_signature(struct mlx5_cmd_work_ent *ent)
+static void set_signature(struct mlx5_cmd_work_ent *ent, int csum)
 {
         ent->lay->sig = ~xor8_buf(ent->lay, sizeof(*ent->lay));
-        calc_chain_sig(ent->in, ent->token);
-        calc_chain_sig(ent->out, ent->token);
+        calc_chain_sig(ent->in, ent->token, csum);
+        calc_chain_sig(ent->out, ent->token, csum);
 }
 
 static void poll_timeout(struct mlx5_cmd_work_ent *ent)
@@ -539,8 +543,7 @@ static void cmd_work_handler(struct work_struct *work)
         lay->type = MLX5_PCI_CMD_XPORT;
         lay->token = ent->token;
         lay->status_own = CMD_OWNER_HW;
-        if (!cmd->checksum_disabled)
-                set_signature(ent);
+        set_signature(ent, !cmd->checksum_disabled);
         dump_command(dev, ent, 1);
         ktime_get_ts(&ent->ts1);
 
@@ -773,8 +776,6 @@ static int mlx5_copy_from_msg(void *to, struct mlx5_cmd_msg *from, int size)
 
                 copy = min_t(int, size, MLX5_CMD_DATA_BLOCK_SIZE);
                 block = next->buf;
-                if (xor8_buf(block, sizeof(*block)) != 0xff)
-                        return -EINVAL;
 
                 memcpy(to, block->data, copy);
                 to += copy;
@@ -1361,6 +1362,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)
                 goto err_map;
         }
 
+        cmd->checksum_disabled = 1;
         cmd->max_reg_cmds = (1 << cmd->log_sz) - 1;
         cmd->bitmask = (1 << cmd->max_reg_cmds) - 1;
 
@@ -1510,7 +1512,7 @@ int mlx5_cmd_status_to_err(struct mlx5_outbox_hdr *hdr)
         case MLX5_CMD_STAT_BAD_SYS_STATE_ERR:           return -EIO;
         case MLX5_CMD_STAT_BAD_RES_ERR:                 return -EINVAL;
         case MLX5_CMD_STAT_RES_BUSY:                    return -EBUSY;
-        case MLX5_CMD_STAT_LIM_ERR:                     return -EINVAL;
+        case MLX5_CMD_STAT_LIM_ERR:                     return -ENOMEM;
         case MLX5_CMD_STAT_BAD_RES_STATE_ERR:           return -EINVAL;
         case MLX5_CMD_STAT_IX_ERR:                      return -EINVAL;
         case MLX5_CMD_STAT_NO_RES_ERR:                  return -EAGAIN;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index 443cc4d7b024..2231d93cc7ad 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -366,9 +366,11 @@ int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx,
                 goto err_in;
         }
 
+        snprintf(eq->name, MLX5_MAX_EQ_NAME, "%s@pci:%s",
+                 name, pci_name(dev->pdev));
         eq->eqn = out.eq_number;
         err = request_irq(table->msix_arr[vecidx].vector, mlx5_msix_handler, 0,
-                          name, eq);
+                          eq->name, eq);
         if (err)
                 goto err_eq;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index b47739b0b5f6..bc0f5fb66e24 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -165,9 +165,7 @@ static int handle_hca_cap(struct mlx5_core_dev *dev)
         struct mlx5_cmd_set_hca_cap_mbox_in *set_ctx = NULL;
         struct mlx5_cmd_query_hca_cap_mbox_in query_ctx;
         struct mlx5_cmd_set_hca_cap_mbox_out set_out;
-        struct mlx5_profile *prof = dev->profile;
         u64 flags;
-        int csum = 1;
         int err;
 
         memset(&query_ctx, 0, sizeof(query_ctx));
@@ -197,20 +195,14 @@ static int handle_hca_cap(struct mlx5_core_dev *dev)
         memcpy(&set_ctx->hca_cap, &query_out->hca_cap,
                sizeof(set_ctx->hca_cap));
 
-        if (prof->mask & MLX5_PROF_MASK_CMDIF_CSUM) {
-                csum = !!prof->cmdif_csum;
-                flags = be64_to_cpu(set_ctx->hca_cap.flags);
-                if (csum)
-                        flags |= MLX5_DEV_CAP_FLAG_CMDIF_CSUM;
-                else
-                        flags &= ~MLX5_DEV_CAP_FLAG_CMDIF_CSUM;
-
-                set_ctx->hca_cap.flags = cpu_to_be64(flags);
-        }
-
         if (dev->profile->mask & MLX5_PROF_MASK_QP_SIZE)
                 set_ctx->hca_cap.log_max_qp = dev->profile->log_max_qp;
 
+        flags = be64_to_cpu(query_out->hca_cap.flags);
+        /* disable checksum */
+        flags &= ~MLX5_DEV_CAP_FLAG_CMDIF_CSUM;
+
+        set_ctx->hca_cap.flags = cpu_to_be64(flags);
         memset(&set_out, 0, sizeof(set_out));
         set_ctx->hca_cap.log_uar_page_sz = cpu_to_be16(PAGE_SHIFT - 12);
         set_ctx->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_SET_HCA_CAP);
@@ -225,9 +217,6 @@ static int handle_hca_cap(struct mlx5_core_dev *dev)
         if (err)
                 goto query_ex;
 
-        if (!csum)
-                dev->cmd.checksum_disabled = 1;
-
 query_ex:
         kfree(query_out);
         kfree(set_ctx);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index 3a2408d44820..7b12acf210f8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -90,6 +90,10 @@ struct mlx5_manage_pages_outbox {
         __be64                  pas[0];
 };
 
+enum {
+        MAX_RECLAIM_TIME_MSECS  = 5000,
+};
+
 static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u16 func_id)
 {
         struct rb_root *root = &dev->priv.page_root;
@@ -279,6 +283,9 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u32 func_id, int npages,
         int err;
         int i;
 
+        if (nclaimed)
+                *nclaimed = 0;
+
         memset(&in, 0, sizeof(in));
         outlen = sizeof(*out) + npages * sizeof(out->pas[0]);
         out = mlx5_vzalloc(outlen);
@@ -388,20 +395,25 @@ static int optimal_reclaimed_pages(void)
 
 int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev)
 {
-        unsigned long end = jiffies + msecs_to_jiffies(5000);
+        unsigned long end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS);
         struct fw_page *fwp;
         struct rb_node *p;
+        int nclaimed = 0;
         int err;
 
         do {
                 p = rb_first(&dev->priv.page_root);
                 if (p) {
                         fwp = rb_entry(p, struct fw_page, rb_node);
-                        err = reclaim_pages(dev, fwp->func_id, optimal_reclaimed_pages(), NULL);
+                        err = reclaim_pages(dev, fwp->func_id,
+                                            optimal_reclaimed_pages(),
+                                            &nclaimed);
                         if (err) {
                                 mlx5_core_warn(dev, "failed reclaiming pages (%d)\n", err);
                                 return err;
                         }
+                        if (nclaimed)
+                                end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS);
                 }
                 if (time_after(jiffies, end)) {
                         mlx5_core_warn(dev, "FW did not return all pages. giving up...\n");
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 9d2009a9004d..78cc76053328 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -74,10 +74,4 @@ config OF_MTD
         depends on MTD
         def_bool y
 
-config OF_RESERVED_MEM
-        depends on OF_FLATTREE && (DMA_CMA || (HAVE_GENERIC_DMA_COHERENT && HAVE_MEMBLOCK))
-        def_bool y
-        help
-          Initialization code for DMA reserved memory
-
 endmenu # OF
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index ed9660adad77..efd05102c405 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -9,4 +9,3 @@ obj-$(CONFIG_OF_MDIO)	+= of_mdio.o
 obj-$(CONFIG_OF_PCI)    += of_pci.o
 obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
 obj-$(CONFIG_OF_MTD)    += of_mtd.o
-obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 865d3f66c86b..7d4c70f859e3 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -303,10 +303,8 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
         struct device_node *cpun, *cpus;
 
         cpus = of_find_node_by_path("/cpus");
-        if (!cpus) {
-                pr_warn("Missing cpus node, bailing out\n");
+        if (!cpus)
                 return NULL;
-        }
 
         for_each_child_of_node(cpus, cpun) {
                 if (of_node_cmp(cpun->type, "cpu"))
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 229dd9d69e18..a4fa9ad31b8f 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -18,7 +18,6 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/random.h>
 
 #include <asm/setup.h>  /* for COMMAND_LINE_SIZE */
 #ifdef CONFIG_PPC
@@ -803,14 +802,3 @@ void __init unflatten_device_tree(void)
 }
 
 #endif /* CONFIG_OF_EARLY_FLATTREE */
-
-/* Feed entire flattened device tree into the random pool */
-static int __init add_fdt_randomness(void)
-{
-        if (initial_boot_params)
-                add_device_randomness(initial_boot_params,
-                                be32_to_cpu(initial_boot_params->totalsize));
-
-        return 0;
-}
-core_initcall(add_fdt_randomness);
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
deleted file mode 100644
index 0fe40c7d6904..000000000000
--- a/drivers/of/of_reserved_mem.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Device tree based initialization code for reserved memory.
- *
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- * Author: Marek Szyprowski <m.szyprowski@samsung.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License or (at your optional) any later version of the license.
- */
-
-#include <linux/memblock.h>
-#include <linux/err.h>
-#include <linux/of.h>
-#include <linux/of_fdt.h>
-#include <linux/of_platform.h>
-#include <linux/mm.h>
-#include <linux/sizes.h>
-#include <linux/mm_types.h>
-#include <linux/dma-contiguous.h>
-#include <linux/dma-mapping.h>
-#include <linux/of_reserved_mem.h>
-
-#define MAX_RESERVED_REGIONS    16
-struct reserved_mem {
-        phys_addr_t             base;
-        unsigned long           size;
-        struct cma              *cma;
-        char                    name[32];
-};
-static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS];
-static int reserved_mem_count;
-
-static int __init fdt_scan_reserved_mem(unsigned long node, const char *uname,
-                                        int depth, void *data)
-{
-        struct reserved_mem *rmem = &reserved_mem[reserved_mem_count];
-        phys_addr_t base, size;
-        int is_cma, is_reserved;
-        unsigned long len;
-        const char *status;
-        __be32 *prop;
-
-        is_cma = IS_ENABLED(CONFIG_DMA_CMA) &&
-               of_flat_dt_is_compatible(node, "linux,contiguous-memory-region");
-        is_reserved = of_flat_dt_is_compatible(node, "reserved-memory-region");
-
-        if (!is_reserved && !is_cma) {
-                /* ignore node and scan next one */
-                return 0;
-        }
-
-        status = of_get_flat_dt_prop(node, "status", &len);
-        if (status && strcmp(status, "okay") != 0) {
-                /* ignore disabled node nad scan next one */
-                return 0;
-        }
-
-        prop = of_get_flat_dt_prop(node, "reg", &len);
-        if (!prop || (len < (dt_root_size_cells + dt_root_addr_cells) *
-                             sizeof(__be32))) {
-                pr_err("Reserved mem: node %s, incorrect \"reg\" property\n",
-                       uname);
-                /* ignore node and scan next one */
-                return 0;
-        }
-        base = dt_mem_next_cell(dt_root_addr_cells, &prop);
-        size = dt_mem_next_cell(dt_root_size_cells, &prop);
-
-        if (!size) {
-                /* ignore node and scan next one */
-                return 0;
-        }
-
-        pr_info("Reserved mem: found %s, memory base %lx, size %ld MiB\n",
-                uname, (unsigned long)base, (unsigned long)size / SZ_1M);
-
-        if (reserved_mem_count == ARRAY_SIZE(reserved_mem))
-                return -ENOSPC;
-
-        rmem->base = base;
-        rmem->size = size;
-        strlcpy(rmem->name, uname, sizeof(rmem->name));
-
-        if (is_cma) {
-                struct cma *cma;
-                if (dma_contiguous_reserve_area(size, base, 0, &cma) == 0) {
-                        rmem->cma = cma;
-                        reserved_mem_count++;
-                        if (of_get_flat_dt_prop(node,
-                                                "linux,default-contiguous-region",
-                                                NULL))
-                                dma_contiguous_set_default(cma);
-                }
-        } else if (is_reserved) {
-                if (memblock_remove(base, size) == 0)
-                        reserved_mem_count++;
-                else
-                        pr_err("Failed to reserve memory for %s\n", uname);
-        }
-
-        return 0;
-}
-
-static struct reserved_mem *get_dma_memory_region(struct device *dev)
-{
-        struct device_node *node;
-        const char *name;
-        int i;
-
-        node = of_parse_phandle(dev->of_node, "memory-region", 0);
-        if (!node)
-                return NULL;
-
-        name = kbasename(node->full_name);
-        for (i = 0; i < reserved_mem_count; i++)
-                if (strcmp(name, reserved_mem[i].name) == 0)
-                        return &reserved_mem[i];
-        return NULL;
-}
-
-/**
- * of_reserved_mem_device_init() - assign reserved memory region to given device
- *
- * This function assign memory region pointed by "memory-region" device tree
- * property to the given device.
- */
-void of_reserved_mem_device_init(struct device *dev)
-{
-        struct reserved_mem *region = get_dma_memory_region(dev);
-        if (!region)
-                return;
-
-        if (region->cma) {
-                dev_set_cma_area(dev, region->cma);
-                pr_info("Assigned CMA %s to %s device\n", region->name,
-                        dev_name(dev));
-        } else {
-                if (dma_declare_coherent_memory(dev, region->base, region->base,
-                    region->size, DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE) != 0)
-                        pr_info("Declared reserved memory %s to %s device\n",
-                                region->name, dev_name(dev));
-        }
-}
-
-/**
- * of_reserved_mem_device_release() - release reserved memory device structures
- *
- * This function releases structures allocated for memory region handling for
- * the given device.
- */
-void of_reserved_mem_device_release(struct device *dev)
-{
-        struct reserved_mem *region = get_dma_memory_region(dev);
-        if (!region && !region->cma)
-                dma_release_declared_memory(dev);
-}
-
-/**
- * early_init_dt_scan_reserved_mem() - create reserved memory regions
- *
- * This function grabs memory from early allocator for device exclusive use
- * defined in device tree structures. It should be called by arch specific code
- * once the early allocator (memblock) has been activated and all other
- * subsystems have already allocated/reserved memory.
- */
-void __init early_init_dt_scan_reserved_mem(void)
-{
-        of_scan_flat_dt_by_path("/memory/reserved-memory",
-                                fdt_scan_reserved_mem, NULL);
-}
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 9b439ac63d8e..f6dcde220821 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -21,7 +21,6 @@
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
-#include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 
 const struct of_device_id of_default_bus_match_table[] = {
@@ -219,8 +218,6 @@ static struct platform_device *of_platform_device_create_pdata(
         dev->dev.bus = &platform_bus_type;
         dev->dev.platform_data = platform_data;
 
-        of_reserved_mem_device_init(&dev->dev);
-
         /* We do not fill the DMA ops for platform devices by default.
          * This is currently the responsibility of the platform code
          * to do such, possibly using a device notifier
@@ -228,7 +225,6 @@ static struct platform_device *of_platform_device_create_pdata(
 
         if (of_device_add(dev) != 0) {
                 platform_device_put(dev);
-                of_reserved_mem_device_release(&dev->dev);
                 return NULL;
         }
 
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 0b7d23b4ad95..be12fbfcae10 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -994,14 +994,16 @@ void acpiphp_enumerate_slots(struct pci_bus *bus)
 
                 /*
                  * This bridge should have been registered as a hotplug function
-                 * under its parent, so the context has to be there.  If not, we
-                 * are in deep goo.
+                 * under its parent, so the context should be there, unless the
+                 * parent is going to be handled by pciehp, in which case this
+                 * bridge is not interesting to us either.
                  */
                 mutex_lock(&acpiphp_context_lock);
                 context = acpiphp_get_context(handle);
-                if (WARN_ON(!context)) {
+                if (!context) {
                         mutex_unlock(&acpiphp_context_lock);
                         put_device(&bus->dev);
+                        pci_dev_put(bridge->pci_dev);
                         kfree(bridge);
                         return;
                 }
diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c
index 3459f60dcfd1..d333f7eac106 100644
--- a/drivers/regulator/88pm800.c
+++ b/drivers/regulator/88pm800.c
@@ -141,18 +141,14 @@ struct pm800_regulators {
 
 /* Ranges are sorted in ascending order. */
 static const struct regulator_linear_range buck1_volt_range[] = {
-        { .min_uV = 600000, .max_uV = 1587500, .min_sel = 0, .max_sel = 0x4f,
-          .uV_step = 12500 },
-        { .min_uV = 1600000, .max_uV = 1800000, .min_sel = 0x50,
-          .max_sel = 0x54, .uV_step = 50000 },
+        REGULATOR_LINEAR_RANGE(600000, 0, 0x4f, 12500),
+        REGULATOR_LINEAR_RANGE(1600000, 0x50, 0x54, 50000),
 };
 
 /* BUCK 2~5 have same ranges. */
 static const struct regulator_linear_range buck2_5_volt_range[] = {
-        { .min_uV = 600000, .max_uV = 1587500,  .min_sel = 0, .max_sel = 0x4f,
-          .uV_step = 12500 },
-        { .min_uV = 1600000, .max_uV = 3300000, .min_sel = 0x50,
-          .max_sel = 0x72, .uV_step = 50000 },
+        REGULATOR_LINEAR_RANGE(600000, 0, 0x4f, 12500),
+        REGULATOR_LINEAR_RANGE(1600000, 0x50, 0x72, 50000),
 };
 
 static const unsigned int ldo1_volt_table[] = {
diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
index 70230974468c..f704d83c93c4 100644
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -391,7 +391,8 @@ static int pm8607_regulator_probe(struct platform_device *pdev)
         else
                 config.regmap = chip->regmap_companion;
 
-        info->regulator = regulator_register(&info->desc, &config);
+        info->regulator = devm_regulator_register(&pdev->dev, &info->desc,
+                                                  &config);
         if (IS_ERR(info->regulator)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                         info->desc.name);
@@ -402,14 +403,6 @@ static int pm8607_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int pm8607_regulator_remove(struct platform_device *pdev)
-{
-        struct pm8607_regulator_info *info = platform_get_drvdata(pdev);
-
-        regulator_unregister(info->regulator);
-        return 0;
-}
-
 static struct platform_device_id pm8607_regulator_driver_ids[] = {
         {
                 .name   = "88pm860x-regulator",
@@ -428,7 +421,6 @@ static struct platform_driver pm8607_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = pm8607_regulator_probe,
-        .remove         = pm8607_regulator_remove,
         .id_table       = pm8607_regulator_driver_ids,
 };
 
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index dfe58096b374..ce785f481281 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -28,16 +28,6 @@ config REGULATOR_DEBUG
         help
           Say yes here to enable debugging support.
 
-config REGULATOR_DUMMY
-        bool "Provide a dummy regulator if regulator lookups fail"
-        help
-          If this option is enabled then when a regulator lookup fails
-          and the board has not specified that it has provided full
-          constraints the regulator core will provide an always
-          enabled dummy regulator, allowing consumer drivers to continue.
-
-          A warning will be generated when this substitution is done.
-
 config REGULATOR_FIXED_VOLTAGE
         tristate "Fixed voltage regulator support"
         help
@@ -133,6 +123,14 @@ config REGULATOR_AS3711
           This driver provides support for the voltage regulators on the
           AS3711 PMIC
 
+config REGULATOR_AS3722
+        tristate "AMS AS3722 PMIC Regulators"
+        depends on MFD_AS3722
+        help
+          This driver provides support for the voltage regulators on the
+          AS3722 PMIC. This will enable support for all the software
+          controllable DCDC/LDO regulators.
+
 config REGULATOR_DA903X
         tristate "Dialog Semiconductor DA9030/DA9034 regulators"
         depends on PMIC_DA903X
@@ -429,6 +427,14 @@ config REGULATOR_TI_ABB
           on TI SoCs may be unstable without enabling this as it provides
           device specific optimized bias to allow/optimize functionality.
 
+config REGULATOR_STW481X_VMMC
+        bool "ST Microelectronics STW481X VMMC regulator"
+        depends on MFD_STW481X
+        default y if MFD_STW481X
+        help
+          This driver supports the internal VMMC regulator in the STw481x
+          PMIC chips.
+
 config REGULATOR_TPS51632
         tristate "TI TPS51632 Power Regulator"
         depends on I2C
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 185cce246022..01c597ea1744 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -3,7 +3,7 @@
 #
 
 
-obj-$(CONFIG_REGULATOR) += core.o dummy.o fixed-helper.o helpers.o
+obj-$(CONFIG_REGULATOR) += core.o dummy.o fixed-helper.o helpers.o devres.o
 obj-$(CONFIG_OF) += of_regulator.o
 obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
 obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o
@@ -18,6 +18,7 @@ obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
 obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
 obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
 obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o
+obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o
 obj-$(CONFIG_REGULATOR_DA903X)  += da903x.o
 obj-$(CONFIG_REGULATOR_DA9052)  += da9052-regulator.o
 obj-$(CONFIG_REGULATOR_DA9055)  += da9055-regulator.o
@@ -56,6 +57,7 @@ obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
 obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
 obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
 obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
+obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o
 obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
 obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o
 obj-$(CONFIG_REGULATOR_TPS62360) += tps62360-regulator.o
diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index 881159dfcb5e..f70a9bfa5ff2 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -176,7 +176,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
         config.driver_data = ri;
         config.init_data = dev_get_platdata(&pdev->dev);
 
-        rdev = regulator_register(&ri->desc, &config);
+        rdev = devm_regulator_register(&pdev->dev, &ri->desc, &config);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "Failed to register regulator %s\n",
                         ri->desc.name);
@@ -187,21 +187,12 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int aat2870_regulator_remove(struct platform_device *pdev)
-{
-        struct regulator_dev *rdev = platform_get_drvdata(pdev);
-
-        regulator_unregister(rdev);
-        return 0;
-}
-
 static struct platform_driver aat2870_regulator_driver = {
         .driver = {
                 .name   = "aat2870-regulator",
                 .owner  = THIS_MODULE,
         },
         .probe  = aat2870_regulator_probe,
-        .remove = aat2870_regulator_remove,
 };
 
 static int __init aat2870_regulator_init(void)
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index 7d5eaa874b2d..77b46d0b37a6 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -535,7 +535,7 @@ static int ab3100_regulator_register(struct platform_device *pdev,
         config.dev = &pdev->dev;
         config.driver_data = reg;
 
-        rdev = regulator_register(desc, &config);
+        rdev = devm_regulator_register(&pdev->dev, desc, &config);
         if (IS_ERR(rdev)) {
                 err = PTR_ERR(rdev);
                 dev_err(&pdev->dev,
@@ -616,7 +616,6 @@ static int ab3100_regulators_remove(struct platform_device *pdev)
         for (i = 0; i < AB3100_NUM_REGULATORS; i++) {
                 struct ab3100_regulator *reg = &ab3100_regulators[i];
 
-                regulator_unregister(reg->rdev);
                 reg->rdev = NULL;
         }
         return 0;
diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 02ff691cdb8b..29c0faaf8eba 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -413,16 +413,12 @@ static int ab8500_ext_regulator_probe(struct platform_device *pdev)
                         &pdata->ext_regulator[i];
 
                 /* register regulator with framework */
-                info->rdev = regulator_register(&info->desc, &config);
+                info->rdev = devm_regulator_register(&pdev->dev, &info->desc,
+                                                     &config);
                 if (IS_ERR(info->rdev)) {
                         err = PTR_ERR(info->rdev);
                         dev_err(&pdev->dev, "failed to register regulator %s\n",
                                         info->desc.name);
-                        /* when we fail, un-register all earlier regulators */
-                        while (--i >= 0) {
-                                info = &ab8500_ext_regulator_info[i];
-                                regulator_unregister(info->rdev);
-                        }
                         return err;
                 }
 
@@ -433,26 +429,8 @@ static int ab8500_ext_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int ab8500_ext_regulator_remove(struct platform_device *pdev)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(ab8500_ext_regulator_info); i++) {
-                struct ab8500_ext_regulator_info *info = NULL;
-                info = &ab8500_ext_regulator_info[i];
-
-                dev_vdbg(rdev_get_dev(info->rdev),
-                        "%s-remove\n", info->desc.name);
-
-                regulator_unregister(info->rdev);
-        }
-
-        return 0;
-}
-
 static struct platform_driver ab8500_ext_regulator_driver = {
         .probe = ab8500_ext_regulator_probe,
-        .remove = ab8500_ext_regulator_remove,
         .driver         = {
                 .name   = "ab8500-ext-regulator",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c
index b2b203cb6b2f..48016a050d5f 100644
--- a/drivers/regulator/ad5398.c
+++ b/drivers/regulator/ad5398.c
@@ -219,7 +219,6 @@ static int ad5398_probe(struct i2c_client *client,
         struct ad5398_chip_info *chip;
         const struct ad5398_current_data_format *df =
                         (struct ad5398_current_data_format *)id->driver_data;
-        int ret;
 
         if (!init_data)
                 return -EINVAL;
@@ -240,33 +239,21 @@ static int ad5398_probe(struct i2c_client *client,
         chip->current_offset = df->current_offset;
         chip->current_mask = (chip->current_level - 1) << chip->current_offset;
 
-        chip->rdev = regulator_register(&ad5398_reg, &config);
+        chip->rdev = devm_regulator_register(&client->dev, &ad5398_reg,
+                                             &config);
         if (IS_ERR(chip->rdev)) {
-                ret = PTR_ERR(chip->rdev);
                 dev_err(&client->dev, "failed to register %s %s\n",
                         id->name, ad5398_reg.name);
-                goto err;
+                return PTR_ERR(chip->rdev);
         }
 
         i2c_set_clientdata(client, chip);
         dev_dbg(&client->dev, "%s regulator driver is registered.\n", id->name);
         return 0;
-
-err:
-        return ret;
-}
-
-static int ad5398_remove(struct i2c_client *client)
-{
-        struct ad5398_chip_info *chip = i2c_get_clientdata(client);
-
-        regulator_unregister(chip->rdev);
-        return 0;
 }
 
 static struct i2c_driver ad5398_driver = {
         .probe = ad5398_probe,
-        .remove = ad5398_remove,
         .driver         = {
                 .name   = "ad5398",
         },
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 0d4a8ccbb536..c734d0980826 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -200,7 +200,7 @@ static int anatop_regulator_probe(struct platform_device *pdev)
         config.regmap = sreg->anatop;
 
         /* register regulator */
-        rdev = regulator_register(rdesc, &config);
+        rdev = devm_regulator_register(dev, rdesc, &config);
         if (IS_ERR(rdev)) {
                 dev_err(dev, "failed to register %s\n",
                         rdesc->name);
@@ -223,7 +223,6 @@ static int anatop_regulator_remove(struct platform_device *pdev)
         struct anatop_regulator *sreg = rdev_get_drvdata(rdev);
         const char *name = sreg->name;
 
-        regulator_unregister(rdev);
         kfree(name);
 
         return 0;
@@ -256,7 +255,7 @@ static void __exit anatop_regulator_exit(void)
 }
 module_exit(anatop_regulator_exit);
 
-MODULE_AUTHOR("Nancy Chen <Nancy.Chen@freescale.com>, "
-              "Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>");
+MODULE_AUTHOR("Nancy Chen <Nancy.Chen@freescale.com>");
+MODULE_AUTHOR("Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>");
 MODULE_DESCRIPTION("ANATOP Regulator driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index 81d8681c3195..4f6c2055f6b2 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -226,7 +226,7 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
         else
                 config.init_data = &ldo1->init_data;
 
-        ldo1->regulator = regulator_register(desc, &config);
+        ldo1->regulator = devm_regulator_register(&pdev->dev, desc, &config);
         if (IS_ERR(ldo1->regulator)) {
                 ret = PTR_ERR(ldo1->regulator);
                 dev_err(arizona->dev, "Failed to register LDO1 supply: %d\n",
@@ -239,18 +239,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int arizona_ldo1_remove(struct platform_device *pdev)
-{
-        struct arizona_ldo1 *ldo1 = platform_get_drvdata(pdev);
-
-        regulator_unregister(ldo1->regulator);
-
-        return 0;
-}
-
 static struct platform_driver arizona_ldo1_driver = {
         .probe = arizona_ldo1_probe,
-        .remove = arizona_ldo1_remove,
         .driver         = {
                 .name   = "arizona-ldo1",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index e87536bf0bed..724706a97dc4 100644
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -225,7 +225,9 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
         regmap_update_bits(arizona->regmap, ARIZONA_MIC_CHARGE_PUMP_1,
                            ARIZONA_CPMIC_BYPASS, 0);
 
-        micsupp->regulator = regulator_register(&arizona_micsupp, &config);
+        micsupp->regulator = devm_regulator_register(&pdev->dev,
+                                                     &arizona_micsupp,
+                                                     &config);
         if (IS_ERR(micsupp->regulator)) {
                 ret = PTR_ERR(micsupp->regulator);
                 dev_err(arizona->dev, "Failed to register mic supply: %d\n",
@@ -238,18 +240,8 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int arizona_micsupp_remove(struct platform_device *pdev)
-{
-        struct arizona_micsupp *micsupp = platform_get_drvdata(pdev);
-
-        regulator_unregister(micsupp->regulator);
-
-        return 0;
-}
-
 static struct platform_driver arizona_micsupp_driver = {
         .probe = arizona_micsupp_probe,
-        .remove = arizona_micsupp_remove,
         .driver         = {
                 .name   = "arizona-micsupp",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/as3711-regulator.c b/drivers/regulator/as3711-regulator.c
index 8406cd745da2..c77a58478cca 100644
--- a/drivers/regulator/as3711-regulator.c
+++ b/drivers/regulator/as3711-regulator.c
@@ -117,26 +117,19 @@ static struct regulator_ops as3711_dldo_ops = {
 };
 
 static const struct regulator_linear_range as3711_sd_ranges[] = {
-        { .min_uV = 612500, .max_uV = 1400000,
-          .min_sel = 0x1, .max_sel = 0x40, .uV_step = 12500 },
-        { .min_uV = 1425000, .max_uV = 2600000,
-          .min_sel = 0x41, .max_sel = 0x70, .uV_step = 25000 },
-        { .min_uV = 2650000, .max_uV = 3350000,
-          .min_sel = 0x71, .max_sel = 0x7f, .uV_step = 50000 },
+        REGULATOR_LINEAR_RANGE(612500, 0x1, 0x40, 12500),
+        REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000),
+        REGULATOR_LINEAR_RANGE(2650000, 0x71, 0x7f, 50000),
 };
 
 static const struct regulator_linear_range as3711_aldo_ranges[] = {
-        { .min_uV = 1200000, .max_uV = 1950000,
-          .min_sel = 0, .max_sel = 0xf, .uV_step = 50000 },
-        { .min_uV = 1800000, .max_uV = 3300000,
-          .min_sel = 0x10, .max_sel = 0x1f, .uV_step = 100000 },
+        REGULATOR_LINEAR_RANGE(1200000, 0, 0xf, 50000),
+        REGULATOR_LINEAR_RANGE(1800000, 0x10, 0x1f, 100000),
 };
 
 static const struct regulator_linear_range as3711_dldo_ranges[] = {
-        { .min_uV = 900000, .max_uV = 1700000,
-          .min_sel = 0, .max_sel = 0x10, .uV_step = 50000 },
-        { .min_uV = 1750000, .max_uV = 3300000,
-          .min_sel = 0x20, .max_sel = 0x3f, .uV_step = 50000 },
+        REGULATOR_LINEAR_RANGE(900000, 0, 0x10, 50000),
+        REGULATOR_LINEAR_RANGE(1750000, 0x20, 0x3f, 50000),
 };
 
 #define AS3711_REG(_id, _en_reg, _en_bit, _vmask, _vshift, _min_uV, _max_uV, _sfx)      \
@@ -273,33 +266,16 @@ static int as3711_regulator_probe(struct platform_device *pdev)
                 config.regmap = as3711->regmap;
                 config.of_node = of_node[id];
 
-                rdev = regulator_register(&ri->desc, &config);
+                rdev = devm_regulator_register(&pdev->dev, &ri->desc, &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev, "Failed to register regulator %s\n",
                                 ri->desc.name);
-                        ret = PTR_ERR(rdev);
-                        goto eregreg;
+                        return PTR_ERR(rdev);
                 }
                 reg->rdev = rdev;
         }
         platform_set_drvdata(pdev, regs);
         return 0;
-
-eregreg:
-        while (--id >= 0)
-                regulator_unregister(regs[id].rdev);
-
-        return ret;
-}
-
-static int as3711_regulator_remove(struct platform_device *pdev)
-{
-        struct as3711_regulator *regs = platform_get_drvdata(pdev);
-        int id;
-
-        for (id = 0; id < AS3711_REGULATOR_NUM; ++id)
-                regulator_unregister(regs[id].rdev);
-        return 0;
 }
 
 static struct platform_driver as3711_regulator_driver = {
@@ -308,7 +284,6 @@ static struct platform_driver as3711_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = as3711_regulator_probe,
-        .remove         = as3711_regulator_remove,
 };
 
 static int __init as3711_regulator_init(void)
diff --git a/drivers/regulator/as3722-regulator.c b/drivers/regulator/as3722-regulator.c
new file mode 100644
index 000000000000..5917fe3dc983
--- /dev/null
+++ b/drivers/regulator/as3722-regulator.c
@@ -0,0 +1,908 @@
+/*
+ * Voltage regulator support for AMS AS3722 PMIC
+ *
+ * Copyright (C) 2013 ams
+ *
+ * Author: Florian Lobmaier <florian.lobmaier@ams.com>
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mfd/as3722.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/slab.h>
+
+/* Regulator IDs */
+enum as3722_regulators_id {
+        AS3722_REGULATOR_ID_SD0,
+        AS3722_REGULATOR_ID_SD1,
+        AS3722_REGULATOR_ID_SD2,
+        AS3722_REGULATOR_ID_SD3,
+        AS3722_REGULATOR_ID_SD4,
+        AS3722_REGULATOR_ID_SD5,
+        AS3722_REGULATOR_ID_SD6,
+        AS3722_REGULATOR_ID_LDO0,
+        AS3722_REGULATOR_ID_LDO1,
+        AS3722_REGULATOR_ID_LDO2,
+        AS3722_REGULATOR_ID_LDO3,
+        AS3722_REGULATOR_ID_LDO4,
+        AS3722_REGULATOR_ID_LDO5,
+        AS3722_REGULATOR_ID_LDO6,
+        AS3722_REGULATOR_ID_LDO7,
+        AS3722_REGULATOR_ID_LDO9,
+        AS3722_REGULATOR_ID_LDO10,
+        AS3722_REGULATOR_ID_LDO11,
+        AS3722_REGULATOR_ID_MAX,
+};
+
+struct as3722_register_mapping {
+        u8 regulator_id;
+        const char *name;
+        const char *sname;
+        u8 vsel_reg;
+        u8 vsel_mask;
+        int n_voltages;
+        u32 enable_reg;
+        u8 enable_mask;
+        u32 control_reg;
+        u8 mode_mask;
+        u32 sleep_ctrl_reg;
+        u8 sleep_ctrl_mask;
+};
+
+struct as3722_regulator_config_data {
+        struct regulator_init_data *reg_init;
+        bool enable_tracking;
+        int ext_control;
+};
+
+struct as3722_regulators {
+        struct device *dev;
+        struct as3722 *as3722;
+        struct regulator_dev *rdevs[AS3722_REGULATOR_ID_MAX];
+        struct regulator_desc desc[AS3722_REGULATOR_ID_MAX];
+        struct as3722_regulator_config_data
+                        reg_config_data[AS3722_REGULATOR_ID_MAX];
+};
+
+static const struct as3722_register_mapping as3722_reg_lookup[] = {
+        {
+                .regulator_id = AS3722_REGULATOR_ID_SD0,
+                .name = "as3722-sd0",
+                .vsel_reg = AS3722_SD0_VOLTAGE_REG,
+                .vsel_mask = AS3722_SD_VSEL_MASK,
+                .enable_reg = AS3722_SD_CONTROL_REG,
+                .enable_mask = AS3722_SDn_CTRL(0),
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL1_REG,
+                .sleep_ctrl_mask = AS3722_SD0_EXT_ENABLE_MASK,
+                .control_reg = AS3722_SD0_CONTROL_REG,
+                .mode_mask = AS3722_SD0_MODE_FAST,
+                .n_voltages = AS3722_SD0_VSEL_MAX + 1,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_SD1,
+                .name = "as3722-sd1",
+                .vsel_reg = AS3722_SD1_VOLTAGE_REG,
+                .vsel_mask = AS3722_SD_VSEL_MASK,
+                .enable_reg = AS3722_SD_CONTROL_REG,
+                .enable_mask = AS3722_SDn_CTRL(1),
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL1_REG,
+                .sleep_ctrl_mask = AS3722_SD1_EXT_ENABLE_MASK,
+                .control_reg = AS3722_SD1_CONTROL_REG,
+                .mode_mask = AS3722_SD1_MODE_FAST,
+                .n_voltages = AS3722_SD0_VSEL_MAX + 1,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_SD2,
+                .name = "as3722-sd2",
+                .sname = "vsup-sd2",
+                .vsel_reg = AS3722_SD2_VOLTAGE_REG,
+                .vsel_mask = AS3722_SD_VSEL_MASK,
+                .enable_reg = AS3722_SD_CONTROL_REG,
+                .enable_mask = AS3722_SDn_CTRL(2),
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL1_REG,
+                .sleep_ctrl_mask = AS3722_SD2_EXT_ENABLE_MASK,
+                .control_reg = AS3722_SD23_CONTROL_REG,
+                .mode_mask = AS3722_SD2_MODE_FAST,
+                .n_voltages = AS3722_SD2_VSEL_MAX + 1,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_SD3,
+                .name = "as3722-sd3",
+                .sname = "vsup-sd3",
+                .vsel_reg = AS3722_SD3_VOLTAGE_REG,
+                .vsel_mask = AS3722_SD_VSEL_MASK,
+                .enable_reg = AS3722_SD_CONTROL_REG,
+                .enable_mask = AS3722_SDn_CTRL(3),
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL1_REG,
+                .sleep_ctrl_mask = AS3722_SD3_EXT_ENABLE_MASK,
+                .control_reg = AS3722_SD23_CONTROL_REG,
+                .mode_mask = AS3722_SD3_MODE_FAST,
+                .n_voltages = AS3722_SD2_VSEL_MAX + 1,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_SD4,
+                .name = "as3722-sd4",
+                .sname = "vsup-sd4",
+                .vsel_reg = AS3722_SD4_VOLTAGE_REG,
+                .vsel_mask = AS3722_SD_VSEL_MASK,
+                .enable_reg = AS3722_SD_CONTROL_REG,
+                .enable_mask = AS3722_SDn_CTRL(4),
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL2_REG,
+                .sleep_ctrl_mask = AS3722_SD4_EXT_ENABLE_MASK,
+                .control_reg = AS3722_SD4_CONTROL_REG,
+                .mode_mask = AS3722_SD4_MODE_FAST,
+                .n_voltages = AS3722_SD2_VSEL_MAX + 1,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_SD5,
+                .name = "as3722-sd5",
+                .sname = "vsup-sd5",
+                .vsel_reg = AS3722_SD5_VOLTAGE_REG,
+                .vsel_mask = AS3722_SD_VSEL_MASK,
+                .enable_reg = AS3722_SD_CONTROL_REG,
+                .enable_mask = AS3722_SDn_CTRL(5),
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL2_REG,
+                .sleep_ctrl_mask = AS3722_SD5_EXT_ENABLE_MASK,
+                .control_reg = AS3722_SD5_CONTROL_REG,
+                .mode_mask = AS3722_SD5_MODE_FAST,
+                .n_voltages = AS3722_SD2_VSEL_MAX + 1,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_SD6,
+                .name = "as3722-sd6",
+                .vsel_reg = AS3722_SD6_VOLTAGE_REG,
+                .vsel_mask = AS3722_SD_VSEL_MASK,
+                .enable_reg = AS3722_SD_CONTROL_REG,
+                .enable_mask = AS3722_SDn_CTRL(6),
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL2_REG,
+                .sleep_ctrl_mask = AS3722_SD6_EXT_ENABLE_MASK,
+                .control_reg = AS3722_SD6_CONTROL_REG,
+                .mode_mask = AS3722_SD6_MODE_FAST,
+                .n_voltages = AS3722_SD0_VSEL_MAX + 1,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO0,
+                .name = "as3722-ldo0",
+                .sname = "vin-ldo0",
+                .vsel_reg = AS3722_LDO0_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO0_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL0_REG,
+                .enable_mask = AS3722_LDO0_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL3_REG,
+                .sleep_ctrl_mask = AS3722_LDO0_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO0_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO1,
+                .name = "as3722-ldo1",
+                .sname = "vin-ldo1-6",
+                .vsel_reg = AS3722_LDO1_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL0_REG,
+                .enable_mask = AS3722_LDO1_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL3_REG,
+                .sleep_ctrl_mask = AS3722_LDO1_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO2,
+                .name = "as3722-ldo2",
+                .sname = "vin-ldo2-5-7",
+                .vsel_reg = AS3722_LDO2_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL0_REG,
+                .enable_mask = AS3722_LDO2_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL3_REG,
+                .sleep_ctrl_mask = AS3722_LDO2_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO3,
+                .name = "as3722-ldo3",
+                .name = "vin-ldo3-4",
+                .vsel_reg = AS3722_LDO3_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO3_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL0_REG,
+                .enable_mask = AS3722_LDO3_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL3_REG,
+                .sleep_ctrl_mask = AS3722_LDO3_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO3_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO4,
+                .name = "as3722-ldo4",
+                .name = "vin-ldo3-4",
+                .vsel_reg = AS3722_LDO4_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL0_REG,
+                .enable_mask = AS3722_LDO4_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL4_REG,
+                .sleep_ctrl_mask = AS3722_LDO4_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO5,
+                .name = "as3722-ldo5",
+                .sname = "vin-ldo2-5-7",
+                .vsel_reg = AS3722_LDO5_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL0_REG,
+                .enable_mask = AS3722_LDO5_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL4_REG,
+                .sleep_ctrl_mask = AS3722_LDO5_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO6,
+                .name = "as3722-ldo6",
+                .sname = "vin-ldo1-6",
+                .vsel_reg = AS3722_LDO6_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL0_REG,
+                .enable_mask = AS3722_LDO6_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL4_REG,
+                .sleep_ctrl_mask = AS3722_LDO6_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO7,
+                .name = "as3722-ldo7",
+                .sname = "vin-ldo2-5-7",
+                .vsel_reg = AS3722_LDO7_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL0_REG,
+                .enable_mask = AS3722_LDO7_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL4_REG,
+                .sleep_ctrl_mask = AS3722_LDO7_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO9,
+                .name = "as3722-ldo9",
+                .sname = "vin-ldo9-10",
+                .vsel_reg = AS3722_LDO9_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL1_REG,
+                .enable_mask = AS3722_LDO9_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL5_REG,
+                .sleep_ctrl_mask = AS3722_LDO9_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO10,
+                .name = "as3722-ldo10",
+                .sname = "vin-ldo9-10",
+                .vsel_reg = AS3722_LDO10_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL1_REG,
+                .enable_mask = AS3722_LDO10_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL5_REG,
+                .sleep_ctrl_mask = AS3722_LDO10_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO_NUM_VOLT,
+        },
+        {
+                .regulator_id = AS3722_REGULATOR_ID_LDO11,
+                .name = "as3722-ldo11",
+                .sname = "vin-ldo11",
+                .vsel_reg = AS3722_LDO11_VOLTAGE_REG,
+                .vsel_mask = AS3722_LDO_VSEL_MASK,
+                .enable_reg = AS3722_LDOCONTROL1_REG,
+                .enable_mask = AS3722_LDO11_CTRL,
+                .sleep_ctrl_reg = AS3722_ENABLE_CTRL5_REG,
+                .sleep_ctrl_mask = AS3722_LDO11_EXT_ENABLE_MASK,
+                .n_voltages = AS3722_LDO_NUM_VOLT,
+        },
+};
+
+
+static const int as3722_ldo_current[] = { 150000, 300000 };
+static const int as3722_sd016_current[] = { 2500000, 3000000, 3500000 };
+
+static int as3722_current_to_index(int min_uA, int max_uA,
+                const int *curr_table, int n_currents)
+{
+        int i;
+
+        for (i = n_currents - 1; i >= 0; i--) {
+                if ((min_uA <= curr_table[i]) && (curr_table[i] <= max_uA))
+                        return i;
+        }
+        return -EINVAL;
+}
+
+static int as3722_ldo_get_current_limit(struct regulator_dev *rdev)
+{
+        struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
+        struct as3722 *as3722 = as3722_regs->as3722;
+        int id = rdev_get_id(rdev);
+        u32 val;
+        int ret;
+
+        ret = as3722_read(as3722, as3722_reg_lookup[id].vsel_reg, &val);
+        if (ret < 0) {
+                dev_err(as3722_regs->dev, "Reg 0x%02x read failed: %d\n",
+                        as3722_reg_lookup[id].vsel_reg, ret);
+                return ret;
+        }
+        if (val & AS3722_LDO_ILIMIT_MASK)
+                return 300000;
+        return 150000;
+}
+
+static int as3722_ldo_set_current_limit(struct regulator_dev *rdev,
+                int min_uA, int max_uA)
+{
+        struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
+        struct as3722 *as3722 = as3722_regs->as3722;
+        int id = rdev_get_id(rdev);
+        int ret;
+        u32 reg = 0;
+
+        ret = as3722_current_to_index(min_uA, max_uA, as3722_ldo_current,
+                                ARRAY_SIZE(as3722_ldo_current));
+        if (ret < 0) {
+                dev_err(as3722_regs->dev,
+                        "Current range min:max = %d:%d does not support\n",
+                        min_uA, max_uA);
+                return ret;
+        }
+        if (ret)
+                reg = AS3722_LDO_ILIMIT_BIT;
+        return as3722_update_bits(as3722, as3722_reg_lookup[id].vsel_reg,
+                        AS3722_LDO_ILIMIT_MASK, reg);
+}
+
+static struct regulator_ops as3722_ldo0_ops = {
+        .is_enabled = regulator_is_enabled_regmap,
+        .enable = regulator_enable_regmap,
+        .disable = regulator_disable_regmap,
+        .list_voltage = regulator_list_voltage_linear,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_current_limit = as3722_ldo_get_current_limit,
+        .set_current_limit = as3722_ldo_set_current_limit,
+};
+
+static struct regulator_ops as3722_ldo0_extcntrl_ops = {
+        .list_voltage = regulator_list_voltage_linear,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_current_limit = as3722_ldo_get_current_limit,
+        .set_current_limit = as3722_ldo_set_current_limit,
+};
+
+static int as3722_ldo3_set_tracking_mode(struct as3722_regulators *as3722_reg,
+                int id, u8 mode)
+{
+        struct as3722 *as3722 = as3722_reg->as3722;
+
+        switch (mode) {
+        case AS3722_LDO3_MODE_PMOS:
+        case AS3722_LDO3_MODE_PMOS_TRACKING:
+        case AS3722_LDO3_MODE_NMOS:
+        case AS3722_LDO3_MODE_SWITCH:
+                return as3722_update_bits(as3722,
+                        as3722_reg_lookup[id].vsel_reg,
+                        AS3722_LDO3_MODE_MASK, mode);
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static int as3722_ldo3_get_current_limit(struct regulator_dev *rdev)
+{
+        return 150000;
+}
+
+static struct regulator_ops as3722_ldo3_ops = {
+        .is_enabled = regulator_is_enabled_regmap,
+        .enable = regulator_enable_regmap,
+        .disable = regulator_disable_regmap,
+        .list_voltage = regulator_list_voltage_linear,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_current_limit = as3722_ldo3_get_current_limit,
+};
+
+static struct regulator_ops as3722_ldo3_extcntrl_ops = {
+        .list_voltage = regulator_list_voltage_linear,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_current_limit = as3722_ldo3_get_current_limit,
+};
+
+static const struct regulator_linear_range as3722_ldo_ranges[] = {
+        REGULATOR_LINEAR_RANGE(825000, 0x01, 0x24, 25000),
+        REGULATOR_LINEAR_RANGE(1725000, 0x40, 0x7F, 25000),
+};
+
+static struct regulator_ops as3722_ldo_ops = {
+        .is_enabled = regulator_is_enabled_regmap,
+        .enable = regulator_enable_regmap,
+        .disable = regulator_disable_regmap,
+        .map_voltage = regulator_map_voltage_linear_range,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .list_voltage = regulator_list_voltage_linear_range,
+        .get_current_limit = as3722_ldo_get_current_limit,
+        .set_current_limit = as3722_ldo_set_current_limit,
+};
+
+static struct regulator_ops as3722_ldo_extcntrl_ops = {
+        .map_voltage = regulator_map_voltage_linear_range,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .list_voltage = regulator_list_voltage_linear_range,
+        .get_current_limit = as3722_ldo_get_current_limit,
+        .set_current_limit = as3722_ldo_set_current_limit,
+};
+
+static unsigned int as3722_sd_get_mode(struct regulator_dev *rdev)
+{
+        struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
+        struct as3722 *as3722 = as3722_regs->as3722;
+        int id = rdev_get_id(rdev);
+        u32 val;
+        int ret;
+
+        if (!as3722_reg_lookup[id].control_reg)
+                return -ENOTSUPP;
+
+        ret = as3722_read(as3722, as3722_reg_lookup[id].control_reg, &val);
+        if (ret < 0) {
+                dev_err(as3722_regs->dev, "Reg 0x%02x read failed: %d\n",
+                        as3722_reg_lookup[id].control_reg, ret);
+                return ret;
+        }
+
+        if (val & as3722_reg_lookup[id].mode_mask)
+                return REGULATOR_MODE_FAST;
+        else
+                return REGULATOR_MODE_NORMAL;
+}
+
+static int as3722_sd_set_mode(struct regulator_dev *rdev,
+                unsigned int mode)
+{
+        struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
+        struct as3722 *as3722 = as3722_regs->as3722;
+        u8 id = rdev_get_id(rdev);
+        u8 val = 0;
+        int ret;
+
+        if (!as3722_reg_lookup[id].control_reg)
+                return -ERANGE;
+
+        switch (mode) {
+        case REGULATOR_MODE_FAST:
+                val = as3722_reg_lookup[id].mode_mask;
+        case REGULATOR_MODE_NORMAL: /* fall down */
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        ret = as3722_update_bits(as3722, as3722_reg_lookup[id].control_reg,
+                        as3722_reg_lookup[id].mode_mask, val);
+        if (ret < 0) {
+                dev_err(as3722_regs->dev, "Reg 0x%02x update failed: %d\n",
+                        as3722_reg_lookup[id].control_reg, ret);
+                return ret;
+        }
+        return ret;
+}
+
+static int as3722_sd016_get_current_limit(struct regulator_dev *rdev)
+{
+        struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
+        struct as3722 *as3722 = as3722_regs->as3722;
+        int id = rdev_get_id(rdev);
+        u32 val, reg;
+        int mask;
+        int ret;
+
+        switch (id) {
+        case AS3722_REGULATOR_ID_SD0:
+                reg = AS3722_OVCURRENT_REG;
+                mask = AS3722_OVCURRENT_SD0_TRIP_MASK;
+                break;
+        case AS3722_REGULATOR_ID_SD1:
+                reg = AS3722_OVCURRENT_REG;
+                mask = AS3722_OVCURRENT_SD1_TRIP_MASK;
+                break;
+        case AS3722_REGULATOR_ID_SD6:
+                reg = AS3722_OVCURRENT_DEB_REG;
+                mask = AS3722_OVCURRENT_SD6_TRIP_MASK;
+                break;
+        default:
+                return -EINVAL;
+        }
+        ret = as3722_read(as3722, reg, &val);
+        if (ret < 0) {
+                dev_err(as3722_regs->dev, "Reg 0x%02x read failed: %d\n",
+                        reg, ret);
+                return ret;
+        }
+        val &= mask;
+        val >>= ffs(mask) - 1;
+        if (val == 3)
+                return -EINVAL;
+        return as3722_sd016_current[val];
+}
+
+static int as3722_sd016_set_current_limit(struct regulator_dev *rdev,
+                int min_uA, int max_uA)
+{
+        struct as3722_regulators *as3722_regs = rdev_get_drvdata(rdev);
+        struct as3722 *as3722 = as3722_regs->as3722;
+        int id = rdev_get_id(rdev);
+        int ret;
+        int val;
+        int mask;
+        u32 reg;
+
+        ret = as3722_current_to_index(min_uA, max_uA, as3722_sd016_current,
+                                ARRAY_SIZE(as3722_sd016_current));
+        if (ret < 0) {
+                dev_err(as3722_regs->dev,
+                        "Current range min:max = %d:%d does not support\n",
+                        min_uA, max_uA);
+                return ret;
+        }
+
+        switch (id) {
+        case AS3722_REGULATOR_ID_SD0:
+                reg = AS3722_OVCURRENT_REG;
+                mask = AS3722_OVCURRENT_SD0_TRIP_MASK;
+                break;
+        case AS3722_REGULATOR_ID_SD1:
+                reg = AS3722_OVCURRENT_REG;
+                mask = AS3722_OVCURRENT_SD1_TRIP_MASK;
+                break;
+        case AS3722_REGULATOR_ID_SD6:
+                reg = AS3722_OVCURRENT_DEB_REG;
+                mask = AS3722_OVCURRENT_SD6_TRIP_MASK;
+                break;
+        default:
+                return -EINVAL;
+        }
+        val = ret & mask;
+        val <<= ffs(mask) - 1;
+        return as3722_update_bits(as3722, reg, mask, val);
+}
+
+static const struct regulator_linear_range as3722_sd2345_ranges[] = {
+        REGULATOR_LINEAR_RANGE(612500, 0x01, 0x40, 12500),
+        REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000),
+        REGULATOR_LINEAR_RANGE(2650000, 0x71, 0x7F, 50000),
+};
+
+static struct regulator_ops as3722_sd016_ops = {
+        .is_enabled = regulator_is_enabled_regmap,
+        .enable = regulator_enable_regmap,
+        .disable = regulator_disable_regmap,
+        .list_voltage = regulator_list_voltage_linear,
+        .map_voltage = regulator_map_voltage_linear,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_current_limit = as3722_sd016_get_current_limit,
+        .set_current_limit = as3722_sd016_set_current_limit,
+        .get_mode = as3722_sd_get_mode,
+        .set_mode = as3722_sd_set_mode,
+};
+
+static struct regulator_ops as3722_sd016_extcntrl_ops = {
+        .list_voltage = regulator_list_voltage_linear,
+        .map_voltage = regulator_map_voltage_linear,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_current_limit = as3722_sd016_get_current_limit,
+        .set_current_limit = as3722_sd016_set_current_limit,
+        .get_mode = as3722_sd_get_mode,
+        .set_mode = as3722_sd_set_mode,
+};
+
+static struct regulator_ops as3722_sd2345_ops = {
+        .is_enabled = regulator_is_enabled_regmap,
+        .enable = regulator_enable_regmap,
+        .disable = regulator_disable_regmap,
+        .list_voltage = regulator_list_voltage_linear_range,
+        .map_voltage = regulator_map_voltage_linear_range,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .get_mode = as3722_sd_get_mode,
+        .set_mode = as3722_sd_set_mode,
+};
+
+static struct regulator_ops as3722_sd2345_extcntrl_ops = {
+        .list_voltage = regulator_list_voltage_linear_range,
+        .map_voltage = regulator_map_voltage_linear_range,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .get_mode = as3722_sd_get_mode,
+        .set_mode = as3722_sd_set_mode,
+};
+
+static int as3722_extreg_init(struct as3722_regulators *as3722_regs, int id,
+                int ext_pwr_ctrl)
+{
+        int ret;
+        unsigned int val;
+
+        if ((ext_pwr_ctrl < AS3722_EXT_CONTROL_ENABLE1) ||
+                (ext_pwr_ctrl > AS3722_EXT_CONTROL_ENABLE3))
+                return -EINVAL;
+
+        val =  ext_pwr_ctrl << (ffs(as3722_reg_lookup[id].sleep_ctrl_mask) - 1);
+        ret = as3722_update_bits(as3722_regs->as3722,
+                        as3722_reg_lookup[id].sleep_ctrl_reg,
+                        as3722_reg_lookup[id].sleep_ctrl_mask, val);
+        if (ret < 0)
+                dev_err(as3722_regs->dev, "Reg 0x%02x update failed: %d\n",
+                        as3722_reg_lookup[id].sleep_ctrl_reg, ret);
+        return ret;
+}
+
+static struct of_regulator_match as3722_regulator_matches[] = {
+        { .name = "sd0", },
+        { .name = "sd1", },
+        { .name = "sd2", },
+        { .name = "sd3", },
+        { .name = "sd4", },
+        { .name = "sd5", },
+        { .name = "sd6", },
+        { .name = "ldo0", },
+        { .name = "ldo1", },
+        { .name = "ldo2", },
+        { .name = "ldo3", },
+        { .name = "ldo4", },
+        { .name = "ldo5", },
+        { .name = "ldo6", },
+        { .name = "ldo7", },
+        { .name = "ldo9", },
+        { .name = "ldo10", },
+        { .name = "ldo11", },
+};
+
+static int as3722_get_regulator_dt_data(struct platform_device *pdev,
+                struct as3722_regulators *as3722_regs)
+{
+        struct device_node *np;
+        struct as3722_regulator_config_data *reg_config;
+        u32 prop;
+        int id;
+        int ret;
+
+        np = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");
+        if (!np) {
+                dev_err(&pdev->dev, "Device is not having regulators node\n");
+                return -ENODEV;
+        }
+        pdev->dev.of_node = np;
+
+        ret = of_regulator_match(&pdev->dev, np, as3722_regulator_matches,
+                        ARRAY_SIZE(as3722_regulator_matches));
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Parsing of regulator node failed: %d\n",
+                        ret);
+                return ret;
+        }
+
+        for (id = 0; id < ARRAY_SIZE(as3722_regulator_matches); ++id) {
+                struct device_node *reg_node;
+
+                reg_config = &as3722_regs->reg_config_data[id];
+                reg_config->reg_init = as3722_regulator_matches[id].init_data;
+                reg_node = as3722_regulator_matches[id].of_node;
+
+                if (!reg_config->reg_init || !reg_node)
+                        continue;
+
+                ret = of_property_read_u32(reg_node, "ams,ext-control", &prop);
+                if (!ret) {
+                        if (prop < 3)
+                                reg_config->ext_control = prop;
+                        else
+                                dev_warn(&pdev->dev,
+                                        "ext-control have invalid option: %u\n",
+                                        prop);
+                }
+                reg_config->enable_tracking =
+                        of_property_read_bool(reg_node, "ams,enable-tracking");
+        }
+        return 0;
+}
+
+static int as3722_regulator_probe(struct platform_device *pdev)
+{
+        struct as3722 *as3722 = dev_get_drvdata(pdev->dev.parent);
+        struct as3722_regulators *as3722_regs;
+        struct as3722_regulator_config_data *reg_config;
+        struct regulator_dev *rdev;
+        struct regulator_config config = { };
+        struct regulator_ops *ops;
+        int id;
+        int ret;
+
+        as3722_regs = devm_kzalloc(&pdev->dev, sizeof(*as3722_regs),
+                                GFP_KERNEL);
+        if (!as3722_regs)
+                return -ENOMEM;
+
+        as3722_regs->dev = &pdev->dev;
+        as3722_regs->as3722 = as3722;
+        platform_set_drvdata(pdev, as3722_regs);
+
+        ret = as3722_get_regulator_dt_data(pdev, as3722_regs);
+        if (ret < 0)
+                return ret;
+
+        config.dev = &pdev->dev;
+        config.driver_data = as3722_regs;
+        config.regmap = as3722->regmap;
+
+        for (id = 0; id < AS3722_REGULATOR_ID_MAX; id++) {
+                reg_config = &as3722_regs->reg_config_data[id];
+
+                as3722_regs->desc[id].name = as3722_reg_lookup[id].name;
+                as3722_regs->desc[id].supply_name = as3722_reg_lookup[id].sname;
+                as3722_regs->desc[id].id = as3722_reg_lookup[id].regulator_id;
+                as3722_regs->desc[id].n_voltages =
+                                        as3722_reg_lookup[id].n_voltages;
+                as3722_regs->desc[id].type = REGULATOR_VOLTAGE;
+                as3722_regs->desc[id].owner = THIS_MODULE;
+                as3722_regs->desc[id].enable_reg =
+                                        as3722_reg_lookup[id].enable_reg;
+                as3722_regs->desc[id].enable_mask =
+                                        as3722_reg_lookup[id].enable_mask;
+                as3722_regs->desc[id].vsel_reg = as3722_reg_lookup[id].vsel_reg;
+                as3722_regs->desc[id].vsel_mask =
+                                        as3722_reg_lookup[id].vsel_mask;
+                switch (id) {
+                case AS3722_REGULATOR_ID_LDO0:
+                        if (reg_config->ext_control)
+                                ops = &as3722_ldo0_extcntrl_ops;
+                        else
+                                ops = &as3722_ldo0_ops;
+                        as3722_regs->desc[id].min_uV = 825000;
+                        as3722_regs->desc[id].uV_step = 25000;
+                        as3722_regs->desc[id].linear_min_sel = 1;
+                        as3722_regs->desc[id].enable_time = 500;
+                        break;
+                case AS3722_REGULATOR_ID_LDO3:
+                        if (reg_config->ext_control)
+                                ops = &as3722_ldo3_extcntrl_ops;
+                        else
+                                ops = &as3722_ldo3_ops;
+                        as3722_regs->desc[id].min_uV = 620000;
+                        as3722_regs->desc[id].uV_step = 20000;
+                        as3722_regs->desc[id].linear_min_sel = 1;
+                        as3722_regs->desc[id].enable_time = 500;
+                        if (reg_config->enable_tracking) {
+                                ret = as3722_ldo3_set_tracking_mode(as3722_regs,
+                                        id, AS3722_LDO3_MODE_PMOS_TRACKING);
+                                if (ret < 0) {
+                                        dev_err(&pdev->dev,
+                                                "LDO3 tracking failed: %d\n",
+                                                ret);
+                                        return ret;
+                                }
+                        }
+                        break;
+                case AS3722_REGULATOR_ID_SD0:
+                case AS3722_REGULATOR_ID_SD1:
+                case AS3722_REGULATOR_ID_SD6:
+                        if (reg_config->ext_control)
+                                ops = &as3722_sd016_extcntrl_ops;
+                        else
+                                ops = &as3722_sd016_ops;
+                        as3722_regs->desc[id].min_uV = 610000;
+                        as3722_regs->desc[id].uV_step = 10000;
+                        as3722_regs->desc[id].linear_min_sel = 1;
+                        break;
+                case AS3722_REGULATOR_ID_SD2:
+                case AS3722_REGULATOR_ID_SD3:
+                case AS3722_REGULATOR_ID_SD4:
+                case AS3722_REGULATOR_ID_SD5:
+                        if (reg_config->ext_control)
+                                ops = &as3722_sd2345_extcntrl_ops;
+                        else
+                                ops = &as3722_sd2345_ops;
+                        as3722_regs->desc[id].linear_ranges =
+                                                as3722_sd2345_ranges;
+                        as3722_regs->desc[id].n_linear_ranges =
+                                        ARRAY_SIZE(as3722_sd2345_ranges);
+                        break;
+                default:
+                        if (reg_config->ext_control)
+                                ops = &as3722_ldo_extcntrl_ops;
+                        else
+                                ops = &as3722_ldo_ops;
+                        as3722_regs->desc[id].min_uV = 825000;
+                        as3722_regs->desc[id].uV_step = 25000;
+                        as3722_regs->desc[id].linear_min_sel = 1;
+                        as3722_regs->desc[id].enable_time = 500;
+                        as3722_regs->desc[id].linear_ranges = as3722_ldo_ranges;
+                        as3722_regs->desc[id].n_linear_ranges =
+                                                ARRAY_SIZE(as3722_ldo_ranges);
+                        break;
+                }
+                as3722_regs->desc[id].ops = ops;
+                config.init_data = reg_config->reg_init;
+                config.of_node = as3722_regulator_matches[id].of_node;
+                rdev = devm_regulator_register(&pdev->dev,
+                                        &as3722_regs->desc[id], &config);
+                if (IS_ERR(rdev)) {
+                        ret = PTR_ERR(rdev);
+                        dev_err(&pdev->dev, "regulator %d register failed %d\n",
+                                id, ret);
+                        return ret;
+                }
+
+                as3722_regs->rdevs[id] = rdev;
+                if (reg_config->ext_control) {
+                        ret = regulator_enable_regmap(rdev);
+                        if (ret < 0) {
+                                dev_err(&pdev->dev,
+                                        "Regulator %d enable failed: %d\n",
+                                        id, ret);
+                                return ret;
+                        }
+                        ret = as3722_extreg_init(as3722_regs, id,
+                                        reg_config->ext_control);
+                        if (ret < 0) {
+                                dev_err(&pdev->dev,
+                                        "AS3722 ext control failed: %d", ret);
+                                return ret;
+                        }
+                }
+        }
+        return 0;
+}
+
+static const struct of_device_id of_as3722_regulator_match[] = {
+        { .compatible = "ams,as3722-regulator", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, of_as3722_regulator_match);
+
+static struct platform_driver as3722_regulator_driver = {
+        .driver = {
+                .name = "as3722-regulator",
+                .owner = THIS_MODULE,
+                .of_match_table = of_as3722_regulator_match,
+        },
+        .probe = as3722_regulator_probe,
+};
+
+module_platform_driver(as3722_regulator_driver);
+
+MODULE_ALIAS("platform:as3722-regulator");
+MODULE_DESCRIPTION("AS3722 regulator driver");
+MODULE_AUTHOR("Florian Lobmaier <florian.lobmaier@ams.com>");
+MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index a01b8b3b70ca..6382f0af353b 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -36,6 +36,7 @@
 #include <trace/events/regulator.h>
 
 #include "dummy.h"
+#include "internal.h"
 
 #define rdev_crit(rdev, fmt, ...)                                       \
         pr_crit("%s: " fmt, rdev_get_name(rdev), ##__VA_ARGS__)
@@ -52,8 +53,8 @@ static DEFINE_MUTEX(regulator_list_mutex);
 static LIST_HEAD(regulator_list);
 static LIST_HEAD(regulator_map_list);
 static LIST_HEAD(regulator_ena_gpio_list);
+static LIST_HEAD(regulator_supply_alias_list);
 static bool has_full_constraints;
-static bool board_wants_dummy_regulator;
 
 static struct dentry *debugfs_root;
 
@@ -83,22 +84,16 @@ struct regulator_enable_gpio {
 };
 
 /*
- * struct regulator
+ * struct regulator_supply_alias
  *
- * One for each consumer device.
+ * Used to map lookups for a supply onto an alternative device.
  */
-struct regulator {
-        struct device *dev;
+struct regulator_supply_alias {
         struct list_head list;
-        unsigned int always_on:1;
-        unsigned int bypass:1;
-        int uA_load;
-        int min_uV;
-        int max_uV;
-        char *supply_name;
-        struct device_attribute dev_attr;
-        struct regulator_dev *rdev;
-        struct dentry *debugfs;
+        struct device *src_dev;
+        const char *src_supply;
+        struct device *alias_dev;
+        const char *alias_supply;
 };
 
 static int _regulator_is_enabled(struct regulator_dev *rdev);
@@ -923,6 +918,36 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
         return 0;
 }
 
+static int machine_constraints_current(struct regulator_dev *rdev,
+        struct regulation_constraints *constraints)
+{
+        struct regulator_ops *ops = rdev->desc->ops;
+        int ret;
+
+        if (!constraints->min_uA && !constraints->max_uA)
+                return 0;
+
+        if (constraints->min_uA > constraints->max_uA) {
+                rdev_err(rdev, "Invalid current constraints\n");
+                return -EINVAL;
+        }
+
+        if (!ops->set_current_limit || !ops->get_current_limit) {
+                rdev_warn(rdev, "Operation of current configuration missing\n");
+                return 0;
+        }
+
+        /* Set regulator current in constraints range */
+        ret = ops->set_current_limit(rdev, constraints->min_uA,
+                        constraints->max_uA);
+        if (ret < 0) {
+                rdev_err(rdev, "Failed to set current constraint, %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
 /**
  * set_machine_constraints - sets regulator constraints
  * @rdev: regulator source
@@ -953,6 +978,10 @@ static int set_machine_constraints(struct regulator_dev *rdev,
         if (ret != 0)
                 goto out;
 
+        ret = machine_constraints_current(rdev, rdev->constraints);
+        if (ret != 0)
+                goto out;
+
         /* do we need to setup our suspend state */
         if (rdev->constraints->initial_state) {
                 ret = suspend_prepare(rdev, rdev->constraints->initial_state);
@@ -1186,11 +1215,39 @@ overflow_err:
 
 static int _regulator_get_enable_time(struct regulator_dev *rdev)
 {
+        if (rdev->constraints && rdev->constraints->enable_time)
+                return rdev->constraints->enable_time;
         if (!rdev->desc->ops->enable_time)
                 return rdev->desc->enable_time;
         return rdev->desc->ops->enable_time(rdev);
 }
 
+static struct regulator_supply_alias *regulator_find_supply_alias(
+                struct device *dev, const char *supply)
+{
+        struct regulator_supply_alias *map;
+
+        list_for_each_entry(map, &regulator_supply_alias_list, list)
+                if (map->src_dev == dev && strcmp(map->src_supply, supply) == 0)
+                        return map;
+
+        return NULL;
+}
+
+static void regulator_supply_alias(struct device **dev, const char **supply)
+{
+        struct regulator_supply_alias *map;
+
+        map = regulator_find_supply_alias(*dev, *supply);
+        if (map) {
+                dev_dbg(*dev, "Mapping supply %s to %s,%s\n",
+                                *supply, map->alias_supply,
+                                dev_name(map->alias_dev));
+                *dev = map->alias_dev;
+                *supply = map->alias_supply;
+        }
+}
+
 static struct regulator_dev *regulator_dev_lookup(struct device *dev,
                                                   const char *supply,
                                                   int *ret)
@@ -1200,6 +1257,8 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev,
         struct regulator_map *map;
         const char *devname = NULL;
 
+        regulator_supply_alias(&dev, &supply);
+
         /* first do a dt based lookup */
         if (dev && dev->of_node) {
                 node = of_get_regulator(dev, supply);
@@ -1243,16 +1302,16 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev,
 
 /* Internal regulator request function */
 static struct regulator *_regulator_get(struct device *dev, const char *id,
-                                        bool exclusive)
+                                        bool exclusive, bool allow_dummy)
 {
         struct regulator_dev *rdev;
         struct regulator *regulator = ERR_PTR(-EPROBE_DEFER);
         const char *devname = NULL;
-        int ret = 0;
+        int ret = -EPROBE_DEFER;
 
         if (id == NULL) {
                 pr_err("get() with no identifier\n");
-                return regulator;
+                return ERR_PTR(-EINVAL);
         }
 
         if (dev)
@@ -1264,34 +1323,32 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
         if (rdev)
                 goto found;
 
+        regulator = ERR_PTR(ret);
+
         /*
          * If we have return value from dev_lookup fail, we do not expect to
          * succeed, so, quit with appropriate error value
          */
-        if (ret) {
-                regulator = ERR_PTR(ret);
+        if (ret && ret != -ENODEV) {
                 goto out;
         }
 
-        if (board_wants_dummy_regulator) {
-                rdev = dummy_regulator_rdev;
-                goto found;
-        }
-
-#ifdef CONFIG_REGULATOR_DUMMY
         if (!devname)
                 devname = "deviceless";
 
-        /* If the board didn't flag that it was fully constrained then
-         * substitute in a dummy regulator so consumers can continue.
+        /*
+         * Assume that a regulator is physically present and enabled
+         * even if it isn't hooked up and just provide a dummy.
          */
-        if (!has_full_constraints) {
+        if (has_full_constraints && allow_dummy) {
                 pr_warn("%s supply %s not found, using dummy regulator\n",
                         devname, id);
+
                 rdev = dummy_regulator_rdev;
                 goto found;
+        } else {
+                dev_err(dev, "dummy supplies not allowed\n");
         }
-#endif
 
         mutex_unlock(&regulator_list_mutex);
         return regulator;
@@ -1349,44 +1406,10 @@ out:
  */
 struct regulator *regulator_get(struct device *dev, const char *id)
 {
-        return _regulator_get(dev, id, false);
+        return _regulator_get(dev, id, false, true);
 }
 EXPORT_SYMBOL_GPL(regulator_get);
 
-static void devm_regulator_release(struct device *dev, void *res)
-{
-        regulator_put(*(struct regulator **)res);
-}
-
-/**
- * devm_regulator_get - Resource managed regulator_get()
- * @dev: device for regulator "consumer"
- * @id: Supply name or regulator ID.
- *
- * Managed regulator_get(). Regulators returned from this function are
- * automatically regulator_put() on driver detach. See regulator_get() for more
- * information.
- */
-struct regulator *devm_regulator_get(struct device *dev, const char *id)
-{
-        struct regulator **ptr, *regulator;
-
-        ptr = devres_alloc(devm_regulator_release, sizeof(*ptr), GFP_KERNEL);
-        if (!ptr)
-                return ERR_PTR(-ENOMEM);
-
-        regulator = regulator_get(dev, id);
-        if (!IS_ERR(regulator)) {
-                *ptr = regulator;
-                devres_add(dev, ptr);
-        } else {
-                devres_free(ptr);
-        }
-
-        return regulator;
-}
-EXPORT_SYMBOL_GPL(devm_regulator_get);
-
 /**
  * regulator_get_exclusive - obtain exclusive access to a regulator.
  * @dev: device for regulator "consumer"
@@ -1410,7 +1433,7 @@ EXPORT_SYMBOL_GPL(devm_regulator_get);
  */
 struct regulator *regulator_get_exclusive(struct device *dev, const char *id)
 {
-        return _regulator_get(dev, id, true);
+        return _regulator_get(dev, id, true, false);
 }
 EXPORT_SYMBOL_GPL(regulator_get_exclusive);
 
@@ -1439,40 +1462,10 @@ EXPORT_SYMBOL_GPL(regulator_get_exclusive);
  */
 struct regulator *regulator_get_optional(struct device *dev, const char *id)
 {
-        return _regulator_get(dev, id, 0);
+        return _regulator_get(dev, id, false, false);
 }
 EXPORT_SYMBOL_GPL(regulator_get_optional);
 
-/**
- * devm_regulator_get_optional - Resource managed regulator_get_optional()
- * @dev: device for regulator "consumer"
- * @id: Supply name or regulator ID.
- *
- * Managed regulator_get_optional(). Regulators returned from this
- * function are automatically regulator_put() on driver detach. See
- * regulator_get_optional() for more information.
- */
-struct regulator *devm_regulator_get_optional(struct device *dev,
-                                              const char *id)
-{
-        struct regulator **ptr, *regulator;
-
-        ptr = devres_alloc(devm_regulator_release, sizeof(*ptr), GFP_KERNEL);
-        if (!ptr)
-                return ERR_PTR(-ENOMEM);
-
-        regulator = regulator_get_optional(dev, id);
-        if (!IS_ERR(regulator)) {
-                *ptr = regulator;
-                devres_add(dev, ptr);
-        } else {
-                devres_free(ptr);
-        }
-
-        return regulator;
-}
-EXPORT_SYMBOL_GPL(devm_regulator_get_optional);
-
 /* Locks held by regulator_put() */
 static void _regulator_put(struct regulator *regulator)
 {
@@ -1499,36 +1492,6 @@ static void _regulator_put(struct regulator *regulator)
 }
 
 /**
- * devm_regulator_get_exclusive - Resource managed regulator_get_exclusive()
- * @dev: device for regulator "consumer"
- * @id: Supply name or regulator ID.
- *
- * Managed regulator_get_exclusive(). Regulators returned from this function
- * are automatically regulator_put() on driver detach. See regulator_get() for
- * more information.
- */
-struct regulator *devm_regulator_get_exclusive(struct device *dev,
-                                               const char *id)
-{
-        struct regulator **ptr, *regulator;
-
-        ptr = devres_alloc(devm_regulator_release, sizeof(*ptr), GFP_KERNEL);
-        if (!ptr)
-                return ERR_PTR(-ENOMEM);
-
-        regulator = _regulator_get(dev, id, 1);
-        if (!IS_ERR(regulator)) {
-                *ptr = regulator;
-                devres_add(dev, ptr);
-        } else {
-                devres_free(ptr);
-        }
-
-        return regulator;
-}
-EXPORT_SYMBOL_GPL(devm_regulator_get_exclusive);
-
-/**
  * regulator_put - "free" the regulator source
  * @regulator: regulator source
  *
@@ -1544,34 +1507,133 @@ void regulator_put(struct regulator *regulator)
 }
 EXPORT_SYMBOL_GPL(regulator_put);
 
-static int devm_regulator_match(struct device *dev, void *res, void *data)
+/**
+ * regulator_register_supply_alias - Provide device alias for supply lookup
+ *
+ * @dev: device that will be given as the regulator "consumer"
+ * @id: Supply name or regulator ID
+ * @alias_dev: device that should be used to lookup the supply
+ * @alias_id: Supply name or regulator ID that should be used to lookup the
+ * supply
+ *
+ * All lookups for id on dev will instead be conducted for alias_id on
+ * alias_dev.
+ */
+int regulator_register_supply_alias(struct device *dev, const char *id,
+                                    struct device *alias_dev,
+                                    const char *alias_id)
+{
+        struct regulator_supply_alias *map;
+
+        map = regulator_find_supply_alias(dev, id);
+        if (map)
+                return -EEXIST;
+
+        map = kzalloc(sizeof(struct regulator_supply_alias), GFP_KERNEL);
+        if (!map)
+                return -ENOMEM;
+
+        map->src_dev = dev;
+        map->src_supply = id;
+        map->alias_dev = alias_dev;
+        map->alias_supply = alias_id;
+
+        list_add(&map->list, &regulator_supply_alias_list);
+
+        pr_info("Adding alias for supply %s,%s -> %s,%s\n",
+                id, dev_name(dev), alias_id, dev_name(alias_dev));
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(regulator_register_supply_alias);
+
+/**
+ * regulator_unregister_supply_alias - Remove device alias
+ *
+ * @dev: device that will be given as the regulator "consumer"
+ * @id: Supply name or regulator ID
+ *
+ * Remove a lookup alias if one exists for id on dev.
+ */
+void regulator_unregister_supply_alias(struct device *dev, const char *id)
 {
-        struct regulator **r = res;
-        if (!r || !*r) {
-                WARN_ON(!r || !*r);
-                return 0;
+        struct regulator_supply_alias *map;
+
+        map = regulator_find_supply_alias(dev, id);
+        if (map) {
+                list_del(&map->list);
+                kfree(map);
         }
-        return *r == data;
 }
+EXPORT_SYMBOL_GPL(regulator_unregister_supply_alias);
 
 /**
- * devm_regulator_put - Resource managed regulator_put()
- * @regulator: regulator to free
+ * regulator_bulk_register_supply_alias - register multiple aliases
+ *
+ * @dev: device that will be given as the regulator "consumer"
+ * @id: List of supply names or regulator IDs
+ * @alias_dev: device that should be used to lookup the supply
+ * @alias_id: List of supply names or regulator IDs that should be used to
+ * lookup the supply
+ * @num_id: Number of aliases to register
+ *
+ * @return 0 on success, an errno on failure.
  *
- * Deallocate a regulator allocated with devm_regulator_get(). Normally
- * this function will not need to be called and the resource management
- * code will ensure that the resource is freed.
+ * This helper function allows drivers to register several supply
+ * aliases in one operation.  If any of the aliases cannot be
+ * registered any aliases that were registered will be removed
+ * before returning to the caller.
  */
-void devm_regulator_put(struct regulator *regulator)
+int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
+                                         struct device *alias_dev,
+                                         const char **alias_id,
+                                         int num_id)
 {
-        int rc;
+        int i;
+        int ret;
+
+        for (i = 0; i < num_id; ++i) {
+                ret = regulator_register_supply_alias(dev, id[i], alias_dev,
+                                                      alias_id[i]);
+                if (ret < 0)
+                        goto err;
+        }
+
+        return 0;
+
+err:
+        dev_err(dev,
+                "Failed to create supply alias %s,%s -> %s,%s\n",
+                id[i], dev_name(dev), alias_id[i], dev_name(alias_dev));
+
+        while (--i >= 0)
+                regulator_unregister_supply_alias(dev, id[i]);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(regulator_bulk_register_supply_alias);
+
+/**
+ * regulator_bulk_unregister_supply_alias - unregister multiple aliases
+ *
+ * @dev: device that will be given as the regulator "consumer"
+ * @id: List of supply names or regulator IDs
+ * @num_id: Number of aliases to unregister
+ *
+ * This helper function allows drivers to unregister several supply
+ * aliases in one operation.
+ */
+void regulator_bulk_unregister_supply_alias(struct device *dev,
+                                            const char **id,
+                                            int num_id)
+{
+        int i;
 
-        rc = devres_release(regulator->dev, devm_regulator_release,
-                            devm_regulator_match, regulator);
-        if (rc != 0)
-                WARN_ON(rc);
+        for (i = 0; i < num_id; ++i)
+                regulator_unregister_supply_alias(dev, id[i]);
 }
-EXPORT_SYMBOL_GPL(devm_regulator_put);
+EXPORT_SYMBOL_GPL(regulator_bulk_unregister_supply_alias);
+
 
 /* Manage enable GPIO list. Same GPIO pin can be shared among regulators */
 static int regulator_ena_gpio_request(struct regulator_dev *rdev,
@@ -1704,11 +1766,39 @@ static int _regulator_do_enable(struct regulator_dev *rdev)
          * together.  */
         trace_regulator_enable_delay(rdev_get_name(rdev));
 
-        if (delay >= 1000) {
-                mdelay(delay / 1000);
-                udelay(delay % 1000);
-        } else if (delay) {
-                udelay(delay);
+        /*
+         * Delay for the requested amount of time as per the guidelines in:
+         *
+         *     Documentation/timers/timers-howto.txt
+         *
+         * The assumption here is that regulators will never be enabled in
+         * atomic context and therefore sleeping functions can be used.
+         */
+        if (delay) {
+                unsigned int ms = delay / 1000;
+                unsigned int us = delay % 1000;
+
+                if (ms > 0) {
+                        /*
+                         * For small enough values, handle super-millisecond
+                         * delays in the usleep_range() call below.
+                         */
+                        if (ms < 20)
+                                us += ms * 1000;
+                        else
+                                msleep(ms);
+                }
+
+                /*
+                 * Give the scheduler some room to coalesce with any other
+                 * wakeup sources. For delays shorter than 10 us, don't even
+                 * bother setting up high-resolution timers and just busy-
+                 * loop.
+                 */
+                if (us >= 10)
+                        usleep_range(us, us + 100);
+                else
+                        udelay(us);
         }
 
         trace_regulator_enable_complete(rdev_get_name(rdev));
@@ -2489,6 +2579,8 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
                 ret = rdev->desc->ops->get_voltage(rdev);
         } else if (rdev->desc->ops->list_voltage) {
                 ret = rdev->desc->ops->list_voltage(rdev, 0);
+        } else if (rdev->desc->fixed_uV && (rdev->desc->n_voltages == 1)) {
+                ret = rdev->desc->fixed_uV;
         } else {
                 return -EINVAL;
         }
@@ -2912,52 +3004,6 @@ err:
 }
 EXPORT_SYMBOL_GPL(regulator_bulk_get);
 
-/**
- * devm_regulator_bulk_get - managed get multiple regulator consumers
- *
- * @dev:           Device to supply
- * @num_consumers: Number of consumers to register
- * @consumers:     Configuration of consumers; clients are stored here.
- *
- * @return 0 on success, an errno on failure.
- *
- * This helper function allows drivers to get several regulator
- * consumers in one operation with management, the regulators will
- * automatically be freed when the device is unbound.  If any of the
- * regulators cannot be acquired then any regulators that were
- * allocated will be freed before returning to the caller.
- */
-int devm_regulator_bulk_get(struct device *dev, int num_consumers,
-                            struct regulator_bulk_data *consumers)
-{
-        int i;
-        int ret;
-
-        for (i = 0; i < num_consumers; i++)
-                consumers[i].consumer = NULL;
-
-        for (i = 0; i < num_consumers; i++) {
-                consumers[i].consumer = devm_regulator_get(dev,
-                                                           consumers[i].supply);
-                if (IS_ERR(consumers[i].consumer)) {
-                        ret = PTR_ERR(consumers[i].consumer);
-                        dev_err(dev, "Failed to get supply '%s': %d\n",
-                                consumers[i].supply, ret);
-                        consumers[i].consumer = NULL;
-                        goto err;
-                }
-        }
-
-        return 0;
-
-err:
-        for (i = 0; i < num_consumers && consumers[i].consumer; i++)
-                devm_regulator_put(consumers[i].consumer);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(devm_regulator_bulk_get);
-
 static void regulator_bulk_enable_async(void *data, async_cookie_t cookie)
 {
         struct regulator_bulk_data *bulk = data;
@@ -3170,7 +3216,8 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
         /* some attributes need specific methods to be displayed */
         if ((ops->get_voltage && ops->get_voltage(rdev) >= 0) ||
             (ops->get_voltage_sel && ops->get_voltage_sel(rdev) >= 0) ||
-            (ops->list_voltage && ops->list_voltage(rdev, 0) >= 0)) {
+            (ops->list_voltage && ops->list_voltage(rdev, 0) >= 0) ||
+                (rdev->desc->fixed_uV && (rdev->desc->n_voltages == 1))) {
                 status = device_create_file(dev, &dev_attr_microvolts);
                 if (status < 0)
                         return status;
@@ -3614,22 +3661,6 @@ void regulator_has_full_constraints(void)
 EXPORT_SYMBOL_GPL(regulator_has_full_constraints);
 
 /**
- * regulator_use_dummy_regulator - Provide a dummy regulator when none is found
- *
- * Calling this function will cause the regulator API to provide a
- * dummy regulator to consumers if no physical regulator is found,
- * allowing most consumers to proceed as though a regulator were
- * configured.  This allows systems such as those with software
- * controllable regulators for the CPU core only to be brought up more
- * readily.
- */
-void regulator_use_dummy_regulator(void)
-{
-        board_wants_dummy_regulator = true;
-}
-EXPORT_SYMBOL_GPL(regulator_use_dummy_regulator);
-
-/**
  * rdev_get_drvdata - get rdev regulator driver data
  * @rdev: regulator
  *
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index f06854cf8cf5..b431ae357fcd 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -253,10 +253,8 @@ static int da9034_set_dvc_voltage_sel(struct regulator_dev *rdev,
 }
 
 static const struct regulator_linear_range da9034_ldo12_ranges[] = {
-        { .min_uV = 1700000, .max_uV = 2050000, .min_sel =  0, .max_sel = 7,
-          .uV_step =  50000 },
-        { .min_uV = 2700000, .max_uV = 3050000, .min_sel =  8, .max_sel = 15,
-          .uV_step =  50000 },
+        REGULATOR_LINEAR_RANGE(1700000, 0, 7, 50000),
+        REGULATOR_LINEAR_RANGE(2700000, 8, 15, 50000),
 };
 
 static struct regulator_ops da903x_regulator_ldo_ops = {
@@ -463,7 +461,7 @@ static int da903x_regulator_probe(struct platform_device *pdev)
         config.init_data = dev_get_platdata(&pdev->dev);
         config.driver_data = ri;
 
-        rdev = regulator_register(&ri->desc, &config);
+        rdev = devm_regulator_register(&pdev->dev, &ri->desc, &config);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc.name);
@@ -474,21 +472,12 @@ static int da903x_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int da903x_regulator_remove(struct platform_device *pdev)
-{
-        struct regulator_dev *rdev = platform_get_drvdata(pdev);
-
-        regulator_unregister(rdev);
-        return 0;
-}
-
 static struct platform_driver da903x_regulator_driver = {
         .driver = {
                 .name   = "da903x-regulator",
                 .owner  = THIS_MODULE,
         },
         .probe          = da903x_regulator_probe,
-        .remove         = da903x_regulator_remove,
 };
 
 static int __init da903x_regulator_init(void)
diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c
index 1e4d483f6163..3adeaeffc485 100644
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
@@ -70,6 +70,7 @@ struct da9052_regulator_info {
         int step_uV;
         int min_uV;
         int max_uV;
+        unsigned char activate_bit;
 };
 
 struct da9052_regulator {
@@ -209,6 +210,36 @@ static int da9052_map_voltage(struct regulator_dev *rdev,
         return sel;
 }
 
+static int da9052_regulator_set_voltage_sel(struct regulator_dev *rdev,
+                                            unsigned int selector)
+{
+        struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
+        struct da9052_regulator_info *info = regulator->info;
+        int id = rdev_get_id(rdev);
+        int ret;
+
+        ret = da9052_reg_update(regulator->da9052, rdev->desc->vsel_reg,
+                                rdev->desc->vsel_mask, selector);
+        if (ret < 0)
+                return ret;
+
+        /* Some LDOs and DCDCs are DVC controlled which requires enabling of
+         * the activate bit to implment the changes on the output.
+         */
+        switch (id) {
+        case DA9052_ID_BUCK1:
+        case DA9052_ID_BUCK2:
+        case DA9052_ID_BUCK3:
+        case DA9052_ID_LDO2:
+        case DA9052_ID_LDO3:
+                ret = da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG,
+                                        info->activate_bit, info->activate_bit);
+                break;
+        }
+
+        return ret;
+}
+
 static struct regulator_ops da9052_dcdc_ops = {
         .get_current_limit = da9052_dcdc_get_current_limit,
         .set_current_limit = da9052_dcdc_set_current_limit,
@@ -216,7 +247,7 @@ static struct regulator_ops da9052_dcdc_ops = {
         .list_voltage = da9052_list_voltage,
         .map_voltage = da9052_map_voltage,
         .get_voltage_sel = regulator_get_voltage_sel_regmap,
-        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .set_voltage_sel = da9052_regulator_set_voltage_sel,
         .is_enabled = regulator_is_enabled_regmap,
         .enable = regulator_enable_regmap,
         .disable = regulator_disable_regmap,
@@ -226,7 +257,7 @@ static struct regulator_ops da9052_ldo_ops = {
         .list_voltage = da9052_list_voltage,
         .map_voltage = da9052_map_voltage,
         .get_voltage_sel = regulator_get_voltage_sel_regmap,
-        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .set_voltage_sel = da9052_regulator_set_voltage_sel,
         .is_enabled = regulator_is_enabled_regmap,
         .enable = regulator_enable_regmap,
         .disable = regulator_disable_regmap,
@@ -243,14 +274,13 @@ static struct regulator_ops da9052_ldo_ops = {
                 .owner = THIS_MODULE,\
                 .vsel_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
                 .vsel_mask = (1 << (sbits)) - 1,\
-                .apply_reg = DA9052_SUPPLY_REG, \
-                .apply_bit = (abits), \
                 .enable_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
                 .enable_mask = 1 << (ebits),\
         },\
         .min_uV = (min) * 1000,\
         .max_uV = (max) * 1000,\
         .step_uV = (step) * 1000,\
+        .activate_bit = (abits),\
 }
 
 #define DA9052_DCDC(_id, step, min, max, sbits, ebits, abits) \
@@ -264,14 +294,13 @@ static struct regulator_ops da9052_ldo_ops = {
                 .owner = THIS_MODULE,\
                 .vsel_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
                 .vsel_mask = (1 << (sbits)) - 1,\
-                .apply_reg = DA9052_SUPPLY_REG, \
-                .apply_bit = (abits), \
                 .enable_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
                 .enable_mask = 1 << (ebits),\
         },\
         .min_uV = (min) * 1000,\
         .max_uV = (max) * 1000,\
         .step_uV = (step) * 1000,\
+        .activate_bit = (abits),\
 }
 
 static struct da9052_regulator_info da9052_regulator_info[] = {
@@ -389,8 +418,9 @@ static int da9052_regulator_probe(struct platform_device *pdev)
 #endif
         }
 
-        regulator->rdev = regulator_register(&regulator->info->reg_desc,
-                                             &config);
+        regulator->rdev = devm_regulator_register(&pdev->dev,
+                                                  &regulator->info->reg_desc,
+                                                  &config);
         if (IS_ERR(regulator->rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                         regulator->info->reg_desc.name);
@@ -402,17 +432,8 @@ static int da9052_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int da9052_regulator_remove(struct platform_device *pdev)
-{
-        struct da9052_regulator *regulator = platform_get_drvdata(pdev);
-
-        regulator_unregister(regulator->rdev);
-        return 0;
-}
-
 static struct platform_driver da9052_regulator_driver = {
         .probe = da9052_regulator_probe,
-        .remove = da9052_regulator_remove,
         .driver = {
                 .name = "da9052-regulator",
                 .owner = THIS_MODULE,
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c
index 77b53e5a231c..7f340206d329 100644
--- a/drivers/regulator/da9055-regulator.c
+++ b/drivers/regulator/da9055-regulator.c
@@ -564,13 +564,13 @@ static int da9055_regulator_probe(struct platform_device *pdev)
         if (ret < 0)
                 return ret;
 
-        regulator->rdev = regulator_register(&regulator->info->reg_desc,
-                                             &config);
+        regulator->rdev = devm_regulator_register(&pdev->dev,
+                                                  &regulator->info->reg_desc,
+                                                  &config);
         if (IS_ERR(regulator->rdev)) {
                 dev_err(&pdev->dev, "Failed to register regulator %s\n",
                         regulator->info->reg_desc.name);
-                ret = PTR_ERR(regulator->rdev);
-                return ret;
+                return PTR_ERR(regulator->rdev);
         }
 
         /* Only LDO 5 and 6 has got the over current interrupt */
@@ -588,7 +588,7 @@ static int da9055_regulator_probe(struct platform_device *pdev)
                                 dev_err(&pdev->dev,
                                 "Failed to request Regulator IRQ %d: %d\n",
                                 irq, ret);
-                                goto err_regulator;
+                                return ret;
                         }
                 }
         }
@@ -596,24 +596,10 @@ static int da9055_regulator_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, regulator);
 
         return 0;
-
-err_regulator:
-        regulator_unregister(regulator->rdev);
-        return ret;
-}
-
-static int da9055_regulator_remove(struct platform_device *pdev)
-{
-        struct da9055_regulator *regulator = platform_get_drvdata(pdev);
-
-        regulator_unregister(regulator->rdev);
-
-        return 0;
 }
 
 static struct platform_driver da9055_regulator_driver = {
         .probe = da9055_regulator_probe,
-        .remove = da9055_regulator_remove,
         .driver = {
                 .name = "da9055-regulator",
                 .owner = THIS_MODULE,
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index b9f2653e4ef9..56727eb745df 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -717,7 +717,7 @@ static int da9063_regulator_probe(struct platform_device *pdev)
 {
         struct da9063 *da9063 = dev_get_drvdata(pdev->dev.parent);
         struct da9063_pdata *da9063_pdata = dev_get_platdata(da9063->dev);
-        struct of_regulator_match *da9063_reg_matches;
+        struct of_regulator_match *da9063_reg_matches = NULL;
         struct da9063_regulators_pdata *regl_pdata;
         const struct da9063_dev_model *model;
         struct da9063_regulators *regulators;
@@ -847,13 +847,13 @@ static int da9063_regulator_probe(struct platform_device *pdev)
                 if (da9063_reg_matches)
                         config.of_node = da9063_reg_matches[id].of_node;
                 config.regmap = da9063->regmap;
-                regl->rdev = regulator_register(&regl->desc, &config);
+                regl->rdev = devm_regulator_register(&pdev->dev, &regl->desc,
+                                                     &config);
                 if (IS_ERR(regl->rdev)) {
                         dev_err(&pdev->dev,
                                 "Failed to register %s regulator\n",
                                 regl->desc.name);
-                        ret = PTR_ERR(regl->rdev);
-                        goto err;
+                        return PTR_ERR(regl->rdev);
                 }
                 id++;
                 n++;
@@ -862,9 +862,8 @@ static int da9063_regulator_probe(struct platform_device *pdev)
         /* LDOs overcurrent event support */
         irq = platform_get_irq_byname(pdev, "LDO_LIM");
         if (irq < 0) {
-                ret = irq;
                 dev_err(&pdev->dev, "Failed to get IRQ.\n");
-                goto err;
+                return irq;
         }
 
         regulators->irq_ldo_lim = regmap_irq_get_virq(da9063->regmap_irq, irq);
@@ -881,27 +880,15 @@ static int da9063_regulator_probe(struct platform_device *pdev)
         }
 
         return 0;
-
-err:
-        /* Wind back regulators registeration */
-        while (--n >= 0)
-                regulator_unregister(regulators->regulator[n].rdev);
-
-        return ret;
 }
 
 static int da9063_regulator_remove(struct platform_device *pdev)
 {
         struct da9063_regulators *regulators = platform_get_drvdata(pdev);
-        struct da9063_regulator *regl;
 
         free_irq(regulators->irq_ldo_lim, regulators);
         free_irq(regulators->irq_uvov, regulators);
 
-        for (regl = &regulators->regulator[regulators->n_regulators - 1];
-             regl >= &regulators->regulator[0]; regl--)
-                regulator_unregister(regl->rdev);
-
         return 0;
 }
 
diff --git a/drivers/regulator/da9210-regulator.c b/drivers/regulator/da9210-regulator.c
index f0fe54b38977..6f5ecbe1132e 100644
--- a/drivers/regulator/da9210-regulator.c
+++ b/drivers/regulator/da9210-regulator.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
 #include <linux/regmap.h>
 
 #include "da9210-regulator.h"
@@ -126,7 +127,8 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
         struct da9210 *chip;
-        struct da9210_pdata *pdata = i2c->dev.platform_data;
+        struct device *dev = &i2c->dev;
+        struct da9210_pdata *pdata = dev_get_platdata(dev);
         struct regulator_dev *rdev = NULL;
         struct regulator_config config = { };
         int error;
@@ -147,12 +149,13 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
         }
 
         config.dev = &i2c->dev;
-        if (pdata)
-                config.init_data = &pdata->da9210_constraints;
+        config.init_data = pdata ? &pdata->da9210_constraints :
+                of_get_regulator_init_data(dev, dev->of_node);
         config.driver_data = chip;
         config.regmap = chip->regmap;
+        config.of_node = dev->of_node;
 
-        rdev = regulator_register(&da9210_reg, &config);
+        rdev = devm_regulator_register(&i2c->dev, &da9210_reg, &config);
         if (IS_ERR(rdev)) {
                 dev_err(&i2c->dev, "Failed to register DA9210 regulator\n");
                 return PTR_ERR(rdev);
@@ -165,13 +168,6 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
         return 0;
 }
 
-static int da9210_i2c_remove(struct i2c_client *i2c)
-{
-        struct da9210 *chip = i2c_get_clientdata(i2c);
-        regulator_unregister(chip->rdev);
-        return 0;
-}
-
 static const struct i2c_device_id da9210_i2c_id[] = {
         {"da9210", 0},
         {},
@@ -185,7 +181,6 @@ static struct i2c_driver da9210_regulator_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = da9210_i2c_probe,
-        .remove = da9210_i2c_remove,
         .id_table = da9210_i2c_id,
 };
 
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
new file mode 100644
index 000000000000..f44818b838dc
--- /dev/null
+++ b/drivers/regulator/devres.c
@@ -0,0 +1,415 @@
+/*
+ * devres.c  --  Voltage/Current Regulator framework devres implementation.
+ *
+ * Copyright 2013 Linaro Ltd
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+#include <linux/regulator/driver.h>
+#include <linux/module.h>
+
+#include "internal.h"
+
+enum {
+        NORMAL_GET,
+        EXCLUSIVE_GET,
+        OPTIONAL_GET,
+};
+
+static void devm_regulator_release(struct device *dev, void *res)
+{
+        regulator_put(*(struct regulator **)res);
+}
+
+static struct regulator *_devm_regulator_get(struct device *dev, const char *id,
+                                             int get_type)
+{
+        struct regulator **ptr, *regulator;
+
+        ptr = devres_alloc(devm_regulator_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+
+        switch (get_type) {
+        case NORMAL_GET:
+                regulator = regulator_get(dev, id);
+                break;
+        case EXCLUSIVE_GET:
+                regulator = regulator_get_exclusive(dev, id);
+                break;
+        case OPTIONAL_GET:
+                regulator = regulator_get_optional(dev, id);
+                break;
+        default:
+                regulator = ERR_PTR(-EINVAL);
+        }
+
+        if (!IS_ERR(regulator)) {
+                *ptr = regulator;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return regulator;
+}
+
+/**
+ * devm_regulator_get - Resource managed regulator_get()
+ * @dev: device for regulator "consumer"
+ * @id: Supply name or regulator ID.
+ *
+ * Managed regulator_get(). Regulators returned from this function are
+ * automatically regulator_put() on driver detach. See regulator_get() for more
+ * information.
+ */
+struct regulator *devm_regulator_get(struct device *dev, const char *id)
+{
+        return _devm_regulator_get(dev, id, NORMAL_GET);
+}
+EXPORT_SYMBOL_GPL(devm_regulator_get);
+
+/**
+ * devm_regulator_get_exclusive - Resource managed regulator_get_exclusive()
+ * @dev: device for regulator "consumer"
+ * @id: Supply name or regulator ID.
+ *
+ * Managed regulator_get_exclusive(). Regulators returned from this function
+ * are automatically regulator_put() on driver detach. See regulator_get() for
+ * more information.
+ */
+struct regulator *devm_regulator_get_exclusive(struct device *dev,
+                                               const char *id)
+{
+        return _devm_regulator_get(dev, id, EXCLUSIVE_GET);
+}
+EXPORT_SYMBOL_GPL(devm_regulator_get_exclusive);
+
+/**
+ * devm_regulator_get_optional - Resource managed regulator_get_optional()
+ * @dev: device for regulator "consumer"
+ * @id: Supply name or regulator ID.
+ *
+ * Managed regulator_get_optional(). Regulators returned from this
+ * function are automatically regulator_put() on driver detach. See
+ * regulator_get_optional() for more information.
+ */
+struct regulator *devm_regulator_get_optional(struct device *dev,
+                                              const char *id)
+{
+        return _devm_regulator_get(dev, id, OPTIONAL_GET);
+}
+EXPORT_SYMBOL_GPL(devm_regulator_get_optional);
+
+static int devm_regulator_match(struct device *dev, void *res, void *data)
+{
+        struct regulator **r = res;
+        if (!r || !*r) {
+                WARN_ON(!r || !*r);
+                return 0;
+        }
+        return *r == data;
+}
+
+/**
+ * devm_regulator_put - Resource managed regulator_put()
+ * @regulator: regulator to free
+ *
+ * Deallocate a regulator allocated with devm_regulator_get(). Normally
+ * this function will not need to be called and the resource management
+ * code will ensure that the resource is freed.
+ */
+void devm_regulator_put(struct regulator *regulator)
+{
+        int rc;
+
+        rc = devres_release(regulator->dev, devm_regulator_release,
+                            devm_regulator_match, regulator);
+        if (rc != 0)
+                WARN_ON(rc);
+}
+EXPORT_SYMBOL_GPL(devm_regulator_put);
+
+/**
+ * devm_regulator_bulk_get - managed get multiple regulator consumers
+ *
+ * @dev:           Device to supply
+ * @num_consumers: Number of consumers to register
+ * @consumers:     Configuration of consumers; clients are stored here.
+ *
+ * @return 0 on success, an errno on failure.
+ *
+ * This helper function allows drivers to get several regulator
+ * consumers in one operation with management, the regulators will
+ * automatically be freed when the device is unbound.  If any of the
+ * regulators cannot be acquired then any regulators that were
+ * allocated will be freed before returning to the caller.
+ */
+int devm_regulator_bulk_get(struct device *dev, int num_consumers,
+                            struct regulator_bulk_data *consumers)
+{
+        int i;
+        int ret;
+
+        for (i = 0; i < num_consumers; i++)
+                consumers[i].consumer = NULL;
+
+        for (i = 0; i < num_consumers; i++) {
+                consumers[i].consumer = devm_regulator_get(dev,
+                                                           consumers[i].supply);
+                if (IS_ERR(consumers[i].consumer)) {
+                        ret = PTR_ERR(consumers[i].consumer);
+                        dev_err(dev, "Failed to get supply '%s': %d\n",
+                                consumers[i].supply, ret);
+                        consumers[i].consumer = NULL;
+                        goto err;
+                }
+        }
+
+        return 0;
+
+err:
+        for (i = 0; i < num_consumers && consumers[i].consumer; i++)
+                devm_regulator_put(consumers[i].consumer);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(devm_regulator_bulk_get);
+
+static void devm_rdev_release(struct device *dev, void *res)
+{
+        regulator_unregister(*(struct regulator_dev **)res);
+}
+
+/**
+ * devm_regulator_register - Resource managed regulator_register()
+ * @regulator_desc: regulator to register
+ * @config: runtime configuration for regulator
+ *
+ * Called by regulator drivers to register a regulator.  Returns a
+ * valid pointer to struct regulator_dev on success or an ERR_PTR() on
+ * error.  The regulator will automatically be released when the device
+ * is unbound.
+ */
+struct regulator_dev *devm_regulator_register(struct device *dev,
+                                  const struct regulator_desc *regulator_desc,
+                                  const struct regulator_config *config)
+{
+        struct regulator_dev **ptr, *rdev;
+
+        ptr = devres_alloc(devm_rdev_release, sizeof(*ptr),
+                           GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+
+        rdev = regulator_register(regulator_desc, config);
+        if (!IS_ERR(rdev)) {
+                *ptr = rdev;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return rdev;
+}
+EXPORT_SYMBOL_GPL(devm_regulator_register);
+
+static int devm_rdev_match(struct device *dev, void *res, void *data)
+{
+        struct regulator_dev **r = res;
+        if (!r || !*r) {
+                WARN_ON(!r || !*r);
+                return 0;
+        }
+        return *r == data;
+}
+
+/**
+ * devm_regulator_unregister - Resource managed regulator_unregister()
+ * @regulator: regulator to free
+ *
+ * Unregister a regulator registered with devm_regulator_register().
+ * Normally this function will not need to be called and the resource
+ * management code will ensure that the resource is freed.
+ */
+void devm_regulator_unregister(struct device *dev, struct regulator_dev *rdev)
+{
+        int rc;
+
+        rc = devres_release(dev, devm_rdev_release, devm_rdev_match, rdev);
+        if (rc != 0)
+                WARN_ON(rc);
+}
+EXPORT_SYMBOL_GPL(devm_regulator_unregister);
+
+struct regulator_supply_alias_match {
+        struct device *dev;
+        const char *id;
+};
+
+static int devm_regulator_match_supply_alias(struct device *dev, void *res,
+                                             void *data)
+{
+        struct regulator_supply_alias_match *match = res;
+        struct regulator_supply_alias_match *target = data;
+
+        return match->dev == target->dev && strcmp(match->id, target->id) == 0;
+}
+
+static void devm_regulator_destroy_supply_alias(struct device *dev, void *res)
+{
+        struct regulator_supply_alias_match *match = res;
+
+        regulator_unregister_supply_alias(match->dev, match->id);
+}
+
+/**
+ * devm_regulator_register_supply_alias - Resource managed
+ * regulator_register_supply_alias()
+ *
+ * @dev: device that will be given as the regulator "consumer"
+ * @id: Supply name or regulator ID
+ * @alias_dev: device that should be used to lookup the supply
+ * @alias_id: Supply name or regulator ID that should be used to lookup the
+ * supply
+ *
+ * The supply alias will automatically be unregistered when the source
+ * device is unbound.
+ */
+int devm_regulator_register_supply_alias(struct device *dev, const char *id,
+                                         struct device *alias_dev,
+                                         const char *alias_id)
+{
+        struct regulator_supply_alias_match *match;
+        int ret;
+
+        match = devres_alloc(devm_regulator_destroy_supply_alias,
+                           sizeof(struct regulator_supply_alias_match),
+                           GFP_KERNEL);
+        if (!match)
+                return -ENOMEM;
+
+        match->dev = dev;
+        match->id = id;
+
+        ret = regulator_register_supply_alias(dev, id, alias_dev, alias_id);
+        if (ret < 0) {
+                devres_free(match);
+                return ret;
+        }
+
+        devres_add(dev, match);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(devm_regulator_register_supply_alias);
+
+/**
+ * devm_regulator_unregister_supply_alias - Resource managed
+ * regulator_unregister_supply_alias()
+ *
+ * @dev: device that will be given as the regulator "consumer"
+ * @id: Supply name or regulator ID
+ *
+ * Unregister an alias registered with
+ * devm_regulator_register_supply_alias(). Normally this function
+ * will not need to be called and the resource management code
+ * will ensure that the resource is freed.
+ */
+void devm_regulator_unregister_supply_alias(struct device *dev, const char *id)
+{
+        struct regulator_supply_alias_match match;
+        int rc;
+
+        match.dev = dev;
+        match.id = id;
+
+        rc = devres_release(dev, devm_regulator_destroy_supply_alias,
+                            devm_regulator_match_supply_alias, &match);
+        if (rc != 0)
+                WARN_ON(rc);
+}
+EXPORT_SYMBOL_GPL(devm_regulator_unregister_supply_alias);
+
+/**
+ * devm_regulator_bulk_register_supply_alias - Managed register
+ * multiple aliases
+ *
+ * @dev: device that will be given as the regulator "consumer"
+ * @id: List of supply names or regulator IDs
+ * @alias_dev: device that should be used to lookup the supply
+ * @alias_id: List of supply names or regulator IDs that should be used to
+ * lookup the supply
+ * @num_id: Number of aliases to register
+ *
+ * @return 0 on success, an errno on failure.
+ *
+ * This helper function allows drivers to register several supply
+ * aliases in one operation, the aliases will be automatically
+ * unregisters when the source device is unbound.  If any of the
+ * aliases cannot be registered any aliases that were registered
+ * will be removed before returning to the caller.
+ */
+int devm_regulator_bulk_register_supply_alias(struct device *dev,
+                                              const char **id,
+                                              struct device *alias_dev,
+                                              const char **alias_id,
+                                              int num_id)
+{
+        int i;
+        int ret;
+
+        for (i = 0; i < num_id; ++i) {
+                ret = devm_regulator_register_supply_alias(dev, id[i],
+                                                           alias_dev,
+                                                           alias_id[i]);
+                if (ret < 0)
+                        goto err;
+        }
+
+        return 0;
+
+err:
+        dev_err(dev,
+                "Failed to create supply alias %s,%s -> %s,%s\n",
+                id[i], dev_name(dev), alias_id[i], dev_name(alias_dev));
+
+        while (--i >= 0)
+                devm_regulator_unregister_supply_alias(dev, id[i]);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(devm_regulator_bulk_register_supply_alias);
+
+/**
+ * devm_regulator_bulk_unregister_supply_alias - Managed unregister
+ * multiple aliases
+ *
+ * @dev: device that will be given as the regulator "consumer"
+ * @id: List of supply names or regulator IDs
+ * @num_id: Number of aliases to unregister
+ *
+ * Unregister aliases registered with
+ * devm_regulator_bulk_register_supply_alias(). Normally this function
+ * will not need to be called and the resource management code
+ * will ensure that the resource is freed.
+ */
+void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
+                                                 const char **id,
+                                                 int num_id)
+{
+        int i;
+
+        for (i = 0; i < num_id; ++i)
+                devm_regulator_unregister_supply_alias(dev, id[i]);
+}
+EXPORT_SYMBOL_GPL(devm_regulator_bulk_unregister_supply_alias);
diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 70b7220c587f..7ca3d9e3b0fe 100644
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -218,9 +218,8 @@ static int fan53555_regulator_register(struct fan53555_device_info *di,
         rdesc->vsel_mask = VSEL_NSEL_MASK;
         rdesc->owner = THIS_MODULE;
 
-        di->rdev = regulator_register(&di->desc, config);
+        di->rdev = devm_regulator_register(di->dev, &di->desc, config);
         return PTR_ERR_OR_ZERO(di->rdev);
-
 }
 
 static struct regmap_config fan53555_regmap_config = {
@@ -291,14 +290,6 @@ static int fan53555_regulator_probe(struct i2c_client *client,
 
 }
 
-static int fan53555_regulator_remove(struct i2c_client *client)
-{
-        struct fan53555_device_info *di = i2c_get_clientdata(client);
-
-        regulator_unregister(di->rdev);
-        return 0;
-}
-
 static const struct i2c_device_id fan53555_id[] = {
         {"fan53555", -1},
         { },
@@ -309,7 +300,6 @@ static struct i2c_driver fan53555_regulator_driver = {
                 .name = "fan53555-regulator",
         },
         .probe = fan53555_regulator_probe,
-        .remove = fan53555_regulator_remove,
         .id_table = fan53555_id,
 };
 
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 7610920014d7..5ea64b94341c 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -34,7 +34,6 @@
 struct fixed_voltage_data {
         struct regulator_desc desc;
         struct regulator_dev *dev;
-        int microvolts;
 };
 
 
@@ -108,30 +107,7 @@ of_get_fixed_voltage_config(struct device *dev)
         return config;
 }
 
-static int fixed_voltage_get_voltage(struct regulator_dev *dev)
-{
-        struct fixed_voltage_data *data = rdev_get_drvdata(dev);
-
-        if (data->microvolts)
-                return data->microvolts;
-        else
-                return -EINVAL;
-}
-
-static int fixed_voltage_list_voltage(struct regulator_dev *dev,
-                                      unsigned selector)
-{
-        struct fixed_voltage_data *data = rdev_get_drvdata(dev);
-
-        if (selector != 0)
-                return -EINVAL;
-
-        return data->microvolts;
-}
-
 static struct regulator_ops fixed_voltage_ops = {
-        .get_voltage = fixed_voltage_get_voltage,
-        .list_voltage = fixed_voltage_list_voltage,
 };
 
 static int reg_fixed_voltage_probe(struct platform_device *pdev)
@@ -186,23 +162,21 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
         if (config->microvolts)
                 drvdata->desc.n_voltages = 1;
 
-        drvdata->microvolts = config->microvolts;
+        drvdata->desc.fixed_uV = config->microvolts;
 
         if (config->gpio >= 0)
                 cfg.ena_gpio = config->gpio;
         cfg.ena_gpio_invert = !config->enable_high;
         if (config->enabled_at_boot) {
-                if (config->enable_high) {
+                if (config->enable_high)
                         cfg.ena_gpio_flags |= GPIOF_OUT_INIT_HIGH;
-                } else {
+                else
                         cfg.ena_gpio_flags |= GPIOF_OUT_INIT_LOW;
-                }
         } else {
-                if (config->enable_high) {
+                if (config->enable_high)
                         cfg.ena_gpio_flags |= GPIOF_OUT_INIT_LOW;
-                } else {
+                else
                         cfg.ena_gpio_flags |= GPIOF_OUT_INIT_HIGH;
-                }
         }
         if (config->gpio_is_open_drain)
                 cfg.ena_gpio_flags |= GPIOF_OPEN_DRAIN;
@@ -222,7 +196,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, drvdata);
 
         dev_dbg(&pdev->dev, "%s supplying %duV\n", drvdata->desc.name,
-                drvdata->microvolts);
+                drvdata->desc.fixed_uV);
 
         return 0;
 
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 98a98ffa7fe0..04406a918c04 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -283,7 +283,6 @@ static int gpio_regulator_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "No regulator type set\n");
                 ret = -EINVAL;
                 goto err_memgpio;
-                break;
         }
 
         drvdata->nr_gpios = config->nr_gpios;
diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c
index 6e30df14714b..e221a271ba56 100644
--- a/drivers/regulator/helpers.c
+++ b/drivers/regulator/helpers.c
@@ -284,9 +284,13 @@ int regulator_map_voltage_linear_range(struct regulator_dev *rdev,
         }
 
         for (i = 0; i < rdev->desc->n_linear_ranges; i++) {
+                int linear_max_uV;
+
                 range = &rdev->desc->linear_ranges[i];
+                linear_max_uV = range->min_uV +
+                        (range->max_sel - range->min_sel) * range->uV_step;
 
-                if (!(min_uV <= range->max_uV && max_uV >= range->min_uV))
+                if (!(min_uV <= linear_max_uV && max_uV >= range->min_uV))
                         continue;
 
                 if (min_uV <= range->min_uV)
diff --git a/drivers/regulator/internal.h b/drivers/regulator/internal.h
new file mode 100644
index 000000000000..84bbda10c396
--- /dev/null
+++ b/drivers/regulator/internal.h
@@ -0,0 +1,38 @@
+/*
+ * internal.h  --  Voltage/Current Regulator framework internal code
+ *
+ * Copyright 2007, 2008 Wolfson Microelectronics PLC.
+ * Copyright 2008 SlimLogic Ltd.
+ *
+ * Author: Liam Girdwood <lrg@slimlogic.co.uk>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#ifndef __REGULATOR_INTERNAL_H
+#define __REGULATOR_INTERNAL_H
+
+/*
+ * struct regulator
+ *
+ * One for each consumer device.
+ */
+struct regulator {
+        struct device *dev;
+        struct list_head list;
+        unsigned int always_on:1;
+        unsigned int bypass:1;
+        int uA_load;
+        int min_uV;
+        int max_uV;
+        char *supply_name;
+        struct device_attribute dev_attr;
+        struct regulator_dev *rdev;
+        struct dentry *debugfs;
+};
+
+#endif
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c
index 88c1a3acf563..6e5da95fa025 100644
--- a/drivers/regulator/isl6271a-regulator.c
+++ b/drivers/regulator/isl6271a-regulator.c
@@ -112,7 +112,7 @@ static int isl6271a_probe(struct i2c_client *i2c,
         struct regulator_config config = { };
         struct regulator_init_data *init_data   = dev_get_platdata(&i2c->dev);
         struct isl_pmic *pmic;
-        int err, i;
+        int i;
 
         if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                 return -EIO;
@@ -133,32 +133,17 @@ static int isl6271a_probe(struct i2c_client *i2c,
                         config.init_data = NULL;
                 config.driver_data = pmic;
 
-                pmic->rdev[i] = regulator_register(&isl_rd[i], &config);
+                pmic->rdev[i] = devm_regulator_register(&i2c->dev, &isl_rd[i],
+                                                        &config);
                 if (IS_ERR(pmic->rdev[i])) {
                         dev_err(&i2c->dev, "failed to register %s\n", id->name);
-                        err = PTR_ERR(pmic->rdev[i]);
-                        goto error;
+                        return PTR_ERR(pmic->rdev[i]);
                 }
         }
 
         i2c_set_clientdata(i2c, pmic);
 
         return 0;
-
-error:
-        while (--i >= 0)
-                regulator_unregister(pmic->rdev[i]);
-        return err;
-}
-
-static int isl6271a_remove(struct i2c_client *i2c)
-{
-        struct isl_pmic *pmic = i2c_get_clientdata(i2c);
-        int i;
-
-        for (i = 0; i < 3; i++)
-                regulator_unregister(pmic->rdev[i]);
-        return 0;
 }
 
 static const struct i2c_device_id isl6271a_id[] = {
@@ -174,7 +159,6 @@ static struct i2c_driver isl6271a_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = isl6271a_probe,
-        .remove = isl6271a_remove,
         .id_table = isl6271a_id,
 };
 
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
index 5a4604ee5ea5..947c05ffe0ab 100644
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@ -474,8 +474,8 @@ static int lp3971_i2c_remove(struct i2c_client *i2c)
 }
 
 static const struct i2c_device_id lp3971_i2c_id[] = {
-       { "lp3971", 0 },
-       { }
+        { "lp3971", 0 },
+        { }
 };
 MODULE_DEVICE_TABLE(i2c, lp3971_i2c_id);
 
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c
index 2b84b727a3c4..2e4734ff79fc 100644
--- a/drivers/regulator/lp872x.c
+++ b/drivers/regulator/lp872x.c
@@ -785,7 +785,7 @@ static int lp872x_regulator_register(struct lp872x *lp)
         struct regulator_desc *desc;
         struct regulator_config cfg = { };
         struct regulator_dev *rdev;
-        int i, ret;
+        int i;
 
         for (i = 0; i < lp->num_regulators; i++) {
                 desc = (lp->chipid == LP8720) ? &lp8720_regulator_desc[i] :
@@ -796,34 +796,16 @@ static int lp872x_regulator_register(struct lp872x *lp)
                 cfg.driver_data = lp;
                 cfg.regmap = lp->regmap;
 
-                rdev = regulator_register(desc, &cfg);
+                rdev = devm_regulator_register(lp->dev, desc, &cfg);
                 if (IS_ERR(rdev)) {
                         dev_err(lp->dev, "regulator register err");
-                        ret =  PTR_ERR(rdev);
-                        goto err;
+                        return PTR_ERR(rdev);
                 }
 
                 *(lp->regulators + i) = rdev;
         }
 
         return 0;
-err:
-        while (--i >= 0) {
-                rdev = *(lp->regulators + i);
-                regulator_unregister(rdev);
-        }
-        return ret;
-}
-
-static void lp872x_regulator_unregister(struct lp872x *lp)
-{
-        struct regulator_dev *rdev;
-        int i;
-
-        for (i = 0; i < lp->num_regulators; i++) {
-                rdev = *(lp->regulators + i);
-                regulator_unregister(rdev);
-        }
 }
 
 static const struct regmap_config lp872x_regmap_config = {
@@ -979,14 +961,6 @@ err_dev:
         return ret;
 }
 
-static int lp872x_remove(struct i2c_client *cl)
-{
-        struct lp872x *lp = i2c_get_clientdata(cl);
-
-        lp872x_regulator_unregister(lp);
-        return 0;
-}
-
 static const struct of_device_id lp872x_dt_ids[] = {
         { .compatible = "ti,lp8720", },
         { .compatible = "ti,lp8725", },
@@ -1008,7 +982,6 @@ static struct i2c_driver lp872x_driver = {
                 .of_match_table = of_match_ptr(lp872x_dt_ids),
         },
         .probe = lp872x_probe,
-        .remove = lp872x_remove,
         .id_table = lp872x_ids,
 };
 
diff --git a/drivers/regulator/lp8788-buck.c b/drivers/regulator/lp8788-buck.c
index 0b015f2a7fd9..948afc249e29 100644
--- a/drivers/regulator/lp8788-buck.c
+++ b/drivers/regulator/lp8788-buck.c
@@ -515,7 +515,7 @@ static int lp8788_buck_probe(struct platform_device *pdev)
         cfg.driver_data = buck;
         cfg.regmap = lp->regmap;
 
-        rdev = regulator_register(&lp8788_buck_desc[id], &cfg);
+        rdev = devm_regulator_register(&pdev->dev, &lp8788_buck_desc[id], &cfg);
         if (IS_ERR(rdev)) {
                 ret = PTR_ERR(rdev);
                 dev_err(&pdev->dev, "BUCK%d regulator register err = %d\n",
@@ -529,18 +529,8 @@ static int lp8788_buck_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int lp8788_buck_remove(struct platform_device *pdev)
-{
-        struct lp8788_buck *buck = platform_get_drvdata(pdev);
-
-        regulator_unregister(buck->regulator);
-
-        return 0;
-}
-
 static struct platform_driver lp8788_buck_driver = {
         .probe = lp8788_buck_probe,
-        .remove = lp8788_buck_remove,
         .driver = {
                 .name = LP8788_DEV_BUCK,
                 .owner = THIS_MODULE,
diff --git a/drivers/regulator/lp8788-ldo.c b/drivers/regulator/lp8788-ldo.c
index 0527d87c6dd5..b9a29a29933f 100644
--- a/drivers/regulator/lp8788-ldo.c
+++ b/drivers/regulator/lp8788-ldo.c
@@ -543,7 +543,7 @@ static int lp8788_dldo_probe(struct platform_device *pdev)
         cfg.driver_data = ldo;
         cfg.regmap = lp->regmap;
 
-        rdev = regulator_register(&lp8788_dldo_desc[id], &cfg);
+        rdev = devm_regulator_register(&pdev->dev, &lp8788_dldo_desc[id], &cfg);
         if (IS_ERR(rdev)) {
                 ret = PTR_ERR(rdev);
                 dev_err(&pdev->dev, "DLDO%d regulator register err = %d\n",
@@ -557,18 +557,8 @@ static int lp8788_dldo_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int lp8788_dldo_remove(struct platform_device *pdev)
-{
-        struct lp8788_ldo *ldo = platform_get_drvdata(pdev);
-
-        regulator_unregister(ldo->regulator);
-
-        return 0;
-}
-
 static struct platform_driver lp8788_dldo_driver = {
         .probe = lp8788_dldo_probe,
-        .remove = lp8788_dldo_remove,
         .driver = {
                 .name = LP8788_DEV_DLDO,
                 .owner = THIS_MODULE,
@@ -603,7 +593,7 @@ static int lp8788_aldo_probe(struct platform_device *pdev)
         cfg.driver_data = ldo;
         cfg.regmap = lp->regmap;
 
-        rdev = regulator_register(&lp8788_aldo_desc[id], &cfg);
+        rdev = devm_regulator_register(&pdev->dev, &lp8788_aldo_desc[id], &cfg);
         if (IS_ERR(rdev)) {
                 ret = PTR_ERR(rdev);
                 dev_err(&pdev->dev, "ALDO%d regulator register err = %d\n",
@@ -617,18 +607,8 @@ static int lp8788_aldo_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int lp8788_aldo_remove(struct platform_device *pdev)
-{
-        struct lp8788_ldo *ldo = platform_get_drvdata(pdev);
-
-        regulator_unregister(ldo->regulator);
-
-        return 0;
-}
-
 static struct platform_driver lp8788_aldo_driver = {
         .probe = lp8788_aldo_probe,
-        .remove = lp8788_aldo_remove,
         .driver = {
                 .name = LP8788_DEV_ALDO,
                 .owner = THIS_MODULE,
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c
index 3a599ee0a456..e242dd316d36 100644
--- a/drivers/regulator/max1586.c
+++ b/drivers/regulator/max1586.c
@@ -166,7 +166,7 @@ static int max1586_pmic_probe(struct i2c_client *client,
         struct max1586_platform_data *pdata = dev_get_platdata(&client->dev);
         struct regulator_config config = { };
         struct max1586_data *max1586;
-        int i, id, ret = -ENOMEM;
+        int i, id;
 
         max1586 = devm_kzalloc(&client->dev, sizeof(struct max1586_data) +
                         sizeof(struct regulator_dev *) * (MAX1586_V6 + 1),
@@ -193,7 +193,7 @@ static int max1586_pmic_probe(struct i2c_client *client,
                         continue;
                 if (id < MAX1586_V3 || id > MAX1586_V6) {
                         dev_err(&client->dev, "invalid regulator id %d\n", id);
-                        goto err;
+                        return -EINVAL;
                 }
 
                 if (id == MAX1586_V3) {
@@ -207,33 +207,18 @@ static int max1586_pmic_probe(struct i2c_client *client,
                 config.init_data = pdata->subdevs[i].platform_data;
                 config.driver_data = max1586;
 
-                rdev[i] = regulator_register(&max1586_reg[id], &config);
+                rdev[i] = devm_regulator_register(&client->dev,
+                                                  &max1586_reg[id], &config);
                 if (IS_ERR(rdev[i])) {
-                        ret = PTR_ERR(rdev[i]);
                         dev_err(&client->dev, "failed to register %s\n",
                                 max1586_reg[id].name);
-                        goto err;
+                        return PTR_ERR(rdev[i]);
                 }
         }
 
         i2c_set_clientdata(client, max1586);
         dev_info(&client->dev, "Maxim 1586 regulator driver loaded\n");
         return 0;
-
-err:
-        while (--i >= 0)
-                regulator_unregister(rdev[i]);
-        return ret;
-}
-
-static int max1586_pmic_remove(struct i2c_client *client)
-{
-        struct max1586_data *max1586 = i2c_get_clientdata(client);
-        int i;
-
-        for (i = 0; i <= MAX1586_V6; i++)
-                regulator_unregister(max1586->rdev[i]);
-        return 0;
 }
 
 static const struct i2c_device_id max1586_id[] = {
@@ -244,7 +229,6 @@ MODULE_DEVICE_TABLE(i2c, max1586_id);
 
 static struct i2c_driver max1586_pmic_driver = {
         .probe = max1586_pmic_probe,
-        .remove = max1586_pmic_remove,
         .driver         = {
                 .name   = "max1586",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c
index f563057e5690..ae001ccf26f4 100644
--- a/drivers/regulator/max77686.c
+++ b/drivers/regulator/max77686.c
@@ -478,32 +478,16 @@ static int max77686_pmic_probe(struct platform_device *pdev)
                 config.of_node = pdata->regulators[i].of_node;
 
                 max77686->opmode[i] = regulators[i].enable_mask;
-                max77686->rdev[i] = regulator_register(&regulators[i], &config);
+                max77686->rdev[i] = devm_regulator_register(&pdev->dev,
+                                                &regulators[i], &config);
                 if (IS_ERR(max77686->rdev[i])) {
-                        ret = PTR_ERR(max77686->rdev[i]);
                         dev_err(&pdev->dev,
                                 "regulator init failed for %d\n", i);
-                        max77686->rdev[i] = NULL;
-                        goto err;
+                        return PTR_ERR(max77686->rdev[i]);
                 }
         }
 
         return 0;
-err:
-        while (--i >= 0)
-                regulator_unregister(max77686->rdev[i]);
-        return ret;
-}
-
-static int max77686_pmic_remove(struct platform_device *pdev)
-{
-        struct max77686_data *max77686 = platform_get_drvdata(pdev);
-        int i;
-
-        for (i = 0; i < MAX77686_REGULATORS; i++)
-                regulator_unregister(max77686->rdev[i]);
-
-        return 0;
 }
 
 static const struct platform_device_id max77686_pmic_id[] = {
@@ -518,7 +502,6 @@ static struct platform_driver max77686_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max77686_pmic_probe,
-        .remove = max77686_pmic_remove,
         .id_table = max77686_pmic_id,
 };
 
diff --git a/drivers/regulator/max77693.c b/drivers/regulator/max77693.c
index ce4b96c15eba..feb20bf4ccab 100644
--- a/drivers/regulator/max77693.c
+++ b/drivers/regulator/max77693.c
@@ -230,7 +230,7 @@ static int max77693_pmic_probe(struct platform_device *pdev)
         struct max77693_dev *iodev = dev_get_drvdata(pdev->dev.parent);
         struct max77693_pmic_dev *max77693_pmic;
         struct max77693_regulator_data *rdata = NULL;
-        int num_rdata, i, ret;
+        int num_rdata, i;
         struct regulator_config config;
 
         num_rdata = max77693_pmic_init_rdata(&pdev->dev, &rdata);
@@ -266,36 +266,16 @@ static int max77693_pmic_probe(struct platform_device *pdev)
                 config.init_data = rdata[i].initdata;
                 config.of_node = rdata[i].of_node;
 
-                max77693_pmic->rdev[i] = regulator_register(&regulators[id],
-                                                            &config);
+                max77693_pmic->rdev[i] = devm_regulator_register(&pdev->dev,
+                                                &regulators[id], &config);
                 if (IS_ERR(max77693_pmic->rdev[i])) {
-                        ret = PTR_ERR(max77693_pmic->rdev[i]);
                         dev_err(max77693_pmic->dev,
                                 "Failed to initialize regulator-%d\n", id);
-                        max77693_pmic->rdev[i] = NULL;
-                        goto err;
+                        return PTR_ERR(max77693_pmic->rdev[i]);
                 }
         }
 
         return 0;
- err:
-        while (--i >= 0)
-                regulator_unregister(max77693_pmic->rdev[i]);
-
-        return ret;
-}
-
-static int max77693_pmic_remove(struct platform_device *pdev)
-{
-        struct max77693_pmic_dev *max77693_pmic = platform_get_drvdata(pdev);
-        struct regulator_dev **rdev = max77693_pmic->rdev;
-        int i;
-
-        for (i = 0; i < max77693_pmic->num_regulators; i++)
-                if (rdev[i])
-                        regulator_unregister(rdev[i]);
-
-        return 0;
 }
 
 static const struct platform_device_id max77693_pmic_id[] = {
@@ -311,7 +291,6 @@ static struct platform_driver max77693_pmic_driver = {
                    .owner = THIS_MODULE,
                    },
         .probe = max77693_pmic_probe,
-        .remove = max77693_pmic_remove,
         .id_table = max77693_pmic_id,
 };
 
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index 19c6f08eafd5..7f049c92ee52 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -234,7 +234,8 @@ static int max8649_regulator_probe(struct i2c_client *client,
         config.driver_data = info;
         config.regmap = info->regmap;
 
-        info->regulator = regulator_register(&dcdc_desc, &config);
+        info->regulator = devm_regulator_register(&client->dev, &dcdc_desc,
+                                                  &config);
         if (IS_ERR(info->regulator)) {
                 dev_err(info->dev, "failed to register regulator %s\n",
                         dcdc_desc.name);
@@ -244,16 +245,6 @@ static int max8649_regulator_probe(struct i2c_client *client,
         return 0;
 }
 
-static int max8649_regulator_remove(struct i2c_client *client)
-{
-        struct max8649_regulator_info *info = i2c_get_clientdata(client);
-
-        if (info)
-                regulator_unregister(info->regulator);
-
-        return 0;
-}
-
 static const struct i2c_device_id max8649_id[] = {
         { "max8649", 0 },
         { }
@@ -262,7 +253,6 @@ MODULE_DEVICE_TABLE(i2c, max8649_id);
 
 static struct i2c_driver max8649_driver = {
         .probe          = max8649_regulator_probe,
-        .remove         = max8649_regulator_remove,
         .driver         = {
                 .name   = "max8649",
         },
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index 144bcacd734d..8d94d3d7f97f 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -439,7 +439,7 @@ static int max8660_probe(struct i2c_client *client,
         for (i = 0; i < pdata->num_subdevs; i++) {
 
                 if (!pdata->subdevs[i].platform_data)
-                        goto err_out;
+                        return ret;
 
                 boot_on = pdata->subdevs[i].platform_data->constraints.boot_on;
 
@@ -465,7 +465,7 @@ static int max8660_probe(struct i2c_client *client,
                 case MAX8660_V7:
                         if (type == MAX8661) {
                                 dev_err(dev, "Regulator not on this chip!\n");
-                                goto err_out;
+                                return -EINVAL;
                         }
 
                         if (boot_on)
@@ -475,7 +475,7 @@ static int max8660_probe(struct i2c_client *client,
                 default:
                         dev_err(dev, "invalid regulator %s\n",
                                  pdata->subdevs[i].name);
-                        goto err_out;
+                        return ret;
                 }
         }
 
@@ -489,33 +489,18 @@ static int max8660_probe(struct i2c_client *client,
                 config.of_node = of_node[i];
                 config.driver_data = max8660;
 
-                rdev[i] = regulator_register(&max8660_reg[id], &config);
+                rdev[i] = devm_regulator_register(&client->dev,
+                                                  &max8660_reg[id], &config);
                 if (IS_ERR(rdev[i])) {
                         ret = PTR_ERR(rdev[i]);
-                        dev_err(dev, "failed to register %s\n",
+                        dev_err(&client->dev, "failed to register %s\n",
                                 max8660_reg[id].name);
-                        goto err_unregister;
+                        return PTR_ERR(rdev[i]);
                 }
         }
 
         i2c_set_clientdata(client, max8660);
         return 0;
-
-err_unregister:
-        while (--i >= 0)
-                regulator_unregister(rdev[i]);
-err_out:
-        return ret;
-}
-
-static int max8660_remove(struct i2c_client *client)
-{
-        struct max8660 *max8660 = i2c_get_clientdata(client);
-        int i;
-
-        for (i = 0; i < MAX8660_V_END; i++)
-                regulator_unregister(max8660->rdev[i]);
-        return 0;
 }
 
 static const struct i2c_device_id max8660_id[] = {
@@ -527,7 +512,6 @@ MODULE_DEVICE_TABLE(i2c, max8660_id);
 
 static struct i2c_driver max8660_driver = {
         .probe = max8660_probe,
-        .remove = max8660_remove,
         .driver         = {
                 .name   = "max8660",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/max8907-regulator.c b/drivers/regulator/max8907-regulator.c
index 4568c15fa78d..0c5fe6c6ac26 100644
--- a/drivers/regulator/max8907-regulator.c
+++ b/drivers/regulator/max8907-regulator.c
@@ -350,33 +350,17 @@ static int max8907_regulator_probe(struct platform_device *pdev)
                                 pmic->desc[i].ops = &max8907_out5v_hwctl_ops;
                 }
 
-                pmic->rdev[i] = regulator_register(&pmic->desc[i], &config);
+                pmic->rdev[i] = devm_regulator_register(&pdev->dev,
+                                                &pmic->desc[i], &config);
                 if (IS_ERR(pmic->rdev[i])) {
                         dev_err(&pdev->dev,
                                 "failed to register %s regulator\n",
                                 pmic->desc[i].name);
-                        ret = PTR_ERR(pmic->rdev[i]);
-                        goto err_unregister_regulator;
+                        return PTR_ERR(pmic->rdev[i]);
                 }
         }
 
         return 0;
-
-err_unregister_regulator:
-        while (--i >= 0)
-                regulator_unregister(pmic->rdev[i]);
-        return ret;
-}
-
-static int max8907_regulator_remove(struct platform_device *pdev)
-{
-        struct max8907_regulator *pmic = platform_get_drvdata(pdev);
-        int i;
-
-        for (i = 0; i < MAX8907_NUM_REGULATORS; i++)
-                regulator_unregister(pmic->rdev[i]);
-
-        return 0;
 }
 
 static struct platform_driver max8907_regulator_driver = {
@@ -385,7 +369,6 @@ static struct platform_driver max8907_regulator_driver = {
                    .owner = THIS_MODULE,
                    },
         .probe = max8907_regulator_probe,
-        .remove = max8907_regulator_remove,
 };
 
 static int __init max8907_regulator_init(void)
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
index d80b5fa758ae..759510789e71 100644
--- a/drivers/regulator/max8925-regulator.c
+++ b/drivers/regulator/max8925-regulator.c
@@ -312,7 +312,7 @@ static int max8925_regulator_probe(struct platform_device *pdev)
                 if (pdata)
                         config.init_data = pdata;
 
-        rdev = regulator_register(&ri->desc, &config);
+        rdev = devm_regulator_register(&pdev->dev, &ri->desc, &config);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc.name);
@@ -323,22 +323,12 @@ static int max8925_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int max8925_regulator_remove(struct platform_device *pdev)
-{
-        struct regulator_dev *rdev = platform_get_drvdata(pdev);
-
-        regulator_unregister(rdev);
-
-        return 0;
-}
-
 static struct platform_driver max8925_regulator_driver = {
         .driver         = {
                 .name   = "max8925-regulator",
                 .owner  = THIS_MODULE,
         },
         .probe          = max8925_regulator_probe,
-        .remove         = max8925_regulator_remove,
 };
 
 static int __init max8925_regulator_init(void)
diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
index 5b77ab7762e4..892aa1e5b96c 100644
--- a/drivers/regulator/max8973-regulator.c
+++ b/drivers/regulator/max8973-regulator.c
@@ -467,7 +467,7 @@ static int max8973_probe(struct i2c_client *client,
         config.regmap = max->regmap;
 
         /* Register the regulators */
-        rdev = regulator_register(&max->desc, &config);
+        rdev = devm_regulator_register(&client->dev, &max->desc, &config);
         if (IS_ERR(rdev)) {
                 ret = PTR_ERR(rdev);
                 dev_err(max->dev, "regulator register failed, err %d\n", ret);
@@ -478,14 +478,6 @@ static int max8973_probe(struct i2c_client *client,
         return 0;
 }
 
-static int max8973_remove(struct i2c_client *client)
-{
-        struct max8973_chip *max = i2c_get_clientdata(client);
-
-        regulator_unregister(max->rdev);
-        return 0;
-}
-
 static const struct i2c_device_id max8973_id[] = {
         {.name = "max8973",},
         {},
@@ -499,7 +491,6 @@ static struct i2c_driver max8973_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max8973_probe,
-        .remove = max8973_remove,
         .id_table = max8973_id,
 };
 
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index df20069f0537..2d618fc9c1af 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -690,8 +690,9 @@ static int max8997_set_voltage_buck(struct regulator_dev *rdev,
         if (max8997->ignore_gpiodvs_side_effect == false)
                 return -EINVAL;
 
-        dev_warn(&rdev->dev, "MAX8997 GPIO-DVS Side Effect Warning: GPIO SET:"
-                        " %d -> %d\n", max8997->buck125_gpioindex, tmp_idx);
+        dev_warn(&rdev->dev,
+                "MAX8997 GPIO-DVS Side Effect Warning: GPIO SET:  %d -> %d\n",
+                max8997->buck125_gpioindex, tmp_idx);
 
 out:
         if (new_idx < 0 || new_val < 0)
@@ -1081,7 +1082,7 @@ static int max8997_pmic_probe(struct platform_device *pdev)
                                         pdata->buck1_voltage[i] +
                                         buck1245_voltage_map_desc.step);
                 if (ret < 0)
-                        goto err_out;
+                        return ret;
 
                 max8997->buck2_vol[i] = ret =
                         max8997_get_voltage_proper_val(
@@ -1090,7 +1091,7 @@ static int max8997_pmic_probe(struct platform_device *pdev)
                                         pdata->buck2_voltage[i] +
                                         buck1245_voltage_map_desc.step);
                 if (ret < 0)
-                        goto err_out;
+                        return ret;
 
                 max8997->buck5_vol[i] = ret =
                         max8997_get_voltage_proper_val(
@@ -1099,7 +1100,7 @@ static int max8997_pmic_probe(struct platform_device *pdev)
                                         pdata->buck5_voltage[i] +
                                         buck1245_voltage_map_desc.step);
                 if (ret < 0)
-                        goto err_out;
+                        return ret;
 
                 if (max_buck1 < max8997->buck1_vol[i])
                         max_buck1 = max8997->buck1_vol[i];
@@ -1143,24 +1144,23 @@ static int max8997_pmic_probe(struct platform_device *pdev)
                                 !gpio_is_valid(pdata->buck125_gpios[1]) ||
                                 !gpio_is_valid(pdata->buck125_gpios[2])) {
                         dev_err(&pdev->dev, "GPIO NOT VALID\n");
-                        ret = -EINVAL;
-                        goto err_out;
+                        return -EINVAL;
                 }
 
                 ret = devm_gpio_request(&pdev->dev, pdata->buck125_gpios[0],
                                         "MAX8997 SET1");
                 if (ret)
-                        goto err_out;
+                        return ret;
 
                 ret = devm_gpio_request(&pdev->dev, pdata->buck125_gpios[1],
                                         "MAX8997 SET2");
                 if (ret)
-                        goto err_out;
+                        return ret;
 
                 ret = devm_gpio_request(&pdev->dev, pdata->buck125_gpios[2],
                                 "MAX8997 SET3");
                 if (ret)
-                        goto err_out;
+                        return ret;
 
                 gpio_direction_output(pdata->buck125_gpios[0],
                                 (max8997->buck125_gpioindex >> 2)
@@ -1205,33 +1205,16 @@ static int max8997_pmic_probe(struct platform_device *pdev)
                 config.driver_data = max8997;
                 config.of_node = pdata->regulators[i].reg_node;
 
-                rdev[i] = regulator_register(&regulators[id], &config);
+                rdev[i] = devm_regulator_register(&pdev->dev, &regulators[id],
+                                                  &config);
                 if (IS_ERR(rdev[i])) {
-                        ret = PTR_ERR(rdev[i]);
                         dev_err(max8997->dev, "regulator init failed for %d\n",
                                         id);
-                        rdev[i] = NULL;
-                        goto err;
+                        return PTR_ERR(rdev[i]);
                 }
         }
 
         return 0;
-err:
-        while (--i >= 0)
-                regulator_unregister(rdev[i]);
-err_out:
-        return ret;
-}
-
-static int max8997_pmic_remove(struct platform_device *pdev)
-{
-        struct max8997_data *max8997 = platform_get_drvdata(pdev);
-        struct regulator_dev **rdev = max8997->rdev;
-        int i;
-
-        for (i = 0; i < max8997->num_regulators; i++)
-                regulator_unregister(rdev[i]);
-        return 0;
 }
 
 static const struct platform_device_id max8997_pmic_id[] = {
@@ -1246,7 +1229,6 @@ static struct platform_driver max8997_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max8997_pmic_probe,
-        .remove = max8997_pmic_remove,
         .id_table = max8997_pmic_id,
 };
 
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index a4c53b2d1aaf..ae3f0656feb0 100644
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -790,16 +790,14 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev,
                                 "MAX8998 SET1 GPIO defined as 0 !\n");
                         WARN_ON(!pdata->buck1_set1);
-                        ret = -EIO;
-                        goto err_out;
+                        return -EIO;
                 }
                 /* Check if SET2 is not equal to 0 */
                 if (!pdata->buck1_set2) {
                         dev_err(&pdev->dev,
                                 "MAX8998 SET2 GPIO defined as 0 !\n");
                         WARN_ON(!pdata->buck1_set2);
-                        ret = -EIO;
-                        goto err_out;
+                        return -EIO;
                 }
 
                 gpio_request(pdata->buck1_set1, "MAX8998 BUCK1_SET1");
@@ -823,7 +821,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                         ret = max8998_write_reg(i2c,
                                         MAX8998_REG_BUCK1_VOLTAGE1 + v, i);
                         if (ret)
-                                goto err_out;
+                                return ret;
                 }
         }
 
@@ -833,8 +831,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev,
                                 "MAX8998 SET3 GPIO defined as 0 !\n");
                         WARN_ON(!pdata->buck2_set3);
-                        ret = -EIO;
-                        goto err_out;
+                        return -EIO;
                 }
                 gpio_request(pdata->buck2_set3, "MAX8998 BUCK2_SET3");
                 gpio_direction_output(pdata->buck2_set3,
@@ -852,7 +849,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                         ret = max8998_write_reg(i2c,
                                         MAX8998_REG_BUCK2_VOLTAGE1 + v, i);
                         if (ret)
-                                goto err_out;
+                                return ret;
                 }
         }
 
@@ -875,34 +872,19 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                 config.init_data = pdata->regulators[i].initdata;
                 config.driver_data = max8998;
 
-                rdev[i] = regulator_register(&regulators[index], &config);
+                rdev[i] = devm_regulator_register(&pdev->dev,
+                                                  &regulators[index], &config);
                 if (IS_ERR(rdev[i])) {
                         ret = PTR_ERR(rdev[i]);
                         dev_err(max8998->dev, "regulator %s init failed (%d)\n",
                                                 regulators[index].name, ret);
                         rdev[i] = NULL;
-                        goto err;
+                        return ret;
                 }
         }
 
 
         return 0;
-err:
-        while (--i >= 0)
-                regulator_unregister(rdev[i]);
-err_out:
-        return ret;
-}
-
-static int max8998_pmic_remove(struct platform_device *pdev)
-{
-        struct max8998_data *max8998 = platform_get_drvdata(pdev);
-        struct regulator_dev **rdev = max8998->rdev;
-        int i;
-
-        for (i = 0; i < max8998->num_regulators; i++)
-                regulator_unregister(rdev[i]);
-        return 0;
 }
 
 static const struct platform_device_id max8998_pmic_id[] = {
@@ -918,7 +900,6 @@ static struct platform_driver max8998_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max8998_pmic_probe,
-        .remove = max8998_pmic_remove,
         .id_table = max8998_pmic_id,
 };
 
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c
index 5ff99d2703db..7f4a67edf780 100644
--- a/drivers/regulator/mc13783-regulator.c
+++ b/drivers/regulator/mc13783-regulator.c
@@ -258,34 +258,34 @@ static struct mc13xxx_regulator mc13783_regulators[] = {
 
         MC13783_FIXED_DEFINE(REG, VAUDIO, REGULATORMODE0, mc13783_vaudio_val),
         MC13783_FIXED_DEFINE(REG, VIOHI, REGULATORMODE0, mc13783_viohi_val),
-        MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0, REGULATORSETTING0,   \
+        MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0, REGULATORSETTING0,
                             mc13783_violo_val),
-        MC13783_DEFINE_REGU(VDIG, REGULATORMODE0, REGULATORSETTING0,    \
+        MC13783_DEFINE_REGU(VDIG, REGULATORMODE0, REGULATORSETTING0,
                             mc13783_vdig_val),
-        MC13783_DEFINE_REGU(VGEN, REGULATORMODE0, REGULATORSETTING0,    \
+        MC13783_DEFINE_REGU(VGEN, REGULATORMODE0, REGULATORSETTING0,
                             mc13783_vgen_val),
-        MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0, REGULATORSETTING0,  \
+        MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0, REGULATORSETTING0,
                             mc13783_vrfdig_val),
-        MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0, REGULATORSETTING0,  \
+        MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0, REGULATORSETTING0,
                             mc13783_vrfref_val),
-        MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0, REGULATORSETTING0,   \
+        MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0, REGULATORSETTING0,
                             mc13783_vrfcp_val),
-        MC13783_DEFINE_REGU(VSIM, REGULATORMODE1, REGULATORSETTING0,    \
+        MC13783_DEFINE_REGU(VSIM, REGULATORMODE1, REGULATORSETTING0,
                             mc13783_vsim_val),
-        MC13783_DEFINE_REGU(VESIM, REGULATORMODE1, REGULATORSETTING0,   \
+        MC13783_DEFINE_REGU(VESIM, REGULATORMODE1, REGULATORSETTING0,
                             mc13783_vesim_val),
-        MC13783_DEFINE_REGU(VCAM, REGULATORMODE1, REGULATORSETTING0,    \
+        MC13783_DEFINE_REGU(VCAM, REGULATORMODE1, REGULATORSETTING0,
                             mc13783_vcam_val),
         MC13783_FIXED_DEFINE(REG, VRFBG, REGULATORMODE1, mc13783_vrfbg_val),
-        MC13783_DEFINE_REGU(VVIB, REGULATORMODE1, REGULATORSETTING1,    \
+        MC13783_DEFINE_REGU(VVIB, REGULATORMODE1, REGULATORSETTING1,
                             mc13783_vvib_val),
-        MC13783_DEFINE_REGU(VRF1, REGULATORMODE1, REGULATORSETTING1,    \
+        MC13783_DEFINE_REGU(VRF1, REGULATORMODE1, REGULATORSETTING1,
                             mc13783_vrf_val),
-        MC13783_DEFINE_REGU(VRF2, REGULATORMODE1, REGULATORSETTING1,    \
+        MC13783_DEFINE_REGU(VRF2, REGULATORMODE1, REGULATORSETTING1,
                             mc13783_vrf_val),
-        MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1, REGULATORSETTING1,   \
+        MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1, REGULATORSETTING1,
                             mc13783_vmmc_val),
-        MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1, REGULATORSETTING1,   \
+        MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1, REGULATORSETTING1,
                             mc13783_vmmc_val),
         MC13783_GPO_DEFINE(REG, GPO1, POWERMISC, mc13783_gpo_val),
         MC13783_GPO_DEFINE(REG, GPO2, POWERMISC, mc13783_gpo_val),
@@ -400,7 +400,7 @@ static int mc13783_regulator_probe(struct platform_device *pdev)
                 dev_get_platdata(&pdev->dev);
         struct mc13xxx_regulator_init_data *mc13xxx_data;
         struct regulator_config config = { };
-        int i, ret, num_regulators;
+        int i, num_regulators;
 
         num_regulators = mc13xxx_get_num_regulators_dt(pdev);
 
@@ -444,32 +444,16 @@ static int mc13783_regulator_probe(struct platform_device *pdev)
                 config.driver_data = priv;
                 config.of_node = node;
 
-                priv->regulators[i] = regulator_register(desc, &config);
+                priv->regulators[i] = devm_regulator_register(&pdev->dev, desc,
+                                                              &config);
                 if (IS_ERR(priv->regulators[i])) {
                         dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 mc13783_regulators[i].desc.name);
-                        ret = PTR_ERR(priv->regulators[i]);
-                        goto err;
+                        return PTR_ERR(priv->regulators[i]);
                 }
         }
 
         return 0;
-err:
-        while (--i >= 0)
-                regulator_unregister(priv->regulators[i]);
-
-        return ret;
-}
-
-static int mc13783_regulator_remove(struct platform_device *pdev)
-{
-        struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
-        int i;
-
-        for (i = 0; i < priv->num_regulators; i++)
-                regulator_unregister(priv->regulators[i]);
-
-        return 0;
 }
 
 static struct platform_driver mc13783_regulator_driver = {
@@ -477,7 +461,6 @@ static struct platform_driver mc13783_regulator_driver = {
                 .name   = "mc13783-regulator",
                 .owner  = THIS_MODULE,
         },
-        .remove         = mc13783_regulator_remove,
         .probe          = mc13783_regulator_probe,
 };
 
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
index 1037e07937cf..96c9f80d9550 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
@@ -611,43 +611,27 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
                 config.driver_data = priv;
                 config.of_node = node;
 
-                priv->regulators[i] = regulator_register(desc, &config);
+                priv->regulators[i] = devm_regulator_register(&pdev->dev, desc,
+                                                              &config);
                 if (IS_ERR(priv->regulators[i])) {
                         dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 mc13892_regulators[i].desc.name);
-                        ret = PTR_ERR(priv->regulators[i]);
-                        goto err;
+                        return PTR_ERR(priv->regulators[i]);
                 }
         }
 
         return 0;
-err:
-        while (--i >= 0)
-                regulator_unregister(priv->regulators[i]);
-        return ret;
 
 err_unlock:
         mc13xxx_unlock(mc13892);
         return ret;
 }
 
-static int mc13892_regulator_remove(struct platform_device *pdev)
-{
-        struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
-        int i;
-
-        for (i = 0; i < priv->num_regulators; i++)
-                regulator_unregister(priv->regulators[i]);
-
-        return 0;
-}
-
 static struct platform_driver mc13892_regulator_driver = {
         .driver = {
                 .name   = "mc13892-regulator",
                 .owner  = THIS_MODULE,
         },
-        .remove = mc13892_regulator_remove,
         .probe  = mc13892_regulator_probe,
 };
 
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 7827384680d6..ea4f36f2cbe2 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -23,6 +23,8 @@ static void of_get_regulation_constraints(struct device_node *np,
         const __be32 *min_uA, *max_uA, *ramp_delay;
         struct property *prop;
         struct regulation_constraints *constraints = &(*init_data)->constraints;
+        int ret;
+        u32 pval;
 
         constraints->name = of_get_property(np, "regulator-name", NULL);
 
@@ -73,6 +75,10 @@ static void of_get_regulation_constraints(struct device_node *np,
                 else
                         constraints->ramp_disable = true;
         }
+
+        ret = of_property_read_u32(np, "regulator-enable-ramp-delay", &pval);
+        if (!ret)
+                constraints->enable_time = pval;
 }
 
 /**
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 7e2b165972e6..9c62b1d34685 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -33,6 +33,7 @@ struct regs_info {
         u8      vsel_addr;
         u8      ctrl_addr;
         u8      tstep_addr;
+        int     sleep_id;
 };
 
 static const struct regs_info palmas_regs_info[] = {
@@ -42,6 +43,7 @@ static const struct regs_info palmas_regs_info[] = {
                 .vsel_addr      = PALMAS_SMPS12_VOLTAGE,
                 .ctrl_addr      = PALMAS_SMPS12_CTRL,
                 .tstep_addr     = PALMAS_SMPS12_TSTEP,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS12,
         },
         {
                 .name           = "SMPS123",
@@ -49,12 +51,14 @@ static const struct regs_info palmas_regs_info[] = {
                 .vsel_addr      = PALMAS_SMPS12_VOLTAGE,
                 .ctrl_addr      = PALMAS_SMPS12_CTRL,
                 .tstep_addr     = PALMAS_SMPS12_TSTEP,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS12,
         },
         {
                 .name           = "SMPS3",
                 .sname          = "smps3-in",
                 .vsel_addr      = PALMAS_SMPS3_VOLTAGE,
                 .ctrl_addr      = PALMAS_SMPS3_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS3,
         },
         {
                 .name           = "SMPS45",
@@ -62,6 +66,7 @@ static const struct regs_info palmas_regs_info[] = {
                 .vsel_addr      = PALMAS_SMPS45_VOLTAGE,
                 .ctrl_addr      = PALMAS_SMPS45_CTRL,
                 .tstep_addr     = PALMAS_SMPS45_TSTEP,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS45,
         },
         {
                 .name           = "SMPS457",
@@ -69,6 +74,7 @@ static const struct regs_info palmas_regs_info[] = {
                 .vsel_addr      = PALMAS_SMPS45_VOLTAGE,
                 .ctrl_addr      = PALMAS_SMPS45_CTRL,
                 .tstep_addr     = PALMAS_SMPS45_TSTEP,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS45,
         },
         {
                 .name           = "SMPS6",
@@ -76,12 +82,14 @@ static const struct regs_info palmas_regs_info[] = {
                 .vsel_addr      = PALMAS_SMPS6_VOLTAGE,
                 .ctrl_addr      = PALMAS_SMPS6_CTRL,
                 .tstep_addr     = PALMAS_SMPS6_TSTEP,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS6,
         },
         {
                 .name           = "SMPS7",
                 .sname          = "smps7-in",
                 .vsel_addr      = PALMAS_SMPS7_VOLTAGE,
                 .ctrl_addr      = PALMAS_SMPS7_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS7,
         },
         {
                 .name           = "SMPS8",
@@ -89,108 +97,128 @@ static const struct regs_info palmas_regs_info[] = {
                 .vsel_addr      = PALMAS_SMPS8_VOLTAGE,
                 .ctrl_addr      = PALMAS_SMPS8_CTRL,
                 .tstep_addr     = PALMAS_SMPS8_TSTEP,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS8,
         },
         {
                 .name           = "SMPS9",
                 .sname          = "smps9-in",
                 .vsel_addr      = PALMAS_SMPS9_VOLTAGE,
                 .ctrl_addr      = PALMAS_SMPS9_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS9,
         },
         {
                 .name           = "SMPS10_OUT2",
                 .sname          = "smps10-in",
                 .ctrl_addr      = PALMAS_SMPS10_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS10,
         },
         {
                 .name           = "SMPS10_OUT1",
                 .sname          = "smps10-out2",
                 .ctrl_addr      = PALMAS_SMPS10_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SMPS10,
         },
         {
                 .name           = "LDO1",
                 .sname          = "ldo1-in",
                 .vsel_addr      = PALMAS_LDO1_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDO1_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDO1,
         },
         {
                 .name           = "LDO2",
                 .sname          = "ldo2-in",
                 .vsel_addr      = PALMAS_LDO2_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDO2_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDO2,
         },
         {
                 .name           = "LDO3",
                 .sname          = "ldo3-in",
                 .vsel_addr      = PALMAS_LDO3_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDO3_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDO3,
         },
         {
                 .name           = "LDO4",
                 .sname          = "ldo4-in",
                 .vsel_addr      = PALMAS_LDO4_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDO4_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDO4,
         },
         {
                 .name           = "LDO5",
                 .sname          = "ldo5-in",
                 .vsel_addr      = PALMAS_LDO5_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDO5_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDO5,
         },
         {
                 .name           = "LDO6",
                 .sname          = "ldo6-in",
                 .vsel_addr      = PALMAS_LDO6_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDO6_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDO6,
         },
         {
                 .name           = "LDO7",
                 .sname          = "ldo7-in",
                 .vsel_addr      = PALMAS_LDO7_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDO7_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDO7,
         },
         {
                 .name           = "LDO8",
                 .sname          = "ldo8-in",
                 .vsel_addr      = PALMAS_LDO8_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDO8_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDO8,
         },
         {
                 .name           = "LDO9",
                 .sname          = "ldo9-in",
                 .vsel_addr      = PALMAS_LDO9_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDO9_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDO9,
         },
         {
                 .name           = "LDOLN",
                 .sname          = "ldoln-in",
                 .vsel_addr      = PALMAS_LDOLN_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDOLN_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDOLN,
         },
         {
                 .name           = "LDOUSB",
                 .sname          = "ldousb-in",
                 .vsel_addr      = PALMAS_LDOUSB_VOLTAGE,
                 .ctrl_addr      = PALMAS_LDOUSB_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_LDOUSB,
         },
         {
                 .name           = "REGEN1",
                 .ctrl_addr      = PALMAS_REGEN1_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_REGEN1,
         },
         {
                 .name           = "REGEN2",
                 .ctrl_addr      = PALMAS_REGEN2_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_REGEN2,
         },
         {
                 .name           = "REGEN3",
                 .ctrl_addr      = PALMAS_REGEN3_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_REGEN3,
         },
         {
                 .name           = "SYSEN1",
                 .ctrl_addr      = PALMAS_SYSEN1_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SYSEN1,
         },
         {
                 .name           = "SYSEN2",
                 .ctrl_addr      = PALMAS_SYSEN2_CTRL,
+                .sleep_id       = PALMAS_EXTERNAL_REQSTR_ID_SYSEN2,
         },
 };
 
@@ -478,6 +506,17 @@ static struct regulator_ops palmas_ops_smps = {
         .set_ramp_delay         = palmas_smps_set_ramp_delay,
 };
 
+static struct regulator_ops palmas_ops_ext_control_smps = {
+        .set_mode               = palmas_set_mode_smps,
+        .get_mode               = palmas_get_mode_smps,
+        .get_voltage_sel        = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel        = regulator_set_voltage_sel_regmap,
+        .list_voltage           = palmas_list_voltage_smps,
+        .map_voltage            = palmas_map_voltage_smps,
+        .set_voltage_time_sel   = palma_smps_set_voltage_smps_time_sel,
+        .set_ramp_delay         = palmas_smps_set_ramp_delay,
+};
+
 static struct regulator_ops palmas_ops_smps10 = {
         .is_enabled             = regulator_is_enabled_regmap,
         .enable                 = regulator_enable_regmap,
@@ -513,12 +552,37 @@ static struct regulator_ops palmas_ops_ldo = {
         .map_voltage            = regulator_map_voltage_linear,
 };
 
+static struct regulator_ops palmas_ops_ext_control_ldo = {
+        .get_voltage_sel        = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel        = regulator_set_voltage_sel_regmap,
+        .list_voltage           = regulator_list_voltage_linear,
+        .map_voltage            = regulator_map_voltage_linear,
+};
+
 static struct regulator_ops palmas_ops_extreg = {
         .is_enabled             = regulator_is_enabled_regmap,
         .enable                 = regulator_enable_regmap,
         .disable                = regulator_disable_regmap,
 };
 
+static struct regulator_ops palmas_ops_ext_control_extreg = {
+};
+
+static int palmas_regulator_config_external(struct palmas *palmas, int id,
+                struct palmas_reg_init *reg_init)
+{
+        int sleep_id = palmas_regs_info[id].sleep_id;
+        int ret;
+
+        ret = palmas_ext_control_req_config(palmas, sleep_id,
+                                        reg_init->roof_floor, true);
+        if (ret < 0)
+                dev_err(palmas->dev,
+                        "Ext control config for regulator %d failed %d\n",
+                        id, ret);
+        return ret;
+}
+
 /*
  * setup the hardware based sleep configuration of the SMPS/LDO regulators
  * from the platform data. This is different to the software based control
@@ -577,7 +641,22 @@ static int palmas_smps_init(struct palmas *palmas, int id,
                         return ret;
         }
 
+        if (reg_init->roof_floor && (id != PALMAS_REG_SMPS10_OUT1) &&
+                        (id != PALMAS_REG_SMPS10_OUT2)) {
+                /* Enable externally controlled regulator */
+                addr = palmas_regs_info[id].ctrl_addr;
+                ret = palmas_smps_read(palmas, addr, &reg);
+                if (ret < 0)
+                        return ret;
 
+                if (!(reg & PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK)) {
+                        reg |= SMPS_CTRL_MODE_ON;
+                        ret = palmas_smps_write(palmas, addr, reg);
+                        if (ret < 0)
+                                return ret;
+                }
+                return palmas_regulator_config_external(palmas, id, reg_init);
+        }
         return 0;
 }
 
@@ -608,6 +687,20 @@ static int palmas_ldo_init(struct palmas *palmas, int id,
         if (ret)
                 return ret;
 
+        if (reg_init->roof_floor) {
+                /* Enable externally controlled regulator */
+                addr = palmas_regs_info[id].ctrl_addr;
+                ret = palmas_update_bits(palmas, PALMAS_LDO_BASE,
+                                addr, PALMAS_LDO1_CTRL_MODE_ACTIVE,
+                                PALMAS_LDO1_CTRL_MODE_ACTIVE);
+                if (ret < 0) {
+                        dev_err(palmas->dev,
+                                "LDO Register 0x%02x update failed %d\n",
+                                addr, ret);
+                        return ret;
+                }
+                return palmas_regulator_config_external(palmas, id, reg_init);
+        }
         return 0;
 }
 
@@ -630,6 +723,21 @@ static int palmas_extreg_init(struct palmas *palmas, int id,
                         addr, ret);
                 return ret;
         }
+
+        if (reg_init->roof_floor) {
+                /* Enable externally controlled regulator */
+                addr = palmas_regs_info[id].ctrl_addr;
+                ret = palmas_update_bits(palmas, PALMAS_RESOURCE_BASE,
+                                addr, PALMAS_REGEN1_CTRL_MODE_ACTIVE,
+                                PALMAS_REGEN1_CTRL_MODE_ACTIVE);
+                if (ret < 0) {
+                        dev_err(palmas->dev,
+                                "Resource Register 0x%02x update failed %d\n",
+                                addr, ret);
+                        return ret;
+                }
+                return palmas_regulator_config_external(palmas, id, reg_init);
+        }
         return 0;
 }
 
@@ -712,7 +820,7 @@ static void palmas_dt_to_pdata(struct device *dev,
         int idx, ret;
 
         node = of_node_get(node);
-        regulators = of_find_node_by_name(node, "regulators");
+        regulators = of_get_child_by_name(node, "regulators");
         if (!regulators) {
                 dev_info(dev, "regulator node not found\n");
                 return;
@@ -740,9 +848,35 @@ static void palmas_dt_to_pdata(struct device *dev,
                         of_property_read_bool(palmas_matches[idx].of_node,
                                              "ti,warm-reset");
 
-                pdata->reg_init[idx]->roof_floor =
-                        of_property_read_bool(palmas_matches[idx].of_node,
-                                              "ti,roof-floor");
+                ret = of_property_read_u32(palmas_matches[idx].of_node,
+                                              "ti,roof-floor", &prop);
+                /* EINVAL: Property not found */
+                if (ret != -EINVAL) {
+                        int econtrol;
+
+                        /* use default value, when no value is specified */
+                        econtrol = PALMAS_EXT_CONTROL_NSLEEP;
+                        if (!ret) {
+                                switch (prop) {
+                                case 1:
+                                        econtrol = PALMAS_EXT_CONTROL_ENABLE1;
+                                        break;
+                                case 2:
+                                        econtrol = PALMAS_EXT_CONTROL_ENABLE2;
+                                        break;
+                                case 3:
+                                        econtrol = PALMAS_EXT_CONTROL_NSLEEP;
+                                        break;
+                                default:
+                                        WARN_ON(1);
+                                        dev_warn(dev,
+                                        "%s: Invalid roof-floor option: %u\n",
+                                             palmas_matches[idx].name, prop);
+                                        break;
+                                }
+                        }
+                        pdata->reg_init[idx]->roof_floor = econtrol;
+                }
 
                 ret = of_property_read_u32(palmas_matches[idx].of_node,
                                 "ti,mode-sleep", &prop);
@@ -856,7 +990,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)
                         if (ret < 0) {
                                 dev_err(&pdev->dev,
                                         "reading TSTEP reg failed: %d\n", ret);
-                                goto err_unregister_regulator;
+                                return ret;
                         }
                         pmic->desc[id].ramp_delay =
                                         palmas_smps_ramp_delay[reg & 0x3];
@@ -868,7 +1002,9 @@ static int palmas_regulators_probe(struct platform_device *pdev)
                         reg_init = pdata->reg_init[id];
                         ret = palmas_smps_init(palmas, id, reg_init);
                         if (ret)
-                                goto err_unregister_regulator;
+                                return ret;
+                } else {
+                        reg_init = NULL;
                 }
 
                 /* Register the regulators */
@@ -909,11 +1045,15 @@ static int palmas_regulators_probe(struct platform_device *pdev)
 
                         ret = palmas_smps_read(pmic->palmas, addr, &reg);
                         if (ret)
-                                goto err_unregister_regulator;
+                                return ret;
                         if (reg & PALMAS_SMPS12_VOLTAGE_RANGE)
                                 pmic->range[id] = 1;
 
-                        pmic->desc[id].ops = &palmas_ops_smps;
+                        if (reg_init && reg_init->roof_floor)
+                                pmic->desc[id].ops =
+                                                &palmas_ops_ext_control_smps;
+                        else
+                                pmic->desc[id].ops = &palmas_ops_smps;
                         pmic->desc[id].n_voltages = PALMAS_SMPS_NUM_VOLTAGES;
                         pmic->desc[id].vsel_reg =
                                         PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
@@ -925,7 +1065,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)
                         addr = palmas_regs_info[id].ctrl_addr;
                         ret = palmas_smps_read(pmic->palmas, addr, &reg);
                         if (ret)
-                                goto err_unregister_regulator;
+                                return ret;
                         pmic->current_reg_mode[id] = reg &
                                         PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
                 }
@@ -941,13 +1081,13 @@ static int palmas_regulators_probe(struct platform_device *pdev)
                 pmic->desc[id].supply_name = palmas_regs_info[id].sname;
                 config.of_node = palmas_matches[id].of_node;
 
-                rdev = regulator_register(&pmic->desc[id], &config);
+                rdev = devm_regulator_register(&pdev->dev, &pmic->desc[id],
+                                               &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev,
                                 "failed to register %s regulator\n",
                                 pdev->name);
-                        ret = PTR_ERR(rdev);
-                        goto err_unregister_regulator;
+                        return PTR_ERR(rdev);
                 }
 
                 /* Save regulator for cleanup */
@@ -956,6 +1096,10 @@ static int palmas_regulators_probe(struct platform_device *pdev)
 
         /* Start this loop from the id left from previous loop */
         for (; id < PALMAS_NUM_REGS; id++) {
+                if (pdata && pdata->reg_init[id])
+                        reg_init = pdata->reg_init[id];
+                else
+                        reg_init = NULL;
 
                 /* Miss out regulators which are not available due
                  * to alternate functions.
@@ -969,7 +1113,11 @@ static int palmas_regulators_probe(struct platform_device *pdev)
 
                 if (id < PALMAS_REG_REGEN1) {
                         pmic->desc[id].n_voltages = PALMAS_LDO_NUM_VOLTAGES;
-                        pmic->desc[id].ops = &palmas_ops_ldo;
+                        if (reg_init && reg_init->roof_floor)
+                                pmic->desc[id].ops =
+                                        &palmas_ops_ext_control_ldo;
+                        else
+                                pmic->desc[id].ops = &palmas_ops_ldo;
                         pmic->desc[id].min_uV = 900000;
                         pmic->desc[id].uV_step = 50000;
                         pmic->desc[id].linear_min_sel = 1;
@@ -999,7 +1147,11 @@ static int palmas_regulators_probe(struct platform_device *pdev)
                                 pmic->desc[id].enable_time = 2000;
                 } else {
                         pmic->desc[id].n_voltages = 1;
-                        pmic->desc[id].ops = &palmas_ops_extreg;
+                        if (reg_init && reg_init->roof_floor)
+                                pmic->desc[id].ops =
+                                        &palmas_ops_ext_control_extreg;
+                        else
+                                pmic->desc[id].ops = &palmas_ops_extreg;
                         pmic->desc[id].enable_reg =
                                         PALMAS_BASE_TO_REG(PALMAS_RESOURCE_BASE,
                                                 palmas_regs_info[id].ctrl_addr);
@@ -1015,13 +1167,13 @@ static int palmas_regulators_probe(struct platform_device *pdev)
                 pmic->desc[id].supply_name = palmas_regs_info[id].sname;
                 config.of_node = palmas_matches[id].of_node;
 
-                rdev = regulator_register(&pmic->desc[id], &config);
+                rdev = devm_regulator_register(&pdev->dev, &pmic->desc[id],
+                                               &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev,
                                 "failed to register %s regulator\n",
                                 pdev->name);
-                        ret = PTR_ERR(rdev);
-                        goto err_unregister_regulator;
+                        return PTR_ERR(rdev);
                 }
 
                 /* Save regulator for cleanup */
@@ -1037,31 +1189,14 @@ static int palmas_regulators_probe(struct platform_device *pdev)
                                 else
                                         ret = palmas_extreg_init(palmas,
                                                         id, reg_init);
-                                if (ret) {
-                                        regulator_unregister(pmic->rdev[id]);
-                                        goto err_unregister_regulator;
-                                }
+                                if (ret)
+                                        return ret;
                         }
                 }
         }
 
 
         return 0;
-
-err_unregister_regulator:
-        while (--id >= 0)
-                regulator_unregister(pmic->rdev[id]);
-        return ret;
-}
-
-static int palmas_regulators_remove(struct platform_device *pdev)
-{
-        struct palmas_pmic *pmic = platform_get_drvdata(pdev);
-        int id;
-
-        for (id = 0; id < PALMAS_NUM_REGS; id++)
-                regulator_unregister(pmic->rdev[id]);
-        return 0;
 }
 
 static struct of_device_id of_palmas_match_tbl[] = {
@@ -1083,7 +1218,6 @@ static struct platform_driver palmas_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = palmas_regulators_probe,
-        .remove = palmas_regulators_remove,
 };
 
 static int __init palmas_init(void)
diff --git a/drivers/regulator/pcap-regulator.c b/drivers/regulator/pcap-regulator.c
index b49eaeedea84..3727b7d0e9ac 100644
--- a/drivers/regulator/pcap-regulator.c
+++ b/drivers/regulator/pcap-regulator.c
@@ -246,7 +246,8 @@ static int pcap_regulator_probe(struct platform_device *pdev)
         config.init_data = dev_get_platdata(&pdev->dev);
         config.driver_data = pcap;
 
-        rdev = regulator_register(&pcap_regulators[pdev->id], &config);
+        rdev = devm_regulator_register(&pdev->dev, &pcap_regulators[pdev->id],
+                                       &config);
         if (IS_ERR(rdev))
                 return PTR_ERR(rdev);
 
@@ -255,22 +256,12 @@ static int pcap_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int pcap_regulator_remove(struct platform_device *pdev)
-{
-        struct regulator_dev *rdev = platform_get_drvdata(pdev);
-
-        regulator_unregister(rdev);
-
-        return 0;
-}
-
 static struct platform_driver pcap_regulator_driver = {
         .driver = {
                 .name   = "pcap-regulator",
                 .owner  = THIS_MODULE,
         },
         .probe  = pcap_regulator_probe,
-        .remove = pcap_regulator_remove,
 };
 
 static int __init pcap_regulator_init(void)
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
index 0f3576d48abf..d7da1c15a6da 100644
--- a/drivers/regulator/pcf50633-regulator.c
+++ b/drivers/regulator/pcf50633-regulator.c
@@ -90,7 +90,8 @@ static int pcf50633_regulator_probe(struct platform_device *pdev)
         config.driver_data = pcf;
         config.regmap = pcf->regmap;
 
-        rdev = regulator_register(&regulators[pdev->id], &config);
+        rdev = devm_regulator_register(&pdev->dev, &regulators[pdev->id],
+                                       &config);
         if (IS_ERR(rdev))
                 return PTR_ERR(rdev);
 
@@ -102,21 +103,11 @@ static int pcf50633_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int pcf50633_regulator_remove(struct platform_device *pdev)
-{
-        struct regulator_dev *rdev = platform_get_drvdata(pdev);
-
-        regulator_unregister(rdev);
-
-        return 0;
-}
-
 static struct platform_driver pcf50633_regulator_driver = {
         .driver = {
                 .name = "pcf50633-regltr",
         },
         .probe = pcf50633_regulator_probe,
-        .remove = pcf50633_regulator_remove,
 };
 
 static int __init pcf50633_regulator_init(void)
diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c
index 5885b4504596..b58affb33143 100644
--- a/drivers/regulator/rc5t583-regulator.c
+++ b/drivers/regulator/rc5t583-regulator.c
@@ -173,33 +173,16 @@ skip_ext_pwr_config:
                 config.driver_data = reg;
                 config.regmap = rc5t583->regmap;
 
-                rdev = regulator_register(&ri->desc, &config);
+                rdev = devm_regulator_register(&pdev->dev, &ri->desc, &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev, "Failed to register regulator %s\n",
                                                 ri->desc.name);
-                        ret = PTR_ERR(rdev);
-                        goto clean_exit;
+                        return PTR_ERR(rdev);
                 }
                 reg->rdev = rdev;
         }
         platform_set_drvdata(pdev, regs);
         return 0;
-
-clean_exit:
-        while (--id >= 0)
-                regulator_unregister(regs[id].rdev);
-
-        return ret;
-}
-
-static int rc5t583_regulator_remove(struct platform_device *pdev)
-{
-        struct rc5t583_regulator *regs = platform_get_drvdata(pdev);
-        int id;
-
-        for (id = 0; id < RC5T583_REGULATOR_MAX; ++id)
-                regulator_unregister(regs[id].rdev);
-        return 0;
 }
 
 static struct platform_driver rc5t583_regulator_driver = {
@@ -208,7 +191,6 @@ static struct platform_driver rc5t583_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = rc5t583_regulator_probe,
-        .remove         = rc5t583_regulator_remove,
 };
 
 static int __init rc5t583_regulator_init(void)
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 5eba2ff8c0e8..333677d68d0e 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -448,33 +448,17 @@ common_reg:
                         config.of_node = rdata[i].of_node;
                 }
 
-                s2mps11->rdev[i] = regulator_register(&regulators[i], &config);
+                s2mps11->rdev[i] = devm_regulator_register(&pdev->dev,
+                                                &regulators[i], &config);
                 if (IS_ERR(s2mps11->rdev[i])) {
                         ret = PTR_ERR(s2mps11->rdev[i]);
                         dev_err(&pdev->dev, "regulator init failed for %d\n",
                                 i);
-                        s2mps11->rdev[i] = NULL;
-                        goto err;
+                        return ret;
                 }
         }
 
         return 0;
-err:
-        for (i = 0; i < S2MPS11_REGULATOR_MAX; i++)
-                regulator_unregister(s2mps11->rdev[i]);
-
-        return ret;
-}
-
-static int s2mps11_pmic_remove(struct platform_device *pdev)
-{
-        struct s2mps11_info *s2mps11 = platform_get_drvdata(pdev);
-        int i;
-
-        for (i = 0; i < S2MPS11_REGULATOR_MAX; i++)
-                regulator_unregister(s2mps11->rdev[i]);
-
-        return 0;
 }
 
 static const struct platform_device_id s2mps11_pmic_id[] = {
@@ -489,7 +473,6 @@ static struct platform_driver s2mps11_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = s2mps11_pmic_probe,
-        .remove = s2mps11_pmic_remove,
         .id_table = s2mps11_pmic_id,
 };
 
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index c24448bc43cf..cbf91e25cf7f 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -522,7 +522,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
         struct device_node *pmic_np, *regulators_np, *reg_np;
         struct sec_regulator_data *rdata;
         struct sec_opmode_data *rmode;
-        unsigned int i, dvs_voltage_nr = 1, ret;
+        unsigned int i, dvs_voltage_nr = 8, ret;
 
         pmic_np = iodev->dev->of_node;
         if (!pmic_np) {
@@ -586,15 +586,39 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
                 rmode++;
         }
 
-        if (of_get_property(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs", NULL))
+        if (of_get_property(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs", NULL)) {
                 pdata->buck2_gpiodvs = true;
 
-        if (of_get_property(pmic_np, "s5m8767,pmic-buck3-uses-gpio-dvs", NULL))
+                if (of_property_read_u32_array(pmic_np,
+                                "s5m8767,pmic-buck2-dvs-voltage",
+                                pdata->buck2_voltage, dvs_voltage_nr)) {
+                        dev_err(iodev->dev, "buck2 voltages not specified\n");
+                        return -EINVAL;
+                }
+        }
+
+        if (of_get_property(pmic_np, "s5m8767,pmic-buck3-uses-gpio-dvs", NULL)) {
                 pdata->buck3_gpiodvs = true;
 
-        if (of_get_property(pmic_np, "s5m8767,pmic-buck4-uses-gpio-dvs", NULL))
+                if (of_property_read_u32_array(pmic_np,
+                                "s5m8767,pmic-buck3-dvs-voltage",
+                                pdata->buck3_voltage, dvs_voltage_nr)) {
+                        dev_err(iodev->dev, "buck3 voltages not specified\n");
+                        return -EINVAL;
+                }
+        }
+
+        if (of_get_property(pmic_np, "s5m8767,pmic-buck4-uses-gpio-dvs", NULL)) {
                 pdata->buck4_gpiodvs = true;
 
+                if (of_property_read_u32_array(pmic_np,
+                                "s5m8767,pmic-buck4-dvs-voltage",
+                                pdata->buck4_voltage, dvs_voltage_nr)) {
+                        dev_err(iodev->dev, "buck4 voltages not specified\n");
+                        return -EINVAL;
+                }
+        }
+
         if (pdata->buck2_gpiodvs || pdata->buck3_gpiodvs ||
                                                 pdata->buck4_gpiodvs) {
                 ret = s5m8767_pmic_dt_parse_dvs_gpio(iodev, pdata, pmic_np);
@@ -612,32 +636,26 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
                                 "invalid value for default dvs index, use 0\n");
                         }
                 }
-                dvs_voltage_nr = 8;
         }
 
         ret = s5m8767_pmic_dt_parse_ds_gpio(iodev, pdata, pmic_np);
         if (ret)
                 return -EINVAL;
 
-        if (of_property_read_u32_array(pmic_np,
-                                "s5m8767,pmic-buck2-dvs-voltage",
-                                pdata->buck2_voltage, dvs_voltage_nr)) {
-                dev_err(iodev->dev, "buck2 voltages not specified\n");
-                return -EINVAL;
-        }
+        if (of_get_property(pmic_np, "s5m8767,pmic-buck2-ramp-enable", NULL))
+                pdata->buck2_ramp_enable = true;
 
-        if (of_property_read_u32_array(pmic_np,
-                                "s5m8767,pmic-buck3-dvs-voltage",
-                                pdata->buck3_voltage, dvs_voltage_nr)) {
-                dev_err(iodev->dev, "buck3 voltages not specified\n");
-                return -EINVAL;
-        }
+        if (of_get_property(pmic_np, "s5m8767,pmic-buck3-ramp-enable", NULL))
+                pdata->buck3_ramp_enable = true;
 
-        if (of_property_read_u32_array(pmic_np,
-                                "s5m8767,pmic-buck4-dvs-voltage",
-                                pdata->buck4_voltage, dvs_voltage_nr)) {
-                dev_err(iodev->dev, "buck4 voltages not specified\n");
-                return -EINVAL;
+        if (of_get_property(pmic_np, "s5m8767,pmic-buck4-ramp-enable", NULL))
+                pdata->buck4_ramp_enable = true;
+
+        if (pdata->buck2_ramp_enable || pdata->buck3_ramp_enable
+                        || pdata->buck4_ramp_enable) {
+                if (of_property_read_u32(pmic_np, "s5m8767,pmic-buck-ramp-delay",
+                                &pdata->buck_ramp_delay))
+                        pdata->buck_ramp_delay = 0;
         }
 
         return 0;
@@ -910,34 +928,17 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
                 config.regmap = iodev->regmap;
                 config.of_node = pdata->regulators[i].reg_node;
 
-                rdev[i] = regulator_register(&regulators[id], &config);
+                rdev[i] = devm_regulator_register(&pdev->dev, &regulators[id],
+                                                  &config);
                 if (IS_ERR(rdev[i])) {
                         ret = PTR_ERR(rdev[i]);
                         dev_err(s5m8767->dev, "regulator init failed for %d\n",
                                         id);
-                        rdev[i] = NULL;
-                        goto err;
+                        return ret;
                 }
         }
 
         return 0;
-err:
-        for (i = 0; i < s5m8767->num_regulators; i++)
-                regulator_unregister(rdev[i]);
-
-        return ret;
-}
-
-static int s5m8767_pmic_remove(struct platform_device *pdev)
-{
-        struct s5m8767_info *s5m8767 = platform_get_drvdata(pdev);
-        struct regulator_dev **rdev = s5m8767->rdev;
-        int i;
-
-        for (i = 0; i < s5m8767->num_regulators; i++)
-                regulator_unregister(rdev[i]);
-
-        return 0;
 }
 
 static const struct platform_device_id s5m8767_pmic_id[] = {
@@ -952,7 +953,6 @@ static struct platform_driver s5m8767_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = s5m8767_pmic_probe,
-        .remove = s5m8767_pmic_remove,
         .id_table = s5m8767_pmic_id,
 };
 
diff --git a/drivers/regulator/stw481x-vmmc.c b/drivers/regulator/stw481x-vmmc.c
new file mode 100644
index 000000000000..f78857bd6a15
--- /dev/null
+++ b/drivers/regulator/stw481x-vmmc.c
@@ -0,0 +1,111 @@
+/*
+ * Regulator driver for STw4810/STw4811 VMMC regulator.
+ *
+ * Copyright (C) 2013 ST-Ericsson SA
+ * Written on behalf of Linaro for ST-Ericsson
+ *
+ * Author: Linus Walleij <linus.walleij@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/mfd/stw481x.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/of_regulator.h>
+
+static const unsigned int stw481x_vmmc_voltages[] = {
+        1800000,
+        1800000,
+        2850000,
+        3000000,
+        1850000,
+        2600000,
+        2700000,
+        3300000,
+};
+
+static struct regulator_ops stw481x_vmmc_ops = {
+        .list_voltage = regulator_list_voltage_table,
+        .enable      = regulator_enable_regmap,
+        .disable     = regulator_disable_regmap,
+        .is_enabled  = regulator_is_enabled_regmap,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+};
+
+static struct regulator_desc vmmc_regulator = {
+        .name = "VMMC",
+        .id   = 0,
+        .ops  = &stw481x_vmmc_ops,
+        .type = REGULATOR_VOLTAGE,
+        .owner = THIS_MODULE,
+        .n_voltages = ARRAY_SIZE(stw481x_vmmc_voltages),
+        .volt_table = stw481x_vmmc_voltages,
+        .enable_time = 200, /* FIXME: look this up */
+        .enable_reg = STW_CONF1,
+        .enable_mask = STW_CONF1_PDN_VMMC,
+        .vsel_reg = STW_CONF1,
+        .vsel_mask = STW_CONF1_VMMC_MASK,
+};
+
+static int stw481x_vmmc_regulator_probe(struct platform_device *pdev)
+{
+        struct stw481x *stw481x = dev_get_platdata(&pdev->dev);
+        struct regulator_config config = { };
+        int ret;
+
+        /* First disable the external VMMC if it's active */
+        ret = regmap_update_bits(stw481x->map, STW_CONF2,
+                                 STW_CONF2_VMMC_EXT, 0);
+        if (ret) {
+                dev_err(&pdev->dev, "could not disable external VMMC\n");
+                return ret;
+        }
+
+        /* Register VMMC regulator */
+        config.dev = &pdev->dev;
+        config.driver_data = stw481x;
+        config.regmap = stw481x->map;
+        config.of_node = pdev->dev.of_node;
+        config.init_data = of_get_regulator_init_data(&pdev->dev,
+                                                      pdev->dev.of_node);
+
+        stw481x->vmmc_regulator = regulator_register(&vmmc_regulator, &config);
+        if (IS_ERR(stw481x->vmmc_regulator)) {
+                dev_err(&pdev->dev,
+                        "error initializing STw481x VMMC regulator\n");
+                return PTR_ERR(stw481x->vmmc_regulator);
+        }
+
+        dev_info(&pdev->dev, "initialized STw481x VMMC regulator\n");
+        return 0;
+}
+
+static int stw481x_vmmc_regulator_remove(struct platform_device *pdev)
+{
+        struct stw481x *stw481x = dev_get_platdata(&pdev->dev);
+
+        regulator_unregister(stw481x->vmmc_regulator);
+        return 0;
+}
+
+static const struct of_device_id stw481x_vmmc_match[] = {
+        { .compatible = "st,stw481x-vmmc", },
+        {},
+};
+
+static struct platform_driver stw481x_vmmc_regulator_driver = {
+        .driver = {
+                .name  = "stw481x-vmmc-regulator",
+                .owner = THIS_MODULE,
+                .of_match_table = stw481x_vmmc_match,
+        },
+        .probe = stw481x_vmmc_regulator_probe,
+        .remove = stw481x_vmmc_regulator_remove,
+};
+
+module_platform_driver(stw481x_vmmc_regulator_driver);
diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c
index 20c271d49dcb..b187b6bba7ad 100644
--- a/drivers/regulator/ti-abb-regulator.c
+++ b/drivers/regulator/ti-abb-regulator.c
@@ -615,7 +615,7 @@ static int ti_abb_init_table(struct device *dev, struct ti_abb *abb,
                                         pname, *volt_table, vset_mask);
                         continue;
                 }
-                info->vset = efuse_val & vset_mask >> __ffs(vset_mask);
+                info->vset = (efuse_val & vset_mask) >> __ffs(vset_mask);
                 dev_dbg(dev, "[%d]v=%d vset=%x\n", i, *volt_table, info->vset);
 check_abb:
                 switch (info->opp_sel) {
@@ -708,39 +708,31 @@ static int ti_abb_probe(struct platform_device *pdev)
         match = of_match_device(ti_abb_of_match, dev);
         if (!match) {
                 /* We do not expect this to happen */
-                ret = -ENODEV;
                 dev_err(dev, "%s: Unable to match device\n", __func__);
-                goto err;
+                return -ENODEV;
         }
         if (!match->data) {
-                ret = -EINVAL;
                 dev_err(dev, "%s: Bad data in match\n", __func__);
-                goto err;
+                return -EINVAL;
         }
 
         abb = devm_kzalloc(dev, sizeof(struct ti_abb), GFP_KERNEL);
-        if (!abb) {
-                dev_err(dev, "%s: Unable to allocate ABB struct\n", __func__);
-                ret = -ENOMEM;
-                goto err;
-        }
+        if (!abb)
+                return -ENOMEM;
         abb->regs = match->data;
 
         /* Map ABB resources */
         pname = "base-address";
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
         abb->base = devm_ioremap_resource(dev, res);
-        if (IS_ERR(abb->base)) {
-                ret = PTR_ERR(abb->base);
-                goto err;
-        }
+        if (IS_ERR(abb->base))
+                return PTR_ERR(abb->base);
 
         pname = "int-address";
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
         if (!res) {
                 dev_err(dev, "Missing '%s' IO resource\n", pname);
-                ret = -ENODEV;
-                goto err;
+                return -ENODEV;
         }
         /*
          * We may have shared interrupt register offsets which are
@@ -750,8 +742,7 @@ static int ti_abb_probe(struct platform_device *pdev)
                                              resource_size(res));
         if (!abb->int_base) {
                 dev_err(dev, "Unable to map '%s'\n", pname);
-                ret = -ENOMEM;
-                goto err;
+                return -ENOMEM;
         }
 
         /* Map Optional resources */
@@ -771,17 +762,19 @@ static int ti_abb_probe(struct platform_device *pdev)
                                                resource_size(res));
         if (!abb->efuse_base) {
                 dev_err(dev, "Unable to map '%s'\n", pname);
-                ret = -ENOMEM;
-                goto err;
+                return -ENOMEM;
         }
 
         pname = "ldo-address";
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
-        abb->ldo_base = devm_ioremap_resource(dev, res);
-        if (IS_ERR(abb->ldo_base)) {
-                ret = PTR_ERR(abb->ldo_base);
-                goto err;
+        if (!res) {
+                dev_dbg(dev, "Missing '%s' IO resource\n", pname);
+                ret = -ENODEV;
+                goto skip_opt;
         }
+        abb->ldo_base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(abb->ldo_base))
+                return PTR_ERR(abb->ldo_base);
 
         /* IF ldo_base is set, the following are mandatory */
         pname = "ti,ldovbb-override-mask";
@@ -790,12 +783,11 @@ static int ti_abb_probe(struct platform_device *pdev)
                                  &abb->ldovbb_override_mask);
         if (ret) {
                 dev_err(dev, "Missing '%s' (%d)\n", pname, ret);
-                goto err;
+                return ret;
         }
         if (!abb->ldovbb_override_mask) {
                 dev_err(dev, "Invalid property:'%s' set as 0!\n", pname);
-                ret = -EINVAL;
-                goto err;
+                return -EINVAL;
         }
 
         pname = "ti,ldovbb-vset-mask";
@@ -804,12 +796,11 @@ static int ti_abb_probe(struct platform_device *pdev)
                                  &abb->ldovbb_vset_mask);
         if (ret) {
                 dev_err(dev, "Missing '%s' (%d)\n", pname, ret);
-                goto err;
+                return ret;
         }
         if (!abb->ldovbb_vset_mask) {
                 dev_err(dev, "Invalid property:'%s' set as 0!\n", pname);
-                ret = -EINVAL;
-                goto err;
+                return -EINVAL;
         }
 
 skip_opt:
@@ -819,31 +810,29 @@ skip_opt:
                                  &abb->txdone_mask);
         if (ret) {
                 dev_err(dev, "Missing '%s' (%d)\n", pname, ret);
-                goto err;
+                return ret;
         }
         if (!abb->txdone_mask) {
                 dev_err(dev, "Invalid property:'%s' set as 0!\n", pname);
-                ret = -EINVAL;
-                goto err;
+                return -EINVAL;
         }
 
         initdata = of_get_regulator_init_data(dev, pdev->dev.of_node);
         if (!initdata) {
-                ret = -ENOMEM;
                 dev_err(dev, "%s: Unable to alloc regulator init data\n",
                         __func__);
-                goto err;
+                return -ENOMEM;
         }
 
         /* init ABB opp_sel table */
         ret = ti_abb_init_table(dev, abb, initdata);
         if (ret)
-                goto err;
+                return ret;
 
         /* init ABB timing */
         ret = ti_abb_init_timings(dev, abb);
         if (ret)
-                goto err;
+                return ret;
 
         desc = &abb->rdesc;
         desc->name = dev_name(dev);
@@ -861,12 +850,12 @@ skip_opt:
         config.driver_data = abb;
         config.of_node = pdev->dev.of_node;
 
-        rdev = regulator_register(desc, &config);
+        rdev = devm_regulator_register(dev, desc, &config);
         if (IS_ERR(rdev)) {
                 ret = PTR_ERR(rdev);
                 dev_err(dev, "%s: failed to register regulator(%d)\n",
                         __func__, ret);
-                goto err;
+                return ret;
         }
         platform_set_drvdata(pdev, rdev);
 
@@ -874,31 +863,12 @@ skip_opt:
         ti_abb_rmw(abb->regs->sr2_en_mask, 1, abb->regs->setup_reg, abb->base);
 
         return 0;
-
-err:
-        dev_err(dev, "%s: Failed to initialize(%d)\n", __func__, ret);
-        return ret;
-}
-
-/**
- * ti_abb_remove() - cleanups
- * @pdev: ABB platform device
- *
- * Return: 0
- */
-static int ti_abb_remove(struct platform_device *pdev)
-{
-        struct regulator_dev *rdev = platform_get_drvdata(pdev);
-
-        regulator_unregister(rdev);
-        return 0;
 }
 
 MODULE_ALIAS("platform:ti_abb");
 
 static struct platform_driver ti_abb_driver = {
         .probe = ti_abb_probe,
-        .remove = ti_abb_remove,
         .driver = {
                    .name = "ti_abb",
                    .owner = THIS_MODULE,
diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c
index 9392a7ca3d2d..b0a3f0917a27 100644
--- a/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@ -343,7 +343,7 @@ static int tps51632_probe(struct i2c_client *client,
         config.regmap = tps->regmap;
         config.of_node = client->dev.of_node;
 
-        rdev = regulator_register(&tps->desc, &config);
+        rdev = devm_regulator_register(&client->dev, &tps->desc, &config);
         if (IS_ERR(rdev)) {
                 dev_err(tps->dev, "regulator register failed\n");
                 return PTR_ERR(rdev);
@@ -353,14 +353,6 @@ static int tps51632_probe(struct i2c_client *client,
         return 0;
 }
 
-static int tps51632_remove(struct i2c_client *client)
-{
-        struct tps51632_chip *tps = i2c_get_clientdata(client);
-
-        regulator_unregister(tps->rdev);
-        return 0;
-}
-
 static const struct i2c_device_id tps51632_id[] = {
         {.name = "tps51632",},
         {},
@@ -375,7 +367,6 @@ static struct i2c_driver tps51632_i2c_driver = {
                 .of_match_table = of_match_ptr(tps51632_of_match),
         },
         .probe = tps51632_probe,
-        .remove = tps51632_remove,
         .id_table = tps51632_id,
 };
 
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c
index ec9453ffb77f..c1e33a3d397b 100644
--- a/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@ -137,7 +137,7 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
         /* This instance is not set for regulator mode so bail out */
         if (pdata->mode != TPS6105X_MODE_VOLTAGE) {
                 dev_info(&pdev->dev,
-                         "chip not in voltage mode mode, exit probe \n");
+                        "chip not in voltage mode mode, exit probe\n");
                 return 0;
         }
 
@@ -146,8 +146,9 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
         config.driver_data = tps6105x;
 
         /* Register regulator with framework */
-        tps6105x->regulator = regulator_register(&tps6105x_regulator_desc,
-                                                 &config);
+        tps6105x->regulator = devm_regulator_register(&pdev->dev,
+                                                      &tps6105x_regulator_desc,
+                                                      &config);
         if (IS_ERR(tps6105x->regulator)) {
                 ret = PTR_ERR(tps6105x->regulator);
                 dev_err(&tps6105x->client->dev,
@@ -159,20 +160,12 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int tps6105x_regulator_remove(struct platform_device *pdev)
-{
-        struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev);
-        regulator_unregister(tps6105x->regulator);
-        return 0;
-}
-
 static struct platform_driver tps6105x_regulator_driver = {
         .driver = {
                 .name  = "tps6105x-regulator",
                 .owner = THIS_MODULE,
         },
         .probe = tps6105x_regulator_probe,
-        .remove = tps6105x_regulator_remove,
 };
 
 static __init int tps6105x_regulator_init(void)
diff --git a/drivers/regulator/tps62360-regulator.c b/drivers/regulator/tps62360-regulator.c
index 0b7ebb1ebf85..c2c0185a2dcd 100644
--- a/drivers/regulator/tps62360-regulator.c
+++ b/drivers/regulator/tps62360-regulator.c
@@ -476,7 +476,7 @@ static int tps62360_probe(struct i2c_client *client,
         config.of_node = client->dev.of_node;
 
         /* Register the regulators */
-        rdev = regulator_register(&tps->desc, &config);
+        rdev = devm_regulator_register(&client->dev, &tps->desc, &config);
         if (IS_ERR(rdev)) {
                 dev_err(tps->dev,
                         "%s(): regulator register failed with err %s\n",
@@ -488,20 +488,6 @@ static int tps62360_probe(struct i2c_client *client,
         return 0;
 }
 
-/**
- * tps62360_remove - tps62360 driver i2c remove handler
- * @client: i2c driver client device structure
- *
- * Unregister TPS driver as an i2c client device driver
- */
-static int tps62360_remove(struct i2c_client *client)
-{
-        struct tps62360_chip *tps = i2c_get_clientdata(client);
-
-        regulator_unregister(tps->rdev);
-        return 0;
-}
-
 static void tps62360_shutdown(struct i2c_client *client)
 {
         struct tps62360_chip *tps = i2c_get_clientdata(client);
@@ -535,7 +521,6 @@ static struct i2c_driver tps62360_i2c_driver = {
                 .of_match_table = of_match_ptr(tps62360_of_match),
         },
         .probe = tps62360_probe,
-        .remove = tps62360_remove,
         .shutdown = tps62360_shutdown,
         .id_table = tps62360_id,
 };
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index f6e398240686..3ef67a86115c 100644
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -277,12 +277,12 @@ static int tps_65023_probe(struct i2c_client *client,
                 config.regmap = tps->regmap;
 
                 /* Register the regulators */
-                rdev = regulator_register(&tps->desc[i], &config);
+                rdev = devm_regulator_register(&client->dev, &tps->desc[i],
+                                               &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&client->dev, "failed to register %s\n",
                                 id->name);
-                        error = PTR_ERR(rdev);
-                        goto fail;
+                        return PTR_ERR(rdev);
                 }
 
                 /* Save regulator for cleanup */
@@ -297,21 +297,6 @@ static int tps_65023_probe(struct i2c_client *client,
                                         TPS65023_REG_CTRL2_CORE_ADJ);
 
         return 0;
-
- fail:
-        while (--i >= 0)
-                regulator_unregister(tps->rdev[i]);
-        return error;
-}
-
-static int tps_65023_remove(struct i2c_client *client)
-{
-        struct tps_pmic *tps = i2c_get_clientdata(client);
-        int i;
-
-        for (i = 0; i < TPS65023_NUM_REGULATOR; i++)
-                regulator_unregister(tps->rdev[i]);
-        return 0;
 }
 
 static const struct tps_info tps65020_regs[] = {
@@ -431,7 +416,6 @@ static struct i2c_driver tps_65023_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps_65023_probe,
-        .remove = tps_65023_remove,
         .id_table = tps_65023_id,
 };
 
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c
index 4117ff52dba1..162a0fae20b3 100644
--- a/drivers/regulator/tps6507x-regulator.c
+++ b/drivers/regulator/tps6507x-regulator.c
@@ -508,13 +508,13 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)
                         config.of_node = tps6507x_reg_matches[i].of_node;
                 }
 
-                rdev = regulator_register(&tps->desc[i], &config);
+                rdev = devm_regulator_register(&pdev->dev, &tps->desc[i],
+                                               &config);
                 if (IS_ERR(rdev)) {
                         dev_err(tps6507x_dev->dev,
                                 "failed to register %s regulator\n",
                                 pdev->name);
-                        error = PTR_ERR(rdev);
-                        goto fail;
+                        return PTR_ERR(rdev);
                 }
 
                 /* Save regulator for cleanup */
@@ -525,22 +525,6 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, tps6507x_dev);
 
         return 0;
-
-fail:
-        while (--i >= 0)
-                regulator_unregister(tps->rdev[i]);
-        return error;
-}
-
-static int tps6507x_pmic_remove(struct platform_device *pdev)
-{
-        struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev);
-        struct tps6507x_pmic *tps = tps6507x_dev->pmic;
-        int i;
-
-        for (i = 0; i < TPS6507X_NUM_REGULATOR; i++)
-                regulator_unregister(tps->rdev[i]);
-        return 0;
 }
 
 static struct platform_driver tps6507x_pmic_driver = {
@@ -549,7 +533,6 @@ static struct platform_driver tps6507x_pmic_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps6507x_pmic_probe,
-        .remove = tps6507x_pmic_remove,
 };
 
 static int __init tps6507x_pmic_init(void)
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c
index c8e70451df38..bd611cdf6e1c 100644
--- a/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@ -279,7 +279,7 @@ static int tps65090_regulator_probe(struct platform_device *pdev)
                                 if (ret < 0) {
                                         dev_err(&pdev->dev,
                                                 "failed disable ext control\n");
-                                        goto scrub;
+                                        return ret;
                                 }
                         }
                 }
@@ -296,12 +296,11 @@ static int tps65090_regulator_probe(struct platform_device *pdev)
                 else
                         config.of_node = NULL;
 
-                rdev = regulator_register(ri->desc, &config);
+                rdev = devm_regulator_register(&pdev->dev, ri->desc, &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc->name);
-                        ret = PTR_ERR(rdev);
-                        goto scrub;
+                        return PTR_ERR(rdev);
                 }
                 ri->rdev = rdev;
 
@@ -309,36 +308,13 @@ static int tps65090_regulator_probe(struct platform_device *pdev)
                 if (tps_pdata && is_dcdc(num) && tps_pdata->reg_init_data &&
                                 tps_pdata->enable_ext_control) {
                         ret = tps65090_config_ext_control(ri, true);
-                        if (ret < 0) {
-                                /* Increment num to get unregister rdev */
-                                num++;
-                                goto scrub;
-                        }
+                        if (ret < 0)
+                                return ret;
                 }
         }
 
         platform_set_drvdata(pdev, pmic);
         return 0;
-
-scrub:
-        while (--num >= 0) {
-                ri = &pmic[num];
-                regulator_unregister(ri->rdev);
-        }
-        return ret;
-}
-
-static int tps65090_regulator_remove(struct platform_device *pdev)
-{
-        struct tps65090_regulator *pmic = platform_get_drvdata(pdev);
-        struct tps65090_regulator *ri;
-        int num;
-
-        for (num = 0; num < TPS65090_REGULATOR_MAX; ++num) {
-                ri = &pmic[num];
-                regulator_unregister(ri->rdev);
-        }
-        return 0;
 }
 
 static struct platform_driver tps65090_regulator_driver = {
@@ -347,7 +323,6 @@ static struct platform_driver tps65090_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = tps65090_regulator_probe,
-        .remove         = tps65090_regulator_remove,
 };
 
 static int __init tps65090_regulator_init(void)
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c
index 90861d68a0b0..9ea1bf26bd13 100644
--- a/drivers/regulator/tps65217-regulator.c
+++ b/drivers/regulator/tps65217-regulator.c
@@ -52,25 +52,17 @@ static const unsigned int LDO1_VSEL_table[] = {
 };
 
 static const struct regulator_linear_range tps65217_uv1_ranges[] = {
-        { .min_uV = 900000, .max_uV = 1500000, .min_sel =  0, .max_sel = 24,
-          .uV_step = 25000 },
-        { .min_uV = 1550000, .max_uV = 1800000, .min_sel = 25, .max_sel = 30,
-          .uV_step = 50000 },
-        { .min_uV = 1850000, .max_uV = 2900000, .min_sel = 31, .max_sel = 52,
-          .uV_step = 50000 },
-        { .min_uV = 3000000, .max_uV = 3200000, .min_sel = 53, .max_sel = 55,
-          .uV_step = 100000 },
-        { .min_uV = 3300000, .max_uV = 3300000, .min_sel = 56, .max_sel = 62,
-          .uV_step = 0 },
+        REGULATOR_LINEAR_RANGE(900000, 0, 24, 25000),
+        REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000),
+        REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000),
+        REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000),
+        REGULATOR_LINEAR_RANGE(3300000, 56, 62, 0),
 };
 
 static const struct regulator_linear_range tps65217_uv2_ranges[] = {
-        { .min_uV = 1500000, .max_uV = 1900000, .min_sel =  0, .max_sel = 8,
-          .uV_step = 50000 },
-        { .min_uV = 2000000, .max_uV = 2400000, .min_sel = 9, .max_sel = 13,
-          .uV_step = 100000 },
-        { .min_uV = 2450000, .max_uV = 3300000, .min_sel = 14, .max_sel = 31,
-          .uV_step = 50000 },
+        REGULATOR_LINEAR_RANGE(1500000, 0, 8, 50000),
+        REGULATOR_LINEAR_RANGE(2000000, 9, 13, 100000),
+        REGULATOR_LINEAR_RANGE(2450000, 14, 31, 50000),
 };
 
 static int tps65217_pmic_enable(struct regulator_dev *dev)
@@ -233,7 +225,7 @@ static int tps65217_regulator_probe(struct platform_device *pdev)
         struct regulator_init_data *reg_data;
         struct regulator_dev *rdev;
         struct regulator_config config = { };
-        int i, ret;
+        int i;
 
         if (tps->dev->of_node)
                 pdata = tps65217_parse_dt(pdev);
@@ -269,35 +261,18 @@ static int tps65217_regulator_probe(struct platform_device *pdev)
                 if (tps->dev->of_node)
                         config.of_node = pdata->of_node[i];
 
-                rdev = regulator_register(&regulators[i], &config);
+                rdev = devm_regulator_register(&pdev->dev, &regulators[i],
+                                               &config);
                 if (IS_ERR(rdev)) {
                         dev_err(tps->dev, "failed to register %s regulator\n",
                                 pdev->name);
-                        ret = PTR_ERR(rdev);
-                        goto err_unregister_regulator;
+                        return PTR_ERR(rdev);
                 }
 
                 /* Save regulator for cleanup */
                 tps->rdev[i] = rdev;
         }
         return 0;
-
-err_unregister_regulator:
-        while (--i >= 0)
-                regulator_unregister(tps->rdev[i]);
-
-        return ret;
-}
-
-static int tps65217_regulator_remove(struct platform_device *pdev)
-{
-        struct tps65217 *tps = platform_get_drvdata(pdev);
-        unsigned int i;
-
-        for (i = 0; i < TPS65217_NUM_REGULATOR; i++)
-                regulator_unregister(tps->rdev[i]);
-
-        return 0;
 }
 
 static struct platform_driver tps65217_regulator_driver = {
@@ -305,7 +280,6 @@ static struct platform_driver tps65217_regulator_driver = {
                 .name = "tps65217-pmic",
         },
         .probe = tps65217_regulator_probe,
-        .remove = tps65217_regulator_remove,
 };
 
 static int __init tps65217_regulator_init(void)
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 62e8d28beabd..9f6bfda711b7 100644
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -577,21 +577,6 @@ static struct regulator_ops regulator_ops = {
         .get_current_limit      = get_current_limit,
 };
 
-static int pmic_remove(struct spi_device *spi)
-{
-        struct tps6524x *hw = spi_get_drvdata(spi);
-        int i;
-
-        if (!hw)
-                return 0;
-        for (i = 0; i < N_REGULATORS; i++) {
-                regulator_unregister(hw->rdev[i]);
-                hw->rdev[i] = NULL;
-        }
-        spi_set_drvdata(spi, NULL);
-        return 0;
-}
-
 static int pmic_probe(struct spi_device *spi)
 {
         struct tps6524x *hw;
@@ -599,7 +584,7 @@ static int pmic_probe(struct spi_device *spi)
         const struct supply_info *info = supply_info;
         struct regulator_init_data *init_data;
         struct regulator_config config = { };
-        int ret = 0, i;
+        int i;
 
         init_data = dev_get_platdata(dev);
         if (!init_data) {
@@ -632,24 +617,17 @@ static int pmic_probe(struct spi_device *spi)
                 config.init_data = init_data;
                 config.driver_data = hw;
 
-                hw->rdev[i] = regulator_register(&hw->desc[i], &config);
-                if (IS_ERR(hw->rdev[i])) {
-                        ret = PTR_ERR(hw->rdev[i]);
-                        hw->rdev[i] = NULL;
-                        goto fail;
-                }
+                hw->rdev[i] = devm_regulator_register(dev, &hw->desc[i],
+                                                      &config);
+                if (IS_ERR(hw->rdev[i]))
+                        return PTR_ERR(hw->rdev[i]);
         }
 
         return 0;
-
-fail:
-        pmic_remove(spi);
-        return ret;
 }
 
 static struct spi_driver pmic_driver = {
         .probe          = pmic_probe,
-        .remove         = pmic_remove,
         .driver         = {
                 .name   = "tps6524x",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index 2c9155b66f09..45e5d683d3f8 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -379,15 +379,14 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
                 ri = find_regulator_info(id);
                 if (!ri) {
                         dev_err(&pdev->dev, "invalid regulator ID specified\n");
-                        err = -EINVAL;
-                        goto fail;
+                        return -EINVAL;
                 }
 
                 err = tps6586x_regulator_preinit(pdev->dev.parent, ri);
                 if (err) {
                         dev_err(&pdev->dev,
                                 "regulator %d preinit failed, e %d\n", id, err);
-                        goto fail;
+                        return err;
                 }
 
                 config.dev = pdev->dev.parent;
@@ -397,12 +396,12 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
                 if (tps6586x_reg_matches)
                         config.of_node = tps6586x_reg_matches[id].of_node;
 
-                rdev[id] = regulator_register(&ri->desc, &config);
+                rdev[id] = devm_regulator_register(&pdev->dev, &ri->desc,
+                                                   &config);
                 if (IS_ERR(rdev[id])) {
                         dev_err(&pdev->dev, "failed to register regulator %s\n",
                                         ri->desc.name);
-                        err = PTR_ERR(rdev[id]);
-                        goto fail;
+                        return PTR_ERR(rdev[id]);
                 }
 
                 if (reg_data) {
@@ -411,30 +410,13 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
                         if (err < 0) {
                                 dev_err(&pdev->dev,
                                         "Slew rate config failed, e %d\n", err);
-                                regulator_unregister(rdev[id]);
-                                goto fail;
+                                return err;
                         }
                 }
         }
 
         platform_set_drvdata(pdev, rdev);
         return 0;
-
-fail:
-        while (--id >= 0)
-                regulator_unregister(rdev[id]);
-        return err;
-}
-
-static int tps6586x_regulator_remove(struct platform_device *pdev)
-{
-        struct regulator_dev **rdev = platform_get_drvdata(pdev);
-        int id = TPS6586X_ID_MAX_REGULATOR;
-
-        while (--id >= 0)
-                regulator_unregister(rdev[id]);
-
-        return 0;
 }
 
 static struct platform_driver tps6586x_regulator_driver = {
@@ -443,7 +425,6 @@ static struct platform_driver tps6586x_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = tps6586x_regulator_probe,
-        .remove         = tps6586x_regulator_remove,
 };
 
 static int __init tps6586x_regulator_init(void)
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 45c16447744b..b8167df71170 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -1177,35 +1177,19 @@ static int tps65910_probe(struct platform_device *pdev)
                 if (tps65910_reg_matches)
                         config.of_node = tps65910_reg_matches[i].of_node;
 
-                rdev = regulator_register(&pmic->desc[i], &config);
+                rdev = devm_regulator_register(&pdev->dev, &pmic->desc[i],
+                                               &config);
                 if (IS_ERR(rdev)) {
                         dev_err(tps65910->dev,
                                 "failed to register %s regulator\n",
                                 pdev->name);
-                        err = PTR_ERR(rdev);
-                        goto err_unregister_regulator;
+                        return PTR_ERR(rdev);
                 }
 
                 /* Save regulator for cleanup */
                 pmic->rdev[i] = rdev;
         }
         return 0;
-
-err_unregister_regulator:
-        while (--i >= 0)
-                regulator_unregister(pmic->rdev[i]);
-        return err;
-}
-
-static int tps65910_remove(struct platform_device *pdev)
-{
-        struct tps65910_reg *pmic = platform_get_drvdata(pdev);
-        int i;
-
-        for (i = 0; i < pmic->num_regulators; i++)
-                regulator_unregister(pmic->rdev[i]);
-
-        return 0;
 }
 
 static void tps65910_shutdown(struct platform_device *pdev)
@@ -1244,7 +1228,6 @@ static struct platform_driver tps65910_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps65910_probe,
-        .remove = tps65910_remove,
         .shutdown = tps65910_shutdown,
 };
 
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index 281e52ac64ba..9cafaa0f9455 100644
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -119,12 +119,9 @@ struct tps65912_reg {
 };
 
 static const struct regulator_linear_range tps65912_ldo_ranges[] = {
-        { .min_uV = 800000, .max_uV = 1600000, .min_sel =  0, .max_sel = 32,
-          .uV_step = 25000 },
-        { .min_uV = 1650000, .max_uV = 3000000, .min_sel = 33, .max_sel = 60,
-          .uV_step = 50000 },
-        { .min_uV = 3100000, .max_uV = 3300000, .min_sel = 61, .max_sel = 63,
-          .uV_step = 100000 },
+        REGULATOR_LINEAR_RANGE(800000, 0, 32, 25000),
+        REGULATOR_LINEAR_RANGE(1650000, 33, 60, 50000),
+        REGULATOR_LINEAR_RANGE(3100000, 61, 63, 100000),
 };
 
 static int tps65912_get_range(struct tps65912_reg *pmic, int id)
@@ -461,7 +458,7 @@ static int tps65912_probe(struct platform_device *pdev)
         struct regulator_dev *rdev;
         struct tps65912_reg *pmic;
         struct tps65912_board *pmic_plat_data;
-        int i, err;
+        int i;
 
         pmic_plat_data = dev_get_platdata(tps65912->dev);
         if (!pmic_plat_data)
@@ -504,34 +501,19 @@ static int tps65912_probe(struct platform_device *pdev)
                 config.init_data = reg_data;
                 config.driver_data = pmic;
 
-                rdev = regulator_register(&pmic->desc[i], &config);
+                rdev = devm_regulator_register(&pdev->dev, &pmic->desc[i],
+                                               &config);
                 if (IS_ERR(rdev)) {
                         dev_err(tps65912->dev,
                                 "failed to register %s regulator\n",
                                 pdev->name);
-                        err = PTR_ERR(rdev);
-                        goto err;
+                        return PTR_ERR(rdev);
                 }
 
                 /* Save regulator for cleanup */
                 pmic->rdev[i] = rdev;
         }
         return 0;
-
-err:
-        while (--i >= 0)
-                regulator_unregister(pmic->rdev[i]);
-        return err;
-}
-
-static int tps65912_remove(struct platform_device *pdev)
-{
-        struct tps65912_reg *tps65912_reg = platform_get_drvdata(pdev);
-        int i;
-
-        for (i = 0; i < TPS65912_NUM_REGULATOR; i++)
-                regulator_unregister(tps65912_reg->rdev[i]);
-        return 0;
 }
 
 static struct platform_driver tps65912_driver = {
@@ -540,7 +522,6 @@ static struct platform_driver tps65912_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = tps65912_probe,
-        .remove = tps65912_remove,
 };
 
 static int __init tps65912_init(void)
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index 6511d0bfd896..71f457a42623 100644
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -719,7 +719,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
                         if (ret < 0) {
                                 dev_err(&pdev->dev,
                                         "regulator config failed, e %d\n", ret);
-                                goto fail;
+                                return ret;
                         }
 
                         ret = tps80031_power_req_config(pdev->dev.parent,
@@ -727,41 +727,22 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
                         if (ret < 0) {
                                 dev_err(&pdev->dev,
                                         "pwr_req config failed, err %d\n", ret);
-                                goto fail;
+                                return ret;
                         }
                 }
-                rdev = regulator_register(&ri->rinfo->desc, &config);
+                rdev = devm_regulator_register(&pdev->dev, &ri->rinfo->desc,
+                                               &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev,
                                 "register regulator failed %s\n",
                                         ri->rinfo->desc.name);
-                        ret = PTR_ERR(rdev);
-                        goto fail;
+                        return PTR_ERR(rdev);
                 }
                 ri->rdev = rdev;
         }
 
         platform_set_drvdata(pdev, pmic);
         return 0;
-fail:
-        while (--num >= 0) {
-                ri = &pmic[num];
-                regulator_unregister(ri->rdev);
-        }
-        return ret;
-}
-
-static int tps80031_regulator_remove(struct platform_device *pdev)
-{
-        struct tps80031_regulator *pmic = platform_get_drvdata(pdev);
-        struct tps80031_regulator *ri = NULL;
-        int num;
-
-        for (num = 0; num < TPS80031_REGULATOR_MAX; ++num) {
-                ri = &pmic[num];
-                regulator_unregister(ri->rdev);
-        }
-        return 0;
 }
 
 static struct platform_driver tps80031_regulator_driver = {
@@ -770,7 +751,6 @@ static struct platform_driver tps80031_regulator_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = tps80031_regulator_probe,
-        .remove         = tps80031_regulator_remove,
 };
 
 static int __init tps80031_regulator_init(void)
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 78aae4cbb004..8ebd785485c7 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1188,7 +1188,7 @@ static int twlreg_probe(struct platform_device *pdev)
         config.driver_data = info;
         config.of_node = pdev->dev.of_node;
 
-        rdev = regulator_register(&info->desc, &config);
+        rdev = devm_regulator_register(&pdev->dev, &info->desc, &config);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "can't register %s, %ld\n",
                                 info->desc.name, PTR_ERR(rdev));
@@ -1217,7 +1217,6 @@ static int twlreg_remove(struct platform_device *pdev)
         struct regulator_dev *rdev = platform_get_drvdata(pdev);
         struct twlreg_info *info = rdev->reg_data;
 
-        regulator_unregister(rdev);
         kfree(info);
         return 0;
 }
diff --git a/drivers/regulator/vexpress.c b/drivers/regulator/vexpress.c
index 4668c7f8133d..f3ae28a7e663 100644
--- a/drivers/regulator/vexpress.c
+++ b/drivers/regulator/vexpress.c
@@ -96,7 +96,7 @@ static int vexpress_regulator_probe(struct platform_device *pdev)
         config.driver_data = reg;
         config.of_node = pdev->dev.of_node;
 
-        reg->regdev = regulator_register(&reg->desc, &config);
+        reg->regdev = devm_regulator_register(&pdev->dev, &reg->desc, &config);
         if (IS_ERR(reg->regdev)) {
                 err = PTR_ERR(reg->regdev);
                 goto error_regulator_register;
@@ -119,7 +119,6 @@ static int vexpress_regulator_remove(struct platform_device *pdev)
         struct vexpress_regulator *reg = platform_get_drvdata(pdev);
 
         vexpress_config_func_put(reg->func);
-        regulator_unregister(reg->regdev);
 
         return 0;
 }
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 11861cb861df..6823e6f2b88a 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -387,8 +387,9 @@ static struct regulator_ops wm831x_buckv_ops = {
  * Set up DVS control.  We just log errors since we can still run
  * (with reduced performance) if we fail.
  */
-static void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
-                                            struct wm831x_buckv_pdata *pdata)
+static void wm831x_buckv_dvs_init(struct platform_device *pdev,
+                                  struct wm831x_dcdc *dcdc,
+                                  struct wm831x_buckv_pdata *pdata)
 {
         struct wm831x *wm831x = dcdc->wm831x;
         int ret;
@@ -402,9 +403,9 @@ static void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
          */
         dcdc->dvs_gpio_state = pdata->dvs_init_state;
 
-        ret = gpio_request_one(pdata->dvs_gpio,
-                               dcdc->dvs_gpio_state ? GPIOF_INIT_HIGH : 0,
-                               "DCDC DVS");
+        ret = devm_gpio_request_one(&pdev->dev, pdata->dvs_gpio,
+                                    dcdc->dvs_gpio_state ? GPIOF_INIT_HIGH : 0,
+                                    "DCDC DVS");
         if (ret < 0) {
                 dev_err(wm831x->dev, "Failed to get %s DVS GPIO: %d\n",
                         dcdc->name, ret);
@@ -513,7 +514,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
         dcdc->dvs_vsel = ret & WM831X_DC1_DVS_VSEL_MASK;
 
         if (pdata && pdata->dcdc[id])
-                wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data);
+                wm831x_buckv_dvs_init(pdev, dcdc,
+                                      pdata->dcdc[id]->driver_data);
 
         config.dev = pdev->dev.parent;
         if (pdata)
@@ -521,7 +523,8 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
         config.driver_data = dcdc;
         config.regmap = wm831x->regmap;
 
-        dcdc->regulator = regulator_register(&dcdc->desc, &config);
+        dcdc->regulator = devm_regulator_register(&pdev->dev, &dcdc->desc,
+                                                  &config);
         if (IS_ERR(dcdc->regulator)) {
                 ret = PTR_ERR(dcdc->regulator);
                 dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
@@ -530,57 +533,35 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
         }
 
         irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
-        ret = request_threaded_irq(irq, NULL, wm831x_dcdc_uv_irq,
-                                   IRQF_TRIGGER_RISING, dcdc->name, dcdc);
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        wm831x_dcdc_uv_irq,
+                                        IRQF_TRIGGER_RISING, dcdc->name, dcdc);
         if (ret != 0) {
                 dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
                         irq, ret);
-                goto err_regulator;
+                goto err;
         }
 
         irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "HC"));
-        ret = request_threaded_irq(irq, NULL, wm831x_dcdc_oc_irq,
-                                   IRQF_TRIGGER_RISING, dcdc->name, dcdc);
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        wm831x_dcdc_oc_irq,
+                                        IRQF_TRIGGER_RISING, dcdc->name, dcdc);
         if (ret != 0) {
                 dev_err(&pdev->dev, "Failed to request HC IRQ %d: %d\n",
                         irq, ret);
-                goto err_uv;
+                goto err;
         }
 
         platform_set_drvdata(pdev, dcdc);
 
         return 0;
 
-err_uv:
-        free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")),
-                 dcdc);
-err_regulator:
-        regulator_unregister(dcdc->regulator);
 err:
-        if (dcdc->dvs_gpio)
-                gpio_free(dcdc->dvs_gpio);
         return ret;
 }
 
-static int wm831x_buckv_remove(struct platform_device *pdev)
-{
-        struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
-        struct wm831x *wm831x = dcdc->wm831x;
-
-        free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "HC")),
-                            dcdc);
-        free_irq(wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")),
-                            dcdc);
-        regulator_unregister(dcdc->regulator);
-        if (dcdc->dvs_gpio)
-                gpio_free(dcdc->dvs_gpio);
-
-        return 0;
-}
-
 static struct platform_driver wm831x_buckv_driver = {
         .probe = wm831x_buckv_probe,
-        .remove = wm831x_buckv_remove,
         .driver         = {
                 .name   = "wm831x-buckv",
                 .owner  = THIS_MODULE,
@@ -681,7 +662,8 @@ static int wm831x_buckp_probe(struct platform_device *pdev)
         config.driver_data = dcdc;
         config.regmap = wm831x->regmap;
 
-        dcdc->regulator = regulator_register(&dcdc->desc, &config);
+        dcdc->regulator = devm_regulator_register(&pdev->dev, &dcdc->desc,
+                                                  &config);
         if (IS_ERR(dcdc->regulator)) {
                 ret = PTR_ERR(dcdc->regulator);
                 dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
@@ -690,38 +672,25 @@ static int wm831x_buckp_probe(struct platform_device *pdev)
         }
 
         irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
-        ret = request_threaded_irq(irq, NULL, wm831x_dcdc_uv_irq,
-                                   IRQF_TRIGGER_RISING, dcdc->name, dcdc);
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        wm831x_dcdc_uv_irq,
+                                        IRQF_TRIGGER_RISING, dcdc->name, dcdc);
         if (ret != 0) {
                 dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
                         irq, ret);
-                goto err_regulator;
+                goto err;
         }
 
         platform_set_drvdata(pdev, dcdc);
 
         return 0;
 
-err_regulator:
-        regulator_unregister(dcdc->regulator);
 err:
         return ret;
 }
 
-static int wm831x_buckp_remove(struct platform_device *pdev)
-{
-        struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
-
-        free_irq(wm831x_irq(dcdc->wm831x, platform_get_irq_byname(pdev, "UV")),
-                            dcdc);
-        regulator_unregister(dcdc->regulator);
-
-        return 0;
-}
-
 static struct platform_driver wm831x_buckp_driver = {
         .probe = wm831x_buckp_probe,
-        .remove = wm831x_buckp_remove,
         .driver         = {
                 .name   = "wm831x-buckp",
                 .owner  = THIS_MODULE,
@@ -813,7 +782,8 @@ static int wm831x_boostp_probe(struct platform_device *pdev)
         config.driver_data = dcdc;
         config.regmap = wm831x->regmap;
 
-        dcdc->regulator = regulator_register(&dcdc->desc, &config);
+        dcdc->regulator = devm_regulator_register(&pdev->dev, &dcdc->desc,
+                                                  &config);
         if (IS_ERR(dcdc->regulator)) {
                 ret = PTR_ERR(dcdc->regulator);
                 dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
@@ -822,39 +792,26 @@ static int wm831x_boostp_probe(struct platform_device *pdev)
         }
 
         irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
-        ret = request_threaded_irq(irq, NULL, wm831x_dcdc_uv_irq,
-                                   IRQF_TRIGGER_RISING, dcdc->name,
-                                   dcdc);
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        wm831x_dcdc_uv_irq,
+                                        IRQF_TRIGGER_RISING, dcdc->name,
+                                        dcdc);
         if (ret != 0) {
                 dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
                         irq, ret);
-                goto err_regulator;
+                goto err;
         }
 
         platform_set_drvdata(pdev, dcdc);
 
         return 0;
 
-err_regulator:
-        regulator_unregister(dcdc->regulator);
 err:
         return ret;
 }
 
-static int wm831x_boostp_remove(struct platform_device *pdev)
-{
-        struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
-
-        free_irq(wm831x_irq(dcdc->wm831x, platform_get_irq_byname(pdev, "UV")),
-                 dcdc);
-        regulator_unregister(dcdc->regulator);
-
-        return 0;
-}
-
 static struct platform_driver wm831x_boostp_driver = {
         .probe = wm831x_boostp_probe,
-        .remove = wm831x_boostp_remove,
         .driver         = {
                 .name   = "wm831x-boostp",
                 .owner  = THIS_MODULE,
@@ -914,7 +871,8 @@ static int wm831x_epe_probe(struct platform_device *pdev)
         config.driver_data = dcdc;
         config.regmap = wm831x->regmap;
 
-        dcdc->regulator = regulator_register(&dcdc->desc, &config);
+        dcdc->regulator = devm_regulator_register(&pdev->dev, &dcdc->desc,
+                                                  &config);
         if (IS_ERR(dcdc->regulator)) {
                 ret = PTR_ERR(dcdc->regulator);
                 dev_err(wm831x->dev, "Failed to register EPE%d: %d\n",
@@ -930,18 +888,8 @@ err:
         return ret;
 }
 
-static int wm831x_epe_remove(struct platform_device *pdev)
-{
-        struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
-
-        regulator_unregister(dcdc->regulator);
-
-        return 0;
-}
-
 static struct platform_driver wm831x_epe_driver = {
         .probe = wm831x_epe_probe,
-        .remove = wm831x_epe_remove,
         .driver         = {
                 .name   = "wm831x-epe",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 4eb373de1fac..0339b886df5d 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -194,7 +194,8 @@ static int wm831x_isink_probe(struct platform_device *pdev)
         config.init_data = pdata->isink[id];
         config.driver_data = isink;
 
-        isink->regulator = regulator_register(&isink->desc, &config);
+        isink->regulator = devm_regulator_register(&pdev->dev, &isink->desc,
+                                                   &config);
         if (IS_ERR(isink->regulator)) {
                 ret = PTR_ERR(isink->regulator);
                 dev_err(wm831x->dev, "Failed to register ISINK%d: %d\n",
@@ -203,38 +204,26 @@ static int wm831x_isink_probe(struct platform_device *pdev)
         }
 
         irq = wm831x_irq(wm831x, platform_get_irq(pdev, 0));
-        ret = request_threaded_irq(irq, NULL, wm831x_isink_irq,
-                                   IRQF_TRIGGER_RISING, isink->name, isink);
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        wm831x_isink_irq,
+                                        IRQF_TRIGGER_RISING, isink->name,
+                                        isink);
         if (ret != 0) {
                 dev_err(&pdev->dev, "Failed to request ISINK IRQ %d: %d\n",
                         irq, ret);
-                goto err_regulator;
+                goto err;
         }
 
         platform_set_drvdata(pdev, isink);
 
         return 0;
 
-err_regulator:
-        regulator_unregister(isink->regulator);
 err:
         return ret;
 }
 
-static int wm831x_isink_remove(struct platform_device *pdev)
-{
-        struct wm831x_isink *isink = platform_get_drvdata(pdev);
-
-        free_irq(wm831x_irq(isink->wm831x, platform_get_irq(pdev, 0)), isink);
-
-        regulator_unregister(isink->regulator);
-
-        return 0;
-}
-
 static struct platform_driver wm831x_isink_driver = {
         .probe = wm831x_isink_probe,
-        .remove = wm831x_isink_remove,
         .driver         = {
                 .name   = "wm831x-isink",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 2205fbc2c37b..46d6700467b5 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -63,10 +63,8 @@ static irqreturn_t wm831x_ldo_uv_irq(int irq, void *data)
  */
 
 static const struct regulator_linear_range wm831x_gp_ldo_ranges[] = {
-        { .min_uV =  900000, .max_uV = 1600000, .min_sel =  0, .max_sel = 14,
-          .uV_step =  50000 },
-        { .min_uV = 1700000, .max_uV = 3300000, .min_sel = 15, .max_sel = 31,
-          .uV_step = 100000 },
+        REGULATOR_LINEAR_RANGE(900000, 0, 14, 50000),
+        REGULATOR_LINEAR_RANGE(1700000, 15, 31, 100000),
 };
 
 static int wm831x_gp_ldo_set_suspend_voltage(struct regulator_dev *rdev,
@@ -279,7 +277,8 @@ static int wm831x_gp_ldo_probe(struct platform_device *pdev)
         config.driver_data = ldo;
         config.regmap = wm831x->regmap;
 
-        ldo->regulator = regulator_register(&ldo->desc, &config);
+        ldo->regulator = devm_regulator_register(&pdev->dev, &ldo->desc,
+                                                 &config);
         if (IS_ERR(ldo->regulator)) {
                 ret = PTR_ERR(ldo->regulator);
                 dev_err(wm831x->dev, "Failed to register LDO%d: %d\n",
@@ -288,39 +287,26 @@ static int wm831x_gp_ldo_probe(struct platform_device *pdev)
         }
 
         irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
-        ret = request_threaded_irq(irq, NULL, wm831x_ldo_uv_irq,
-                                   IRQF_TRIGGER_RISING, ldo->name,
-                                   ldo);
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        wm831x_ldo_uv_irq,
+                                        IRQF_TRIGGER_RISING, ldo->name,
+                                        ldo);
         if (ret != 0) {
                 dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
                         irq, ret);
-                goto err_regulator;
+                goto err;
         }
 
         platform_set_drvdata(pdev, ldo);
 
         return 0;
 
-err_regulator:
-        regulator_unregister(ldo->regulator);
 err:
         return ret;
 }
 
-static int wm831x_gp_ldo_remove(struct platform_device *pdev)
-{
-        struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
-
-        free_irq(wm831x_irq(ldo->wm831x,
-                            platform_get_irq_byname(pdev, "UV")), ldo);
-        regulator_unregister(ldo->regulator);
-
-        return 0;
-}
-
 static struct platform_driver wm831x_gp_ldo_driver = {
         .probe = wm831x_gp_ldo_probe,
-        .remove = wm831x_gp_ldo_remove,
         .driver         = {
                 .name   = "wm831x-ldo",
                 .owner  = THIS_MODULE,
@@ -332,10 +318,8 @@ static struct platform_driver wm831x_gp_ldo_driver = {
  */
 
 static const struct regulator_linear_range wm831x_aldo_ranges[] = {
-        { .min_uV = 1000000, .max_uV = 1600000, .min_sel =  0, .max_sel = 12,
-          .uV_step =  50000 },
-        { .min_uV = 1700000, .max_uV = 3500000, .min_sel = 13, .max_sel = 31,
-          .uV_step = 100000 },
+        REGULATOR_LINEAR_RANGE(1000000, 0, 12, 50000),
+        REGULATOR_LINEAR_RANGE(1700000, 13, 31, 100000),
 };
 
 static int wm831x_aldo_set_suspend_voltage(struct regulator_dev *rdev,
@@ -505,7 +489,8 @@ static int wm831x_aldo_probe(struct platform_device *pdev)
         config.driver_data = ldo;
         config.regmap = wm831x->regmap;
 
-        ldo->regulator = regulator_register(&ldo->desc, &config);
+        ldo->regulator = devm_regulator_register(&pdev->dev, &ldo->desc,
+                                                 &config);
         if (IS_ERR(ldo->regulator)) {
                 ret = PTR_ERR(ldo->regulator);
                 dev_err(wm831x->dev, "Failed to register LDO%d: %d\n",
@@ -514,38 +499,25 @@ static int wm831x_aldo_probe(struct platform_device *pdev)
         }
 
         irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
-        ret = request_threaded_irq(irq, NULL, wm831x_ldo_uv_irq,
-                                   IRQF_TRIGGER_RISING, ldo->name, ldo);
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        wm831x_ldo_uv_irq,
+                                        IRQF_TRIGGER_RISING, ldo->name, ldo);
         if (ret != 0) {
                 dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
                         irq, ret);
-                goto err_regulator;
+                goto err;
         }
 
         platform_set_drvdata(pdev, ldo);
 
         return 0;
 
-err_regulator:
-        regulator_unregister(ldo->regulator);
 err:
         return ret;
 }
 
-static int wm831x_aldo_remove(struct platform_device *pdev)
-{
-        struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
-
-        free_irq(wm831x_irq(ldo->wm831x, platform_get_irq_byname(pdev, "UV")),
-                 ldo);
-        regulator_unregister(ldo->regulator);
-
-        return 0;
-}
-
 static struct platform_driver wm831x_aldo_driver = {
         .probe = wm831x_aldo_probe,
-        .remove = wm831x_aldo_remove,
         .driver         = {
                 .name   = "wm831x-aldo",
                 .owner  = THIS_MODULE,
@@ -663,7 +635,8 @@ static int wm831x_alive_ldo_probe(struct platform_device *pdev)
         config.driver_data = ldo;
         config.regmap = wm831x->regmap;
 
-        ldo->regulator = regulator_register(&ldo->desc, &config);
+        ldo->regulator = devm_regulator_register(&pdev->dev, &ldo->desc,
+                                                 &config);
         if (IS_ERR(ldo->regulator)) {
                 ret = PTR_ERR(ldo->regulator);
                 dev_err(wm831x->dev, "Failed to register LDO%d: %d\n",
@@ -679,18 +652,8 @@ err:
         return ret;
 }
 
-static int wm831x_alive_ldo_remove(struct platform_device *pdev)
-{
-        struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
-
-        regulator_unregister(ldo->regulator);
-
-        return 0;
-}
-
 static struct platform_driver wm831x_alive_ldo_driver = {
         .probe = wm831x_alive_ldo_probe,
-        .remove = wm831x_alive_ldo_remove,
         .driver         = {
                 .name   = "wm831x-alive-ldo",
                 .owner  = THIS_MODULE,
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index 61ca9292a429..de7b9c73e3fa 100644
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -543,10 +543,8 @@ static int wm8350_dcdc_set_suspend_mode(struct regulator_dev *rdev,
 }
 
 static const struct regulator_linear_range wm8350_ldo_ranges[] = {
-        { .min_uV =  900000, .max_uV = 1650000, .min_sel =  0, .max_sel = 15,
-          .uV_step =  50000 },
-        { .min_uV = 1800000, .max_uV = 3300000, .min_sel = 16, .max_sel = 31,
-          .uV_step = 100000 },
+        REGULATOR_LINEAR_RANGE(900000, 0, 15, 50000),
+        REGULATOR_LINEAR_RANGE(1800000, 16, 31, 100000),
 };
 
 static int wm8350_ldo_set_suspend_voltage(struct regulator_dev *rdev, int uV)
@@ -1206,7 +1204,8 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
         config.regmap = wm8350->regmap;
 
         /* register regulator */
-        rdev = regulator_register(&wm8350_reg[pdev->id], &config);
+        rdev = devm_regulator_register(&pdev->dev, &wm8350_reg[pdev->id],
+                                       &config);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register %s\n",
                         wm8350_reg[pdev->id].name);
@@ -1217,7 +1216,6 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
         ret = wm8350_register_irq(wm8350, wm8350_reg[pdev->id].irq,
                                   pmic_uv_handler, 0, "UV", rdev);
         if (ret < 0) {
-                regulator_unregister(rdev);
                 dev_err(&pdev->dev, "failed to register regulator %s IRQ\n",
                         wm8350_reg[pdev->id].name);
                 return ret;
@@ -1233,8 +1231,6 @@ static int wm8350_regulator_remove(struct platform_device *pdev)
 
         wm8350_free_irq(wm8350, wm8350_reg[pdev->id].irq, rdev);
 
-        regulator_unregister(rdev);
-
         return 0;
 }
 
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 58f51bec13f2..82d829000851 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -20,10 +20,8 @@
 #include <linux/mfd/wm8400-private.h>
 
 static const struct regulator_linear_range wm8400_ldo_ranges[] = {
-        { .min_uV =  900000, .max_uV = 1600000, .min_sel = 0, .max_sel = 14,
-          .uV_step =  50000 },
-        { .min_uV = 1700000, .max_uV = 3300000, .min_sel = 15, .max_sel = 31,
-          .uV_step = 100000 },
+        REGULATOR_LINEAR_RANGE(900000, 0, 14, 50000),
+        REGULATOR_LINEAR_RANGE(1700000, 15, 31, 100000),
 };
 
 static struct regulator_ops wm8400_ldo_ops = {
@@ -219,7 +217,8 @@ static int wm8400_regulator_probe(struct platform_device *pdev)
         config.driver_data = wm8400;
         config.regmap = wm8400->regmap;
 
-        rdev = regulator_register(&regulators[pdev->id], &config);
+        rdev = devm_regulator_register(&pdev->dev, &regulators[pdev->id],
+                                       &config);
         if (IS_ERR(rdev))
                 return PTR_ERR(rdev);
 
@@ -228,21 +227,11 @@ static int wm8400_regulator_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int wm8400_regulator_remove(struct platform_device *pdev)
-{
-        struct regulator_dev *rdev = platform_get_drvdata(pdev);
-
-        regulator_unregister(rdev);
-
-        return 0;
-}
-
 static struct platform_driver wm8400_regulator_driver = {
         .driver = {
                 .name = "wm8400-regulator",
         },
         .probe = wm8400_regulator_probe,
-        .remove = wm8400_regulator_remove,
 };
 
 /**
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 5ee2a208457c..71c5911f2e71 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -165,7 +165,9 @@ static int wm8994_ldo_probe(struct platform_device *pdev)
                 ldo->init_data = *pdata->ldo[id].init_data;
         }
 
-        ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &config);
+        ldo->regulator = devm_regulator_register(&pdev->dev,
+                                                 &wm8994_ldo_desc[id],
+                                                 &config);
         if (IS_ERR(ldo->regulator)) {
                 ret = PTR_ERR(ldo->regulator);
                 dev_err(wm8994->dev, "Failed to register LDO%d: %d\n",
@@ -181,18 +183,8 @@ err:
         return ret;
 }
 
-static int wm8994_ldo_remove(struct platform_device *pdev)
-{
-        struct wm8994_ldo *ldo = platform_get_drvdata(pdev);
-
-        regulator_unregister(ldo->regulator);
-
-        return 0;
-}
-
 static struct platform_driver wm8994_ldo_driver = {
         .probe = wm8994_ldo_probe,
-        .remove = wm8994_ldo_remove,
         .driver         = {
                 .name   = "wm8994-ldo",
                 .owner  = THIS_MODULE,
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index a0ebbc9ce5cd..042aa077b5b3 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1912,9 +1912,6 @@ static int serial_imx_probe_dt(struct imx_port *sport,
 
         sport->devdata = of_id->data;
 
-        if (of_device_is_stdout_path(np))
-                add_preferred_console(imx_reg.cons->name, sport->port.line, 0);
-
         return 0;
 }
 #else
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 93b697a0de65..15ad6fcda88b 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -561,12 +561,13 @@ static int vt8500_serial_probe(struct platform_device *pdev)
         if (!mmres || !irqres)
                 return -ENODEV;
 
-        if (np)
+        if (np) {
                 port = of_alias_get_id(np, "serial");
                 if (port >= VT8500_MAX_PORTS)
                         port = -1;
-        else
+        } else {
                 port = -1;
+        }
 
         if (port < 0) {
                 /* calculate the port id */
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 6f96795dd20c..64d7a6d9a1ad 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -100,8 +100,10 @@ static void host_stop(struct ci_hdrc *ci)
 {
         struct usb_hcd *hcd = ci->hcd;
 
-        usb_remove_hcd(hcd);
-        usb_put_hcd(hcd);
+        if (hcd) {
+                usb_remove_hcd(hcd);
+                usb_put_hcd(hcd);
+        }
         if (ci->platdata->reg_vbus)
                 regulator_disable(ci->platdata->reg_vbus);
 }
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 5b44cd47da5b..01fe36273f3b 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -97,6 +97,9 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Alcor Micro Corp. Hub */
         { USB_DEVICE(0x058f, 0x9254), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* MicroTouch Systems touchscreen */
+        { USB_DEVICE(0x0596, 0x051e), .driver_info = USB_QUIRK_RESET_RESUME },
+
         /* appletouch */
         { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },
 
@@ -130,6 +133,9 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Broadcom BCM92035DGROM BT dongle */
         { USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* MAYA44USB sound device */
+        { USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME },
+
         /* Action Semiconductor flash disk */
         { USB_DEVICE(0x10d6, 0x2200), .driver_info =
                         USB_QUIRK_STRING_FETCH_255 },
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 2c76ef1320ea..08ef2829a7e2 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -799,7 +799,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)
          * switchable ports.
          */
         pci_write_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,
-                        cpu_to_le32(ports_available));
+                        ports_available);
 
         pci_read_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN,
                         &ports_available);
@@ -821,7 +821,7 @@ void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev)
          * host.
          */
         pci_write_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,
-                        cpu_to_le32(ports_available));
+                        ports_available);
 
         pci_read_config_dword(xhci_pdev, USB_INTEL_XUSB2PR,
                         &ports_available);
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 773a6b28c4f1..e8b4c56dcf62 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -1157,18 +1157,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
                 t1 = xhci_port_state_to_neutral(t1);
                 if (t1 != t2)
                         xhci_writel(xhci, t2, port_array[port_index]);
-
-                if (hcd->speed != HCD_USB3) {
-                        /* enable remote wake up for USB 2.0 */
-                        __le32 __iomem *addr;
-                        u32 tmp;
-
-                        /* Get the port power control register address. */
-                        addr = port_array[port_index] + PORTPMSC;
-                        tmp = xhci_readl(xhci, addr);
-                        tmp |= PORT_RWE;
-                        xhci_writel(xhci, tmp, addr);
-                }
         }
         hcd->state = HC_STATE_SUSPENDED;
         bus_state->next_statechange = jiffies + msecs_to_jiffies(10);
@@ -1247,20 +1235,6 @@ int xhci_bus_resume(struct usb_hcd *hcd)
                                 xhci_ring_device(xhci, slot_id);
                 } else
                         xhci_writel(xhci, temp, port_array[port_index]);
-
-                if (hcd->speed != HCD_USB3) {
-                        /* disable remote wake up for USB 2.0 */
-                        __le32 __iomem *addr;
-                        u32 tmp;
-
-                        /* Add one to the port status register address to get
-                         * the port power control register address.
-                         */
-                        addr = port_array[port_index] + PORTPMSC;
-                        tmp = xhci_readl(xhci, addr);
-                        tmp &= ~PORT_RWE;
-                        xhci_writel(xhci, tmp, addr);
-                }
         }
 
         (void) xhci_readl(xhci, &xhci->op_regs->command);
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 236c3aabe940..b8dffd59eb25 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -35,6 +35,9 @@
 #define PCI_VENDOR_ID_ETRON             0x1b6f
 #define PCI_DEVICE_ID_ASROCK_P67        0x7023
 
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI      0x8c31
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI   0x9c31
+
 static const char hcd_name[] = "xhci_hcd";
 
 /* called after powerup, by probe or system-pm "wakeup" */
@@ -69,6 +72,14 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
                                 "QUIRK: Fresco Logic xHC needs configure"
                                 " endpoint cmd after reset endpoint");
                 }
+                if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&
+                                pdev->revision == 0x4) {
+                        xhci->quirks |= XHCI_SLOW_SUSPEND;
+                        xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
+                                "QUIRK: Fresco Logic xHC revision %u"
+                                "must be suspended extra slowly",
+                                pdev->revision);
+                }
                 /* Fresco Logic confirms: all revisions of this chip do not
                  * support MSI, even though some of them claim to in their PCI
                  * capabilities.
@@ -110,6 +121,15 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
                 xhci->quirks |= XHCI_SPURIOUS_REBOOT;
                 xhci->quirks |= XHCI_AVOID_BEI;
         }
+        if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
+            (pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI ||
+             pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI)) {
+                /* Workaround for occasional spurious wakeups from S5 (or
+                 * any other sleep) on Haswell machines with LPT and LPT-LP
+                 * with the new Intel BIOS
+                 */
+                xhci->quirks |= XHCI_SPURIOUS_WAKEUP;
+        }
         if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
                         pdev->device == PCI_DEVICE_ID_ASROCK_P67) {
                 xhci->quirks |= XHCI_RESET_ON_RESUME;
@@ -217,6 +237,11 @@ static void xhci_pci_remove(struct pci_dev *dev)
                 usb_put_hcd(xhci->shared_hcd);
         }
         usb_hcd_pci_remove(dev);
+
+        /* Workaround for spurious wakeups at shutdown with HSW */
+        if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
+                pci_set_power_state(dev, PCI_D3hot);
+
         kfree(xhci);
 }
 
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 1e36dbb48366..6e0d886bcce5 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -730,6 +730,9 @@ void xhci_shutdown(struct usb_hcd *hcd)
 
         spin_lock_irq(&xhci->lock);
         xhci_halt(xhci);
+        /* Workaround for spurious wakeups at shutdown with HSW */
+        if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
+                xhci_reset(xhci);
         spin_unlock_irq(&xhci->lock);
 
         xhci_cleanup_msix(xhci);
@@ -737,6 +740,10 @@ void xhci_shutdown(struct usb_hcd *hcd)
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
                         "xhci_shutdown completed - status = %x",
                         xhci_readl(xhci, &xhci->op_regs->status));
+
+        /* Yet another workaround for spurious wakeups at shutdown with HSW */
+        if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
+                pci_set_power_state(to_pci_dev(hcd->self.controller), PCI_D3hot);
 }
 
 #ifdef CONFIG_PM
@@ -839,6 +846,7 @@ static void xhci_clear_command_ring(struct xhci_hcd *xhci)
 int xhci_suspend(struct xhci_hcd *xhci)
 {
         int                     rc = 0;
+        unsigned int            delay = XHCI_MAX_HALT_USEC;
         struct usb_hcd          *hcd = xhci_to_hcd(xhci);
         u32                     command;
 
@@ -861,8 +869,12 @@ int xhci_suspend(struct xhci_hcd *xhci)
         command = xhci_readl(xhci, &xhci->op_regs->command);
         command &= ~CMD_RUN;
         xhci_writel(xhci, command, &xhci->op_regs->command);
+
+        /* Some chips from Fresco Logic need an extraordinary delay */
+        delay *= (xhci->quirks & XHCI_SLOW_SUSPEND) ? 10 : 1;
+
         if (xhci_handshake(xhci, &xhci->op_regs->status,
-                      STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC)) {
+                      STS_HALT, STS_HALT, delay)) {
                 xhci_warn(xhci, "WARN: xHC CMD_RUN timeout\n");
                 spin_unlock_irq(&xhci->lock);
                 return -ETIMEDOUT;
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 289fbfbae746..941d5f59e4dc 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1548,6 +1548,8 @@ struct xhci_hcd {
 #define XHCI_COMP_MODE_QUIRK    (1 << 14)
 #define XHCI_AVOID_BEI          (1 << 15)
 #define XHCI_PLAT               (1 << 16)
+#define XHCI_SLOW_SUSPEND       (1 << 17)
+#define XHCI_SPURIOUS_WAKEUP    (1 << 18)
         unsigned int            num_active_eps;
         unsigned int            limit_active_eps;
         /* There are two roothubs to keep track of bus suspend info for */
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index e2b21c1d9c40..ba5f70f92888 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -246,6 +246,6 @@ config USB_EZUSB_FX2
 config USB_HSIC_USB3503
        tristate "USB3503 HSIC to USB20 Driver"
        depends on I2C
-       select REGMAP
+       select REGMAP_I2C
        help
          This option enables support for SMSC USB3503 HSIC to USB 2.0 Driver.
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 18e877ffe7b7..cd70cc886171 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -922,6 +922,52 @@ static void musb_generic_disable(struct musb *musb)
 }
 
 /*
+ * Program the HDRC to start (enable interrupts, dma, etc.).
+ */
+void musb_start(struct musb *musb)
+{
+        void __iomem    *regs = musb->mregs;
+        u8              devctl = musb_readb(regs, MUSB_DEVCTL);
+
+        dev_dbg(musb->controller, "<== devctl %02x\n", devctl);
+
+        /*  Set INT enable registers, enable interrupts */
+        musb->intrtxe = musb->epmask;
+        musb_writew(regs, MUSB_INTRTXE, musb->intrtxe);
+        musb->intrrxe = musb->epmask & 0xfffe;
+        musb_writew(regs, MUSB_INTRRXE, musb->intrrxe);
+        musb_writeb(regs, MUSB_INTRUSBE, 0xf7);
+
+        musb_writeb(regs, MUSB_TESTMODE, 0);
+
+        /* put into basic highspeed mode and start session */
+        musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE
+                        | MUSB_POWER_HSENAB
+                        /* ENSUSPEND wedges tusb */
+                        /* | MUSB_POWER_ENSUSPEND */
+                   );
+
+        musb->is_active = 0;
+        devctl = musb_readb(regs, MUSB_DEVCTL);
+        devctl &= ~MUSB_DEVCTL_SESSION;
+
+        /* session started after:
+         * (a) ID-grounded irq, host mode;
+         * (b) vbus present/connect IRQ, peripheral mode;
+         * (c) peripheral initiates, using SRP
+         */
+        if (musb->port_mode != MUSB_PORT_MODE_HOST &&
+                        (devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {
+                musb->is_active = 1;
+        } else {
+                devctl |= MUSB_DEVCTL_SESSION;
+        }
+
+        musb_platform_enable(musb);
+        musb_writeb(regs, MUSB_DEVCTL, devctl);
+}
+
+/*
  * Make the HDRC stop (disable interrupts, etc.);
  * reversible by musb_start
  * called on gadget driver unregister
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 65f3917b4fc5..1c5bf75ee8ff 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -503,6 +503,7 @@ static inline void musb_configure_ep0(struct musb *musb)
 extern const char musb_driver_name[];
 
 extern void musb_stop(struct musb *musb);
+extern void musb_start(struct musb *musb);
 
 extern void musb_write_fifo(struct musb_hw_ep *ep, u16 len, const u8 *src);
 extern void musb_read_fifo(struct musb_hw_ep *ep, u16 len, u8 *dst);
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index b19ed213ab85..3671898a4535 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1853,11 +1853,14 @@ static int musb_gadget_start(struct usb_gadget *g,
         musb->gadget_driver = driver;
 
         spin_lock_irqsave(&musb->lock, flags);
+        musb->is_active = 1;
 
         otg_set_peripheral(otg, &musb->g);
         musb->xceiv->state = OTG_STATE_B_IDLE;
         spin_unlock_irqrestore(&musb->lock, flags);
 
+        musb_start(musb);
+
         /* REVISIT:  funcall to other code, which also
          * handles power budgeting ... this way also
          * ensures HdrcStart is indirectly called.
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index a523950c2b32..d1d6b83aabca 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -44,52 +44,6 @@
 
 #include "musb_core.h"
 
-/*
-* Program the HDRC to start (enable interrupts, dma, etc.).
-*/
-static void musb_start(struct musb *musb)
-{
-        void __iomem    *regs = musb->mregs;
-        u8              devctl = musb_readb(regs, MUSB_DEVCTL);
-
-        dev_dbg(musb->controller, "<== devctl %02x\n", devctl);
-
-        /*  Set INT enable registers, enable interrupts */
-        musb->intrtxe = musb->epmask;
-        musb_writew(regs, MUSB_INTRTXE, musb->intrtxe);
-        musb->intrrxe = musb->epmask & 0xfffe;
-        musb_writew(regs, MUSB_INTRRXE, musb->intrrxe);
-        musb_writeb(regs, MUSB_INTRUSBE, 0xf7);
-
-        musb_writeb(regs, MUSB_TESTMODE, 0);
-
-        /* put into basic highspeed mode and start session */
-        musb_writeb(regs, MUSB_POWER, MUSB_POWER_ISOUPDATE
-                                                | MUSB_POWER_HSENAB
-                                                /* ENSUSPEND wedges tusb */
-                                                /* | MUSB_POWER_ENSUSPEND */
-                                                );
-
-        musb->is_active = 0;
-        devctl = musb_readb(regs, MUSB_DEVCTL);
-        devctl &= ~MUSB_DEVCTL_SESSION;
-
-        /* session started after:
-         * (a) ID-grounded irq, host mode;
-         * (b) vbus present/connect IRQ, peripheral mode;
-         * (c) peripheral initiates, using SRP
-         */
-        if (musb->port_mode != MUSB_PORT_MODE_HOST &&
-            (devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS) {
-                musb->is_active = 1;
-        } else {
-                devctl |= MUSB_DEVCTL_SESSION;
-        }
-
-        musb_platform_enable(musb);
-        musb_writeb(regs, MUSB_DEVCTL, devctl);
-}
-
 static void musb_port_suspend(struct musb *musb, bool do_suspend)
 {
         struct usb_otg  *otg = musb->xceiv->otg;
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 80a7104d5ddb..acaee066b99a 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -451,6 +451,10 @@ static void option_instat_callback(struct urb *urb);
 #define CHANGHONG_VENDOR_ID                     0x2077
 #define CHANGHONG_PRODUCT_CH690                 0x7001
 
+/* Inovia */
+#define INOVIA_VENDOR_ID                        0x20a6
+#define INOVIA_SEW858                           0x1105
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
                 OPTION_BLACKLIST_NONE = 0,
@@ -689,6 +693,222 @@ static const struct usb_device_id option_ids[] = {
         { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) },
         { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7B) },
         { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x01) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x02) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x03) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x04) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x05) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x06) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x0F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x10) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x12) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x13) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x14) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x15) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x17) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x18) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x19) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x1C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x31) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x32) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x33) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x34) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x35) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x36) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x3F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x48) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x49) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x4C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x61) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x62) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x63) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x64) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x65) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x66) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x78) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x79) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x01) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x02) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x03) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x04) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x05) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x06) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x0F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x10) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x12) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x13) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x14) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x15) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x17) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x18) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x19) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x1C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x31) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x32) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x33) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x34) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x35) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x36) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x3F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x48) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x49) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x4C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x61) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x62) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x63) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x64) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x65) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x66) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x78) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x79) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x01) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x02) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x03) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x04) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x05) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x06) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x0F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x10) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x12) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x13) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x14) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x15) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x17) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x18) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x19) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x1C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x31) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x32) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x33) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x34) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x35) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x36) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x3F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x48) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x49) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x4C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x61) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x62) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x63) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x64) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x65) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x66) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x78) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x79) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x01) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x02) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x03) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x04) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x05) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x06) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x0F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x10) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x12) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x13) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x14) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x15) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x17) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x18) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x19) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x1C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x31) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x32) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x33) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x34) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x35) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x36) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x3F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x48) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x49) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x4C) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x61) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x62) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x63) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x64) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x65) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x66) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6D) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6E) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6F) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x78) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x79) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7A) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7B) },
+        { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7C) },
 
 
         { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) },
@@ -1257,7 +1477,9 @@ static const struct usb_device_id option_ids[] = {
 
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },
-        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200) },
+        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200),
+                .driver_info = (kernel_ulong_t)&net_intf6_blacklist
+        },
         { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
         { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },
@@ -1345,6 +1567,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
+        { USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 760b78560f67..c9a35697ebe9 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -190,6 +190,7 @@ static struct usb_device_id ti_id_table_combined[] = {
         { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) },
         { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) },
         { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) },
+        { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) },
         { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) },
         { }     /* terminator */
 };
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 94d75edef77f..18509e6c21ab 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -211,8 +211,11 @@ static int slave_configure(struct scsi_device *sdev)
                 /*
                  * Many devices do not respond properly to READ_CAPACITY_16.
                  * Tell the SCSI layer to try READ_CAPACITY_10 first.
+                 * However some USB 3.0 drive enclosures return capacity
+                 * modulo 2TB. Those must use READ_CAPACITY_16
                  */
-                sdev->try_rc_10_first = 1;
+                if (!(us->fflags & US_FL_NEEDS_CAP16))
+                        sdev->try_rc_10_first = 1;
 
                 /* assume SPC3 or latter devices support sense size > 18 */
                 if (sdev->scsi_level > SCSI_SPC_2)
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index c015f2c16729..de32cfa5bfa6 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1925,6 +1925,13 @@ UNUSUAL_DEV(  0x1652, 0x6600, 0x0201, 0x0201,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_IGNORE_RESIDUE ),
 
+/* Reported by Oliver Neukum <oneukum@suse.com> */
+UNUSUAL_DEV(  0x174c, 0x55aa, 0x0100, 0x0100,
+                "ASMedia",
+                "AS2105",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_NEEDS_CAP16),
+
 /* Reported by Jesse Feddema <jdfeddema@gmail.com> */
 UNUSUAL_DEV(  0x177f, 0x0400, 0x0000, 0x0000,
                 "Yarvik",
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index a9807dea3887..4fb7a8f83c8a 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -545,6 +545,8 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
         long npage;
         int ret = 0, prot = 0;
         uint64_t mask;
+        struct vfio_dma *dma = NULL;
+        unsigned long pfn;
 
         end = map->iova + map->size;
 
@@ -587,8 +589,6 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
         }
 
         for (iova = map->iova; iova < end; iova += size, vaddr += size) {
-                struct vfio_dma *dma = NULL;
-                unsigned long pfn;
                 long i;
 
                 /* Pin a contiguous chunk of memory */
@@ -597,16 +597,15 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
                 if (npage <= 0) {
                         WARN_ON(!npage);
                         ret = (int)npage;
-                        break;
+                        goto out;
                 }
 
                 /* Verify pages are not already mapped */
                 for (i = 0; i < npage; i++) {
                         if (iommu_iova_to_phys(iommu->domain,
                                                iova + (i << PAGE_SHIFT))) {
-                                vfio_unpin_pages(pfn, npage, prot, true);
                                 ret = -EBUSY;
-                                break;
+                                goto out_unpin;
                         }
                 }
 
@@ -616,8 +615,7 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
                 if (ret) {
                         if (ret != -EBUSY ||
                             map_try_harder(iommu, iova, pfn, npage, prot)) {
-                                vfio_unpin_pages(pfn, npage, prot, true);
-                                break;
+                                goto out_unpin;
                         }
                 }
 
@@ -672,9 +670,8 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
                         dma = kzalloc(sizeof(*dma), GFP_KERNEL);
                         if (!dma) {
                                 iommu_unmap(iommu->domain, iova, size);
-                                vfio_unpin_pages(pfn, npage, prot, true);
                                 ret = -ENOMEM;
-                                break;
+                                goto out_unpin;
                         }
 
                         dma->size = size;
@@ -685,16 +682,21 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
                 }
         }
 
-        if (ret) {
-                struct vfio_dma *tmp;
-                iova = map->iova;
-                size = map->size;
-                while ((tmp = vfio_find_dma(iommu, iova, size))) {
-                        int r = vfio_remove_dma_overlap(iommu, iova,
-                                                        &size, tmp);
-                        if (WARN_ON(r || !size))
-                                break;
-                }
+        WARN_ON(ret);
+        mutex_unlock(&iommu->lock);
+        return ret;
+
+out_unpin:
+        vfio_unpin_pages(pfn, npage, prot, true);
+
+out:
+        iova = map->iova;
+        size = map->size;
+        while ((dma = vfio_find_dma(iommu, iova, size))) {
+                int r = vfio_remove_dma_overlap(iommu, iova,
+                                                &size, dma);
+                if (WARN_ON(r || !size))
+                        break;
         }
 
         mutex_unlock(&iommu->lock);
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index c7c64f18773d..fa932c2f7d97 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -613,6 +613,9 @@ static int w1_bus_notify(struct notifier_block *nb, unsigned long action,
         sl = dev_to_w1_slave(dev);
         fops = sl->family->fops;
 
+        if (!fops)
+                return 0;
+
         switch (action) {
         case BUS_NOTIFY_ADD_DEVICE:
                 /* if the family driver needs to initialize something... */
@@ -713,7 +716,10 @@ static int w1_attach_slave_device(struct w1_master *dev, struct w1_reg_num *rn)
         atomic_set(&sl->refcnt, 0);
         init_completion(&sl->released);
 
+        /* slave modules need to be loaded in a context with unlocked mutex */
+        mutex_unlock(&dev->mutex);
         request_module("w1-family-0x%0x", rn->family);
+        mutex_lock(&dev->mutex);
 
         spin_lock(&w1_flock);
         f = w1_family_registered(rn->family);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b0ef7b07b1b3..51e3afa78354 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6437,6 +6437,7 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,
 
         if (btrfs_extent_readonly(root, disk_bytenr))
                 goto out;
+        btrfs_release_path(path);
 
         /*
          * look for other files referencing this extent, if we
diff --git a/fs/buffer.c b/fs/buffer.c
index 4d7433534f5c..6024877335ca 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1005,9 +1005,19 @@ grow_dev_page(struct block_device *bdev, sector_t block,
         struct buffer_head *bh;
         sector_t end_block;
         int ret = 0;            /* Will call free_more_memory() */
+        gfp_t gfp_mask;
 
-        page = find_or_create_page(inode->i_mapping, index,
-                (mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS)|__GFP_MOVABLE);
+        gfp_mask = mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS;
+        gfp_mask |= __GFP_MOVABLE;
+        /*
+         * XXX: __getblk_slow() can not really deal with failure and
+         * will endlessly loop on improvised global reclaim.  Prefer
+         * looping in the allocator rather than here, at least that
+         * code knows what it's doing.
+         */
+        gfp_mask |= __GFP_NOFAIL;
+
+        page = find_or_create_page(inode->i_mapping, index, gfp_mask);
         if (!page)
                 return ret;
 
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index a16b4e58bcc6..77fc5e181077 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -120,14 +120,16 @@ cifs_read_super(struct super_block *sb)
 {
         struct inode *inode;
         struct cifs_sb_info *cifs_sb;
+        struct cifs_tcon *tcon;
         int rc = 0;
 
         cifs_sb = CIFS_SB(sb);
+        tcon = cifs_sb_master_tcon(cifs_sb);
 
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIXACL)
                 sb->s_flags |= MS_POSIXACL;
 
-        if (cifs_sb_master_tcon(cifs_sb)->ses->capabilities & CAP_LARGE_FILES)
+        if (tcon->ses->capabilities & tcon->ses->server->vals->cap_large_files)
                 sb->s_maxbytes = MAX_LFS_FILESIZE;
         else
                 sb->s_maxbytes = MAX_NON_LFS;
@@ -147,7 +149,7 @@ cifs_read_super(struct super_block *sb)
                 goto out_no_root;
         }
 
-        if (cifs_sb_master_tcon(cifs_sb)->nocase)
+        if (tcon->nocase)
                 sb->s_d_op = &cifs_ci_dentry_ops;
         else
                 sb->s_d_op = &cifs_dentry_ops;
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h
index a630475e421c..08f9dfb1a894 100644
--- a/fs/cifs/cifspdu.h
+++ b/fs/cifs/cifspdu.h
@@ -1491,15 +1491,30 @@ struct file_notify_information {
         __u8  FileName[0];
 } __attribute__((packed));
 
-struct reparse_data {
-        __u32   ReparseTag;
-        __u16   ReparseDataLength;
+/* For IO_REPARSE_TAG_SYMLINK */
+struct reparse_symlink_data {
+        __le32  ReparseTag;
+        __le16  ReparseDataLength;
         __u16   Reserved;
-        __u16   SubstituteNameOffset;
-        __u16   SubstituteNameLength;
-        __u16   PrintNameOffset;
-        __u16   PrintNameLength;
-        __u32   Flags;
+        __le16  SubstituteNameOffset;
+        __le16  SubstituteNameLength;
+        __le16  PrintNameOffset;
+        __le16  PrintNameLength;
+        __le32  Flags;
+        char    PathBuffer[0];
+} __attribute__((packed));
+
+/* For IO_REPARSE_TAG_NFS */
+#define NFS_SPECFILE_LNK        0x00000000014B4E4C
+#define NFS_SPECFILE_CHR        0x0000000000524843
+#define NFS_SPECFILE_BLK        0x00000000004B4C42
+#define NFS_SPECFILE_FIFO       0x000000004F464946
+#define NFS_SPECFILE_SOCK       0x000000004B434F53
+struct reparse_posix_data {
+        __le32  ReparseTag;
+        __le16  ReparseDataLength;
+        __u16   Reserved;
+        __le64  InodeType; /* LNK, FIFO, CHR etc. */
         char    PathBuffer[0];
 } __attribute__((packed));
 
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 4baf35949b51..ccd31ab815d4 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -3088,7 +3088,8 @@ CIFSSMBQuerySymLink(const unsigned int xid, struct cifs_tcon *tcon,
         bool is_unicode;
         unsigned int sub_len;
         char *sub_start;
-        struct reparse_data *reparse_buf;
+        struct reparse_symlink_data *reparse_buf;
+        struct reparse_posix_data *posix_buf;
         __u32 data_offset, data_count;
         char *end_of_smb;
 
@@ -3137,20 +3138,47 @@ CIFSSMBQuerySymLink(const unsigned int xid, struct cifs_tcon *tcon,
                 goto qreparse_out;
         }
         end_of_smb = 2 + get_bcc(&pSMBr->hdr) + (char *)&pSMBr->ByteCount;
-        reparse_buf = (struct reparse_data *)
+        reparse_buf = (struct reparse_symlink_data *)
                                 ((char *)&pSMBr->hdr.Protocol + data_offset);
         if ((char *)reparse_buf >= end_of_smb) {
                 rc = -EIO;
                 goto qreparse_out;
         }
-        if ((reparse_buf->PathBuffer + reparse_buf->PrintNameOffset +
-                                reparse_buf->PrintNameLength) > end_of_smb) {
+        if (reparse_buf->ReparseTag == cpu_to_le32(IO_REPARSE_TAG_NFS)) {
+                cifs_dbg(FYI, "NFS style reparse tag\n");
+                posix_buf =  (struct reparse_posix_data *)reparse_buf;
+
+                if (posix_buf->InodeType != cpu_to_le64(NFS_SPECFILE_LNK)) {
+                        cifs_dbg(FYI, "unsupported file type 0x%llx\n",
+                                 le64_to_cpu(posix_buf->InodeType));
+                        rc = -EOPNOTSUPP;
+                        goto qreparse_out;
+                }
+                is_unicode = true;
+                sub_len = le16_to_cpu(reparse_buf->ReparseDataLength);
+                if (posix_buf->PathBuffer + sub_len > end_of_smb) {
+                        cifs_dbg(FYI, "reparse buf beyond SMB\n");
+                        rc = -EIO;
+                        goto qreparse_out;
+                }
+                *symlinkinfo = cifs_strndup_from_utf16(posix_buf->PathBuffer,
+                                sub_len, is_unicode, nls_codepage);
+                goto qreparse_out;
+        } else if (reparse_buf->ReparseTag !=
+                        cpu_to_le32(IO_REPARSE_TAG_SYMLINK)) {
+                rc = -EOPNOTSUPP;
+                goto qreparse_out;
+        }
+
+        /* Reparse tag is NTFS symlink */
+        sub_start = le16_to_cpu(reparse_buf->SubstituteNameOffset) +
+                                reparse_buf->PathBuffer;
+        sub_len = le16_to_cpu(reparse_buf->SubstituteNameLength);
+        if (sub_start + sub_len > end_of_smb) {
                 cifs_dbg(FYI, "reparse buf beyond SMB\n");
                 rc = -EIO;
                 goto qreparse_out;
         }
-        sub_start = reparse_buf->SubstituteNameOffset + reparse_buf->PathBuffer;
-        sub_len = reparse_buf->SubstituteNameLength;
         if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE)
                 is_unicode = true;
         else
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index af847e1cf1c1..651a5279607b 100644
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -780,7 +780,9 @@ static const struct {
         ERRDOS, ERRnoaccess, 0xc0000290}, {
         ERRDOS, ERRbadfunc, 0xc000029c}, {
         ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
-        ERRDOS, ERRinvlevel, 0x007c0001}, };
+        ERRDOS, ERRinvlevel, 0x007c0001}, {
+        0, 0, 0 }
+};
 
 /*****************************************************************************
  Print an error message from the status code
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 352358de1d7e..e87387dbf39f 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -500,9 +500,9 @@ select_sectype(struct TCP_Server_Info *server, enum securityEnum requested)
                                 return NTLMv2;
                         if (global_secflags & CIFSSEC_MAY_NTLM)
                                 return NTLM;
-                        /* Fallthrough */
                 default:
-                        return Unspecified;
+                        /* Fallthrough to attempt LANMAN authentication next */
+                        break;
                 }
         case CIFS_NEGFLAVOR_LANMAN:
                 switch (requested) {
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index eba0efde66d7..edccb5252462 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -687,6 +687,10 @@ SMB2_logoff(const unsigned int xid, struct cifs_ses *ses)
         else
                 return -EIO;
 
+        /* no need to send SMB logoff if uid already closed due to reconnect */
+        if (ses->need_reconnect)
+                goto smb2_session_already_dead;
+
         rc = small_smb2_init(SMB2_LOGOFF, NULL, (void **) &req);
         if (rc)
                 return rc;
@@ -701,6 +705,8 @@ SMB2_logoff(const unsigned int xid, struct cifs_ses *ses)
          * No tcon so can't do
          * cifs_stats_inc(&tcon->stats.smb2_stats.smb2_com_fail[SMB2...]);
          */
+
+smb2_session_already_dead:
         return rc;
 }
 
diff --git a/fs/cifs/smbfsctl.h b/fs/cifs/smbfsctl.h
index d952ee48f4dc..a4b2391fe66e 100644
--- a/fs/cifs/smbfsctl.h
+++ b/fs/cifs/smbfsctl.h
@@ -97,9 +97,23 @@
 #define FSCTL_QUERY_NETWORK_INTERFACE_INFO 0x001401FC /* BB add struct */
 #define FSCTL_SRV_READ_HASH          0x001441BB /* BB add struct */
 
+/* See FSCC 2.1.2.5 */
 #define IO_REPARSE_TAG_MOUNT_POINT   0xA0000003
 #define IO_REPARSE_TAG_HSM           0xC0000004
 #define IO_REPARSE_TAG_SIS           0x80000007
+#define IO_REPARSE_TAG_HSM2          0x80000006
+#define IO_REPARSE_TAG_DRIVER_EXTENDER 0x80000005
+/* Used by the DFS filter. See MS-DFSC */
+#define IO_REPARSE_TAG_DFS           0x8000000A
+/* Used by the DFS filter See MS-DFSC */
+#define IO_REPARSE_TAG_DFSR          0x80000012
+#define IO_REPARSE_TAG_FILTER_MANAGER 0x8000000B
+/* See section MS-FSCC 2.1.2.4 */
+#define IO_REPARSE_TAG_SYMLINK       0xA000000C
+#define IO_REPARSE_TAG_DEDUP         0x80000013
+#define IO_REPARSE_APPXSTREAM        0xC0000014
+/* NFS symlinks, Win 8/SMB3 and later */
+#define IO_REPARSE_TAG_NFS           0x80000014
 
 /* fsctl flags */
 /* If Flags is set to this value, the request is an FSCTL not ioctl request */
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 6fdcb1b4a106..800b938e4061 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -410,8 +410,13 @@ static int
 wait_for_free_request(struct TCP_Server_Info *server, const int timeout,
                       const int optype)
 {
-        return wait_for_free_credits(server, timeout,
-                                server->ops->get_credits_field(server, optype));
+        int *val;
+
+        val = server->ops->get_credits_field(server, optype);
+        /* Since an echo is already inflight, no need to wait to send another */
+        if (*val <= 0 && optype == CIFS_ECHO_OP)
+                return -EAGAIN;
+        return wait_for_free_credits(server, timeout, val);
 }
 
 static int allocate_mid(struct cifs_ses *ses, struct smb_hdr *in_buf,
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 1194b1f0f839..f8cde46de9cd 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1783,7 +1783,7 @@ retry:
                 d_tmpfile(dentry, inode);
                 err = ext3_orphan_add(handle, inode);
                 if (err)
-                        goto err_drop_inode;
+                        goto err_unlock_inode;
                 mark_inode_dirty(inode);
                 unlock_new_inode(inode);
         }
@@ -1791,10 +1791,9 @@ retry:
         if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
                 goto retry;
         return err;
-err_drop_inode:
+err_unlock_inode:
         ext3_journal_stop(handle);
         unlock_new_inode(inode);
-        iput(inode);
         return err;
 }
 
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 1bec5a5c1e45..5a0408d7b114 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2319,7 +2319,7 @@ retry:
                 d_tmpfile(dentry, inode);
                 err = ext4_orphan_add(handle, inode);
                 if (err)
-                        goto err_drop_inode;
+                        goto err_unlock_inode;
                 mark_inode_dirty(inode);
                 unlock_new_inode(inode);
         }
@@ -2328,10 +2328,9 @@ retry:
         if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
                 goto retry;
         return err;
-err_drop_inode:
+err_unlock_inode:
         ext4_journal_stop(handle);
         unlock_new_inode(inode);
-        iput(inode);
         return err;
 }
 
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 9f8ef9b7674d..8eaa1ba793fc 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -288,10 +288,14 @@ static int proc_reg_mmap(struct file *file, struct vm_area_struct *vma)
 static unsigned long proc_reg_get_unmapped_area(struct file *file, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags)
 {
         struct proc_dir_entry *pde = PDE(file_inode(file));
-        int rv = -EIO;
-        unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
+        unsigned long rv = -EIO;
+        unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) = NULL;
         if (use_pde(pde)) {
-                get_unmapped_area = pde->proc_fops->get_unmapped_area;
+#ifdef CONFIG_MMU
+                get_unmapped_area = current->mm->get_unmapped_area;
+#endif
+                if (pde->proc_fops->get_unmapped_area)
+                        get_unmapped_area = pde->proc_fops->get_unmapped_area;
                 if (get_unmapped_area)
                         rv = get_unmapped_area(file, orig_addr, len, pgoff, flags);
                 unuse_pde(pde);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 7366e9d63cee..390bdab01c3c 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -941,6 +941,8 @@ static void pte_to_pagemap_entry(pagemap_entry_t *pme, struct pagemapread *pm,
                 frame = pte_pfn(pte);
                 flags = PM_PRESENT;
                 page = vm_normal_page(vma, addr, pte);
+                if (pte_soft_dirty(pte))
+                        flags2 |= __PM_SOFT_DIRTY;
         } else if (is_swap_pte(pte)) {
                 swp_entry_t entry;
                 if (pte_swp_soft_dirty(pte))
@@ -960,7 +962,7 @@ static void pte_to_pagemap_entry(pagemap_entry_t *pme, struct pagemapread *pm,
 
         if (page && !PageAnon(page))
                 flags |= PM_FILE;
-        if ((vma->vm_flags & VM_SOFTDIRTY) || pte_soft_dirty(pte))
+        if ((vma->vm_flags & VM_SOFTDIRTY))
                 flags2 |= __PM_SOFT_DIRTY;
 
         *pme = make_pme(PM_PFRAME(frame) | PM_STATUS2(pm->v2, flags2) | flags);
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 02e113bb8b7d..d9019821aa60 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -311,7 +311,6 @@ struct acpi_device {
         unsigned int physical_node_count;
         struct list_head physical_node_list;
         struct mutex physical_node_lock;
-        struct list_head power_dependent;
         void (*remove)(struct acpi_device *);
 };
 
@@ -456,8 +455,6 @@ acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
 acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
                                     acpi_notify_handler handler);
 int acpi_pm_device_sleep_state(struct device *, int *, int);
-void acpi_dev_pm_add_dependent(acpi_handle handle, struct device *depdev);
-void acpi_dev_pm_remove_dependent(acpi_handle handle, struct device *depdev);
 #else
 static inline acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
                                                acpi_notify_handler handler,
@@ -478,10 +475,6 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m)
         return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3_COLD) ?
                 m : ACPI_STATE_D0;
 }
-static inline void acpi_dev_pm_add_dependent(acpi_handle handle,
-                                             struct device *depdev) {}
-static inline void acpi_dev_pm_remove_dependent(acpi_handle handle,
-                                                struct device *depdev) {}
 #endif
 
 #ifdef CONFIG_PM_RUNTIME
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index ecc82b37c4cc..b3e7a667e03c 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -137,47 +137,24 @@ extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
 extern void mem_cgroup_replace_page_cache(struct page *oldpage,
                                         struct page *newpage);
 
-/**
- * mem_cgroup_toggle_oom - toggle the memcg OOM killer for the current task
- * @new: true to enable, false to disable
- *
- * Toggle whether a failed memcg charge should invoke the OOM killer
- * or just return -ENOMEM.  Returns the previous toggle state.
- *
- * NOTE: Any path that enables the OOM killer before charging must
- *       call mem_cgroup_oom_synchronize() afterward to finalize the
- *       OOM handling and clean up.
- */
-static inline bool mem_cgroup_toggle_oom(bool new)
+static inline void mem_cgroup_oom_enable(void)
 {
-        bool old;
-
-        old = current->memcg_oom.may_oom;
-        current->memcg_oom.may_oom = new;
-
-        return old;
+        WARN_ON(current->memcg_oom.may_oom);
+        current->memcg_oom.may_oom = 1;
 }
 
-static inline void mem_cgroup_enable_oom(void)
+static inline void mem_cgroup_oom_disable(void)
 {
-        bool old = mem_cgroup_toggle_oom(true);
-
-        WARN_ON(old == true);
-}
-
-static inline void mem_cgroup_disable_oom(void)
-{
-        bool old = mem_cgroup_toggle_oom(false);
-
-        WARN_ON(old == false);
+        WARN_ON(!current->memcg_oom.may_oom);
+        current->memcg_oom.may_oom = 0;
 }
 
 static inline bool task_in_memcg_oom(struct task_struct *p)
 {
-        return p->memcg_oom.in_memcg_oom;
+        return p->memcg_oom.memcg;
 }
 
-bool mem_cgroup_oom_synchronize(void);
+bool mem_cgroup_oom_synchronize(bool wait);
 
 #ifdef CONFIG_MEMCG_SWAP
 extern int do_swap_account;
@@ -402,16 +379,11 @@ static inline void mem_cgroup_end_update_page_stat(struct page *page,
 {
 }
 
-static inline bool mem_cgroup_toggle_oom(bool new)
-{
-        return false;
-}
-
-static inline void mem_cgroup_enable_oom(void)
+static inline void mem_cgroup_oom_enable(void)
 {
 }
 
-static inline void mem_cgroup_disable_oom(void)
+static inline void mem_cgroup_oom_disable(void)
 {
 }
 
@@ -420,7 +392,7 @@ static inline bool task_in_memcg_oom(struct task_struct *p)
         return false;
 }
 
-static inline bool mem_cgroup_oom_synchronize(void)
+static inline bool mem_cgroup_oom_synchronize(bool wait)
 {
         return false;
 }
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index cebe97ee98b8..7314fc4e6d25 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -59,6 +59,12 @@ struct mfd_cell {
          * pm_runtime_no_callbacks().
          */
         bool                    pm_runtime_no_callbacks;
+
+        /* A list of regulator supplies that should be mapped to the MFD
+         * device rather than the child device when requested
+         */
+        const char              **parent_supplies;
+        int                     num_parent_supplies;
 };
 
 /*
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 68029b30c3dc..5eb4e31af22b 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -181,7 +181,7 @@ enum {
         MLX5_DEV_CAP_FLAG_TLP_HINTS     = 1LL << 39,
         MLX5_DEV_CAP_FLAG_SIG_HAND_OVER = 1LL << 40,
         MLX5_DEV_CAP_FLAG_DCT           = 1LL << 41,
-        MLX5_DEV_CAP_FLAG_CMDIF_CSUM    = 1LL << 46,
+        MLX5_DEV_CAP_FLAG_CMDIF_CSUM    = 3LL << 46,
 };
 
 enum {
@@ -417,7 +417,7 @@ struct mlx5_init_seg {
         struct health_buffer    health;
         __be32                  rsvd2[884];
         __be32                  health_counter;
-        __be32                  rsvd3[1023];
+        __be32                  rsvd3[1019];
         __be64                  ieee1588_clk;
         __be32                  ieee1588_clk_type;
         __be32                  clr_intx;
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 8888381fc150..6b8c496572c8 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -82,7 +82,7 @@ enum {
 };
 
 enum {
-        MLX5_MAX_EQ_NAME        = 20
+        MLX5_MAX_EQ_NAME        = 32
 };
 
 enum {
@@ -747,8 +747,7 @@ static inline u32 mlx5_idx_to_mkey(u32 mkey_idx)
 
 enum {
         MLX5_PROF_MASK_QP_SIZE          = (u64)1 << 0,
-        MLX5_PROF_MASK_CMDIF_CSUM       = (u64)1 << 1,
-        MLX5_PROF_MASK_MR_CACHE         = (u64)1 << 2,
+        MLX5_PROF_MASK_MR_CACHE         = (u64)1 << 1,
 };
 
 enum {
@@ -758,7 +757,6 @@ enum {
 struct mlx5_profile {
         u64     mask;
         u32     log_max_qp;
-        int     cmdif_csum;
         struct {
                 int     size;
                 int     limit;
diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h
deleted file mode 100644
index c84128255814..000000000000
--- a/include/linux/of_reserved_mem.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __OF_RESERVED_MEM_H
-#define __OF_RESERVED_MEM_H
-
-#ifdef CONFIG_OF_RESERVED_MEM
-void of_reserved_mem_device_init(struct device *dev);
-void of_reserved_mem_device_release(struct device *dev);
-void early_init_dt_scan_reserved_mem(void);
-#else
-static inline void of_reserved_mem_device_init(struct device *dev) { }
-static inline void of_reserved_mem_device_release(struct device *dev) { }
-static inline void early_init_dt_scan_reserved_mem(void) { }
-#endif
-
-#endif /* __OF_RESERVED_MEM_H */
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 27be915caa96..e530681bea70 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -146,6 +146,32 @@ struct regulator *__must_check devm_regulator_get_optional(struct device *dev,
 void regulator_put(struct regulator *regulator);
 void devm_regulator_put(struct regulator *regulator);
 
+int regulator_register_supply_alias(struct device *dev, const char *id,
+                                    struct device *alias_dev,
+                                    const char *alias_id);
+void regulator_unregister_supply_alias(struct device *dev, const char *id);
+
+int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
+                                         struct device *alias_dev,
+                                         const char **alias_id, int num_id);
+void regulator_bulk_unregister_supply_alias(struct device *dev,
+                                            const char **id, int num_id);
+
+int devm_regulator_register_supply_alias(struct device *dev, const char *id,
+                                         struct device *alias_dev,
+                                         const char *alias_id);
+void devm_regulator_unregister_supply_alias(struct device *dev,
+                                            const char *id);
+
+int devm_regulator_bulk_register_supply_alias(struct device *dev,
+                                              const char **id,
+                                              struct device *alias_dev,
+                                              const char **alias_id,
+                                              int num_id);
+void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
+                                                 const char **id,
+                                                 int num_id);
+
 /* regulator output control and status */
 int __must_check regulator_enable(struct regulator *regulator);
 int regulator_disable(struct regulator *regulator);
@@ -250,6 +276,59 @@ static inline void devm_regulator_put(struct regulator *regulator)
 {
 }
 
+static inline int regulator_register_supply_alias(struct device *dev,
+                                                  const char *id,
+                                                  struct device *alias_dev,
+                                                  const char *alias_id)
+{
+        return 0;
+}
+
+static inline void regulator_unregister_supply_alias(struct device *dev,
+                                                    const char *id)
+{
+}
+
+static inline int regulator_bulk_register_supply_alias(struct device *dev,
+                                                       const char **id,
+                                                       struct device *alias_dev,
+                                                       const char **alias_id,
+                                                       int num_id)
+{
+        return 0;
+}
+
+static inline void regulator_bulk_unregister_supply_alias(struct device *dev,
+                                                          const char **id,
+                                                          int num_id)
+{
+}
+
+static inline int devm_regulator_register_supply_alias(struct device *dev,
+                                                       const char *id,
+                                                       struct device *alias_dev,
+                                                       const char *alias_id)
+{
+        return 0;
+}
+
+static inline void devm_regulator_unregister_supply_alias(struct device *dev,
+                                                          const char *id)
+{
+}
+
+static inline int devm_regulator_bulk_register_supply_alias(
+                struct device *dev, const char **id, struct device *alias_dev,
+                const char **alias_id, int num_id)
+{
+        return 0;
+}
+
+static inline void devm_regulator_bulk_unregister_supply_alias(
+                struct device *dev, const char **id, int num_id)
+{
+}
+
 static inline int regulator_enable(struct regulator *regulator)
 {
         return 0;
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 9bdad43ad228..9370e65348a4 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -46,19 +46,26 @@ enum regulator_status {
  * regulator_list_linear_range().
  *
  * @min_uV:  Lowest voltage in range
- * @max_uV:  Highest voltage in range
  * @min_sel: Lowest selector for range
  * @max_sel: Highest selector for range
  * @uV_step: Step size
  */
 struct regulator_linear_range {
         unsigned int min_uV;
-        unsigned int max_uV;
         unsigned int min_sel;
         unsigned int max_sel;
         unsigned int uV_step;
 };
 
+/* Initialize struct regulator_linear_range */
+#define REGULATOR_LINEAR_RANGE(_min_uV, _min_sel, _max_sel, _step_uV)   \
+{                                                                       \
+        .min_uV         = _min_uV,                                      \
+        .min_sel        = _min_sel,                                     \
+        .max_sel        = _max_sel,                                     \
+        .uV_step        = _step_uV,                                     \
+}
+
 /**
  * struct regulator_ops - regulator operations.
  *
@@ -209,6 +216,7 @@ enum regulator_type {
  * @min_uV: Voltage given by the lowest selector (if linear mapping)
  * @uV_step: Voltage increase with each selector (if linear mapping)
  * @linear_min_sel: Minimal selector for starting linear mapping
+ * @fixed_uV: Fixed voltage of rails.
  * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
  * @volt_table: Voltage mapping table (if table based mapping)
  *
@@ -241,6 +249,7 @@ struct regulator_desc {
         unsigned int min_uV;
         unsigned int uV_step;
         unsigned int linear_min_sel;
+        int fixed_uV;
         unsigned int ramp_delay;
 
         const struct regulator_linear_range *linear_ranges;
@@ -336,7 +345,12 @@ struct regulator_dev {
 struct regulator_dev *
 regulator_register(const struct regulator_desc *regulator_desc,
                    const struct regulator_config *config);
+struct regulator_dev *
+devm_regulator_register(struct device *dev,
+                        const struct regulator_desc *regulator_desc,
+                        const struct regulator_config *config);
 void regulator_unregister(struct regulator_dev *rdev);
+void devm_regulator_unregister(struct device *dev, struct regulator_dev *rdev);
 
 int regulator_notifier_call_chain(struct regulator_dev *rdev,
                                   unsigned long event, void *data);
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 999b20ce06cf..730e638c5589 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -95,6 +95,7 @@ struct regulator_state {
  * @initial_state: Suspend state to set by default.
  * @initial_mode: Mode to set at startup.
  * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
+ * @enable_time: Turn-on time of the rails (unit: microseconds)
  */
 struct regulation_constraints {
 
@@ -129,6 +130,7 @@ struct regulation_constraints {
         unsigned int initial_mode;
 
         unsigned int ramp_delay;
+        unsigned int enable_time;
 
         /* constraint flags */
         unsigned always_on:1;   /* regulator never off when system is on */
@@ -193,15 +195,10 @@ int regulator_suspend_finish(void);
 
 #ifdef CONFIG_REGULATOR
 void regulator_has_full_constraints(void);
-void regulator_use_dummy_regulator(void);
 #else
 static inline void regulator_has_full_constraints(void)
 {
 }
-
-static inline void regulator_use_dummy_regulator(void)
-{
-}
 #endif
 
 #endif
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 6682da36b293..e27baeeda3f4 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1394,11 +1394,10 @@ struct task_struct {
         } memcg_batch;
         unsigned int memcg_kmem_skip_account;
         struct memcg_oom_info {
+                struct mem_cgroup *memcg;
+                gfp_t gfp_mask;
+                int order;
                 unsigned int may_oom:1;
-                unsigned int in_memcg_oom:1;
-                unsigned int oom_locked:1;
-                int wakeups;
-                struct mem_cgroup *wait_on_memcg;
         } memcg_oom;
 #endif
 #ifdef CONFIG_UPROBES
diff --git a/include/linux/usb/usb_phy_gen_xceiv.h b/include/linux/usb/usb_phy_gen_xceiv.h
index f9a7e7bc925b..11d85b9c1b08 100644
--- a/include/linux/usb/usb_phy_gen_xceiv.h
+++ b/include/linux/usb/usb_phy_gen_xceiv.h
@@ -12,7 +12,7 @@ struct usb_phy_gen_xceiv_platform_data {
         unsigned int needs_reset:1;
 };
 
-#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
+#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
 /* sometimes transceivers are accessed only through e.g. ULPI */
 extern void usb_nop_xceiv_register(void);
 extern void usb_nop_xceiv_unregister(void);
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h
index bf99cd01be20..630356866030 100644
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
@@ -66,7 +66,9 @@
         US_FLAG(INITIAL_READ10, 0x00100000)                     \
                 /* Initial READ(10) (and others) must be retried */     \
         US_FLAG(WRITE_CACHE,    0x00200000)                     \
-                /* Write Cache status is not available */
+                /* Write Cache status is not available */       \
+        US_FLAG(NEEDS_CAP16,    0x00400000)
+                /* cannot handle READ_CAPACITY_10 */
 
 #define US_FLAG(name, value)    US_FL_##name = value ,
 enum { US_DO_ALL_FLAGS };
diff --git a/ipc/sem.c b/ipc/sem.c
index 8c4f59b0204a..db9d241af133 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1282,6 +1282,12 @@ static int semctl_setval(struct ipc_namespace *ns, int semid, int semnum,
 
         sem_lock(sma, NULL, -1);
 
+        if (sma->sem_perm.deleted) {
+                sem_unlock(sma, -1);
+                rcu_read_unlock();
+                return -EIDRM;
+        }
+
         curr = &sma->sem_base[semnum];
 
         ipc_assert_locked_object(&sma->sem_perm);
@@ -1336,12 +1342,14 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
                 int i;
 
                 sem_lock(sma, NULL, -1);
+                if (sma->sem_perm.deleted) {
+                        err = -EIDRM;
+                        goto out_unlock;
+                }
                 if(nsems > SEMMSL_FAST) {
                         if (!ipc_rcu_getref(sma)) {
-                                sem_unlock(sma, -1);
-                                rcu_read_unlock();
                                 err = -EIDRM;
-                                goto out_free;
+                                goto out_unlock;
                         }
                         sem_unlock(sma, -1);
                         rcu_read_unlock();
@@ -1354,10 +1362,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
                         rcu_read_lock();
                         sem_lock_and_putref(sma);
                         if (sma->sem_perm.deleted) {
-                                sem_unlock(sma, -1);
-                                rcu_read_unlock();
                                 err = -EIDRM;
-                                goto out_free;
+                                goto out_unlock;
                         }
                 }
                 for (i = 0; i < sma->sem_nsems; i++)
@@ -1375,8 +1381,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
                 struct sem_undo *un;
 
                 if (!ipc_rcu_getref(sma)) {
-                        rcu_read_unlock();
-                        return -EIDRM;
+                        err = -EIDRM;
+                        goto out_rcu_wakeup;
                 }
                 rcu_read_unlock();
 
@@ -1404,10 +1410,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
                 rcu_read_lock();
                 sem_lock_and_putref(sma);
                 if (sma->sem_perm.deleted) {
-                        sem_unlock(sma, -1);
-                        rcu_read_unlock();
                         err = -EIDRM;
-                        goto out_free;
+                        goto out_unlock;
                 }
 
                 for (i = 0; i < nsems; i++)
@@ -1431,6 +1435,10 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
                 goto out_rcu_wakeup;
 
         sem_lock(sma, NULL, -1);
+        if (sma->sem_perm.deleted) {
+                err = -EIDRM;
+                goto out_unlock;
+        }
         curr = &sma->sem_base[semnum];
 
         switch (cmd) {
@@ -1836,6 +1844,10 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
         if (error)
                 goto out_rcu_wakeup;
 
+        error = -EIDRM;
+        locknum = sem_lock(sma, sops, nsops);
+        if (sma->sem_perm.deleted)
+                goto out_unlock_free;
         /*
          * semid identifiers are not unique - find_alloc_undo may have
          * allocated an undo structure, it was invalidated by an RMID
@@ -1843,8 +1855,6 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
          * This case can be detected checking un->semid. The existence of
          * "un" itself is guaranteed by rcu.
          */
-        error = -EIDRM;
-        locknum = sem_lock(sma, sops, nsops);
         if (un && un->semid == -1)
                 goto out_unlock_free;
 
@@ -2057,6 +2067,12 @@ void exit_sem(struct task_struct *tsk)
                 }
 
                 sem_lock(sma, NULL, -1);
+                /* exit_sem raced with IPC_RMID, nothing to do */
+                if (sma->sem_perm.deleted) {
+                        sem_unlock(sma, -1);
+                        rcu_read_unlock();
+                        continue;
+                }
                 un = __lookup_undo(ulp, semid);
                 if (un == NULL) {
                         /* exit_sem raced with IPC_RMID+semget() that created
diff --git a/ipc/util.c b/ipc/util.c
index fdb8ae740775..7684f41bce76 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -17,12 +17,27 @@
  *            Pavel Emelianov <xemul@openvz.org>
  *
  * General sysv ipc locking scheme:
- *  when doing ipc id lookups, take the ids->rwsem
- *      rcu_read_lock()
- *          obtain the ipc object (kern_ipc_perm)
- *          perform security, capabilities, auditing and permission checks, etc.
- *          acquire the ipc lock (kern_ipc_perm.lock) throught ipc_lock_object()
- *             perform data updates (ie: SET, RMID, LOCK/UNLOCK commands)
+ *      rcu_read_lock()
+ *          obtain the ipc object (kern_ipc_perm) by looking up the id in an idr
+ *          tree.
+ *          - perform initial checks (capabilities, auditing and permission,
+ *            etc).
+ *          - perform read-only operations, such as STAT, INFO commands.
+ *            acquire the ipc lock (kern_ipc_perm.lock) through
+ *            ipc_lock_object()
+ *              - perform data updates, such as SET, RMID commands and
+ *                mechanism-specific operations (semop/semtimedop,
+ *                msgsnd/msgrcv, shmat/shmdt).
+ *          drop the ipc lock, through ipc_unlock_object().
+ *      rcu_read_unlock()
+ *
+ *  The ids->rwsem must be taken when:
+ *      - creating, removing and iterating the existing entries in ipc
+ *        identifier sets.
+ *      - iterating through files under /proc/sysvipc/
+ *
+ *  Note that sems have a special fast path that avoids kern_ipc_perm.lock -
+ *  see sem_lock().
  */
 
 #include <linux/mm.h>
diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
index 7deeb6297a48..1a53d497a8c5 100644
--- a/lib/percpu-refcount.c
+++ b/lib/percpu-refcount.c
@@ -53,6 +53,7 @@ int percpu_ref_init(struct percpu_ref *ref, percpu_ref_func_t *release)
         ref->release = release;
         return 0;
 }
+EXPORT_SYMBOL_GPL(percpu_ref_init);
 
 /**
  * percpu_ref_cancel_init - cancel percpu_ref_init()
@@ -84,6 +85,7 @@ void percpu_ref_cancel_init(struct percpu_ref *ref)
                 free_percpu(ref->pcpu_count);
         }
 }
+EXPORT_SYMBOL_GPL(percpu_ref_cancel_init);
 
 static void percpu_ref_kill_rcu(struct rcu_head *rcu)
 {
@@ -156,3 +158,4 @@ void percpu_ref_kill_and_confirm(struct percpu_ref *ref,
 
         call_rcu_sched(&ref->rcu, percpu_ref_kill_rcu);
 }
+EXPORT_SYMBOL_GPL(percpu_ref_kill_and_confirm);
diff --git a/mm/filemap.c b/mm/filemap.c
index 1e6aec4a2d2e..ae4846ff4849 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1616,7 +1616,6 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         struct inode *inode = mapping->host;
         pgoff_t offset = vmf->pgoff;
         struct page *page;
-        bool memcg_oom;
         pgoff_t size;
         int ret = 0;
 
@@ -1625,11 +1624,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                 return VM_FAULT_SIGBUS;
 
         /*
-         * Do we have something in the page cache already?  Either
-         * way, try readahead, but disable the memcg OOM killer for it
-         * as readahead is optional and no errors are propagated up
-         * the fault stack.  The OOM killer is enabled while trying to
-         * instantiate the faulting page individually below.
+         * Do we have something in the page cache already?
          */
         page = find_get_page(mapping, offset);
         if (likely(page) && !(vmf->flags & FAULT_FLAG_TRIED)) {
@@ -1637,14 +1632,10 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                  * We found the page, so try async readahead before
                  * waiting for the lock.
                  */
-                memcg_oom = mem_cgroup_toggle_oom(false);
                 do_async_mmap_readahead(vma, ra, file, page, offset);
-                mem_cgroup_toggle_oom(memcg_oom);
         } else if (!page) {
                 /* No page in the page cache at all */
-                memcg_oom = mem_cgroup_toggle_oom(false);
                 do_sync_mmap_readahead(vma, ra, file, offset);
-                mem_cgroup_toggle_oom(memcg_oom);
                 count_vm_event(PGMAJFAULT);
                 mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT);
                 ret = VM_FAULT_MAJOR;
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 7489884682d8..610e3df2768a 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2697,6 +2697,7 @@ void __split_huge_page_pmd(struct vm_area_struct *vma, unsigned long address,
 
         mmun_start = haddr;
         mmun_end   = haddr + HPAGE_PMD_SIZE;
+again:
         mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end);
         spin_lock(&mm->page_table_lock);
         if (unlikely(!pmd_trans_huge(*pmd))) {
@@ -2719,7 +2720,14 @@ void __split_huge_page_pmd(struct vm_area_struct *vma, unsigned long address,
         split_huge_page(page);
 
         put_page(page);
-        BUG_ON(pmd_trans_huge(*pmd));
+
+        /*
+         * We don't always have down_write of mmap_sem here: a racing
+         * do_huge_pmd_wp_page() might have copied-on-write to another
+         * huge page before our split_huge_page() got the anon_vma lock.
+         */
+        if (unlikely(pmd_trans_huge(*pmd)))
+                goto again;
 }
 
 void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address,
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index b49579c7f2a5..0b7656e804d1 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -653,6 +653,7 @@ static void free_huge_page(struct page *page)
         BUG_ON(page_count(page));
         BUG_ON(page_mapcount(page));
         restore_reserve = PagePrivate(page);
+        ClearPagePrivate(page);
 
         spin_lock(&hugetlb_lock);
         hugetlb_cgroup_uncharge_page(hstate_index(h),
@@ -695,8 +696,22 @@ static void prep_compound_gigantic_page(struct page *page, unsigned long order)
         /* we rely on prep_new_huge_page to set the destructor */
         set_compound_order(page, order);
         __SetPageHead(page);
+        __ClearPageReserved(page);
         for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) {
                 __SetPageTail(p);
+                /*
+                 * For gigantic hugepages allocated through bootmem at
+                 * boot, it's safer to be consistent with the not-gigantic
+                 * hugepages and clear the PG_reserved bit from all tail pages
+                 * too.  Otherwse drivers using get_user_pages() to access tail
+                 * pages may get the reference counting wrong if they see
+                 * PG_reserved set on a tail page (despite the head page not
+                 * having PG_reserved set).  Enforcing this consistency between
+                 * head and tail pages allows drivers to optimize away a check
+                 * on the head page when they need know if put_page() is needed
+                 * after get_user_pages().
+                 */
+                __ClearPageReserved(p);
                 set_page_count(p, 0);
                 p->first_page = page;
         }
@@ -1329,9 +1344,9 @@ static void __init gather_bootmem_prealloc(void)
 #else
                 page = virt_to_page(m);
 #endif
-                __ClearPageReserved(page);
                 WARN_ON(page_count(page) != 1);
                 prep_compound_huge_page(page, h->order);
+                WARN_ON(PageReserved(page));
                 prep_new_huge_page(h, page, page_to_nid(page));
                 /*
                  * If we had gigantic hugepages allocated at boot time, we need
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1c52ddbc839b..34d3ca9572d6 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -866,6 +866,7 @@ static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg,
         unsigned long val = 0;
         int cpu;
 
+        get_online_cpus();
         for_each_online_cpu(cpu)
                 val += per_cpu(memcg->stat->events[idx], cpu);
 #ifdef CONFIG_HOTPLUG_CPU
@@ -873,6 +874,7 @@ static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg,
         val += memcg->nocpu_base.events[idx];
         spin_unlock(&memcg->pcp_counter_lock);
 #endif
+        put_online_cpus();
         return val;
 }
 
@@ -2159,110 +2161,59 @@ static void memcg_oom_recover(struct mem_cgroup *memcg)
                 memcg_wakeup_oom(memcg);
 }
 
-/*
- * try to call OOM killer
- */
 static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
 {
-        bool locked;
-        int wakeups;
-
         if (!current->memcg_oom.may_oom)
                 return;
-
-        current->memcg_oom.in_memcg_oom = 1;
-
         /*
-         * As with any blocking lock, a contender needs to start
-         * listening for wakeups before attempting the trylock,
-         * otherwise it can miss the wakeup from the unlock and sleep
-         * indefinitely.  This is just open-coded because our locking
-         * is so particular to memcg hierarchies.
+         * We are in the middle of the charge context here, so we
+         * don't want to block when potentially sitting on a callstack
+         * that holds all kinds of filesystem and mm locks.
+         *
+         * Also, the caller may handle a failed allocation gracefully
+         * (like optional page cache readahead) and so an OOM killer
+         * invocation might not even be necessary.
+         *
+         * That's why we don't do anything here except remember the
+         * OOM context and then deal with it at the end of the page
+         * fault when the stack is unwound, the locks are released,
+         * and when we know whether the fault was overall successful.
          */
-        wakeups = atomic_read(&memcg->oom_wakeups);
-        mem_cgroup_mark_under_oom(memcg);
-
-        locked = mem_cgroup_oom_trylock(memcg);
-
-        if (locked)
-                mem_cgroup_oom_notify(memcg);
-
-        if (locked && !memcg->oom_kill_disable) {
-                mem_cgroup_unmark_under_oom(memcg);
-                mem_cgroup_out_of_memory(memcg, mask, order);
-                mem_cgroup_oom_unlock(memcg);
-                /*
-                 * There is no guarantee that an OOM-lock contender
-                 * sees the wakeups triggered by the OOM kill
-                 * uncharges.  Wake any sleepers explicitely.
-                 */
-                memcg_oom_recover(memcg);
-        } else {
-                /*
-                 * A system call can just return -ENOMEM, but if this
-                 * is a page fault and somebody else is handling the
-                 * OOM already, we need to sleep on the OOM waitqueue
-                 * for this memcg until the situation is resolved.
-                 * Which can take some time because it might be
-                 * handled by a userspace task.
-                 *
-                 * However, this is the charge context, which means
-                 * that we may sit on a large call stack and hold
-                 * various filesystem locks, the mmap_sem etc. and we
-                 * don't want the OOM handler to deadlock on them
-                 * while we sit here and wait.  Store the current OOM
-                 * context in the task_struct, then return -ENOMEM.
-                 * At the end of the page fault handler, with the
-                 * stack unwound, pagefault_out_of_memory() will check
-                 * back with us by calling
-                 * mem_cgroup_oom_synchronize(), possibly putting the
-                 * task to sleep.
-                 */
-                current->memcg_oom.oom_locked = locked;
-                current->memcg_oom.wakeups = wakeups;
-                css_get(&memcg->css);
-                current->memcg_oom.wait_on_memcg = memcg;
-        }
+        css_get(&memcg->css);
+        current->memcg_oom.memcg = memcg;
+        current->memcg_oom.gfp_mask = mask;
+        current->memcg_oom.order = order;
 }
 
 /**
  * mem_cgroup_oom_synchronize - complete memcg OOM handling
+ * @handle: actually kill/wait or just clean up the OOM state
  *
- * This has to be called at the end of a page fault if the the memcg
- * OOM handler was enabled and the fault is returning %VM_FAULT_OOM.
+ * This has to be called at the end of a page fault if the memcg OOM
+ * handler was enabled.
  *
- * Memcg supports userspace OOM handling, so failed allocations must
+ * Memcg supports userspace OOM handling where failed allocations must
  * sleep on a waitqueue until the userspace task resolves the
  * situation.  Sleeping directly in the charge context with all kinds
  * of locks held is not a good idea, instead we remember an OOM state
  * in the task and mem_cgroup_oom_synchronize() has to be called at
- * the end of the page fault to put the task to sleep and clean up the
- * OOM state.
+ * the end of the page fault to complete the OOM handling.
  *
  * Returns %true if an ongoing memcg OOM situation was detected and
- * finalized, %false otherwise.
+ * completed, %false otherwise.
  */
-bool mem_cgroup_oom_synchronize(void)
+bool mem_cgroup_oom_synchronize(bool handle)
 {
+        struct mem_cgroup *memcg = current->memcg_oom.memcg;
         struct oom_wait_info owait;
-        struct mem_cgroup *memcg;
+        bool locked;
 
         /* OOM is global, do not handle */
-        if (!current->memcg_oom.in_memcg_oom)
-                return false;
-
-        /*
-         * We invoked the OOM killer but there is a chance that a kill
-         * did not free up any charges.  Everybody else might already
-         * be sleeping, so restart the fault and keep the rampage
-         * going until some charges are released.
-         */
-        memcg = current->memcg_oom.wait_on_memcg;
         if (!memcg)
-                goto out;
+                return false;
 
-        if (test_thread_flag(TIF_MEMDIE) || fatal_signal_pending(current))
-                goto out_memcg;
+        if (!handle)
+                goto cleanup;
 
         owait.memcg = memcg;
         owait.wait.flags = 0;
@@ -2271,13 +2222,25 @@ bool mem_cgroup_oom_synchronize(void)
         INIT_LIST_HEAD(&owait.wait.task_list);
 
         prepare_to_wait(&memcg_oom_waitq, &owait.wait, TASK_KILLABLE);
-        /* Only sleep if we didn't miss any wakeups since OOM */
-        if (atomic_read(&memcg->oom_wakeups) == current->memcg_oom.wakeups)
+        mem_cgroup_mark_under_oom(memcg);
+
+        locked = mem_cgroup_oom_trylock(memcg);
+
+        if (locked)
+                mem_cgroup_oom_notify(memcg);
+
+        if (locked && !memcg->oom_kill_disable) {
+                mem_cgroup_unmark_under_oom(memcg);
+                finish_wait(&memcg_oom_waitq, &owait.wait);
+                mem_cgroup_out_of_memory(memcg, current->memcg_oom.gfp_mask,
+                                         current->memcg_oom.order);
+        } else {
                 schedule();
-        finish_wait(&memcg_oom_waitq, &owait.wait);
-out_memcg:
-        mem_cgroup_unmark_under_oom(memcg);
-        if (current->memcg_oom.oom_locked) {
+                mem_cgroup_unmark_under_oom(memcg);
+                finish_wait(&memcg_oom_waitq, &owait.wait);
+        }
+
+        if (locked) {
                 mem_cgroup_oom_unlock(memcg);
                 /*
                  * There is no guarantee that an OOM-lock contender
@@ -2286,10 +2249,9 @@ out_memcg:
                  */
                 memcg_oom_recover(memcg);
         }
+cleanup:
+        current->memcg_oom.memcg = NULL;
         css_put(&memcg->css);
-        current->memcg_oom.wait_on_memcg = NULL;
-out:
-        current->memcg_oom.in_memcg_oom = 0;
         return true;
 }
 
@@ -2703,6 +2665,9 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
                      || fatal_signal_pending(current)))
                 goto bypass;
 
+        if (unlikely(task_in_memcg_oom(current)))
+                goto bypass;
+
         /*
          * We always charge the cgroup the mm_struct belongs to.
          * The mm_struct's mem_cgroup changes on task migration if the
@@ -2801,6 +2766,8 @@ done:
         return 0;
 nomem:
         *ptr = NULL;
+        if (gfp_mask & __GFP_NOFAIL)
+                return 0;
         return -ENOMEM;
 bypass:
         *ptr = root_mem_cgroup;
diff --git a/mm/memory.c b/mm/memory.c
index ca0003947115..1311f26497e6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -837,6 +837,8 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
                                          */
                                         make_migration_entry_read(&entry);
                                         pte = swp_entry_to_pte(entry);
+                                        if (pte_swp_soft_dirty(*src_pte))
+                                                pte = pte_swp_mksoft_dirty(pte);
                                         set_pte_at(src_mm, addr, src_pte, pte);
                                 }
                         }
@@ -3863,15 +3865,21 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
          * space.  Kernel faults are handled more gracefully.
          */
         if (flags & FAULT_FLAG_USER)
-                mem_cgroup_enable_oom();
+                mem_cgroup_oom_enable();
 
         ret = __handle_mm_fault(mm, vma, address, flags);
 
-        if (flags & FAULT_FLAG_USER)
-                mem_cgroup_disable_oom();
-
-        if (WARN_ON(task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM)))
-                mem_cgroup_oom_synchronize();
+        if (flags & FAULT_FLAG_USER) {
+                mem_cgroup_oom_disable();
+                /*
+                 * The task may have entered a memcg OOM situation but
+                 * if the allocation error was handled gracefully (no
+                 * VM_FAULT_OOM), there is no need to kill anything.
+                 * Just clean up the OOM state peacefully.
+                 */
+                if (task_in_memcg_oom(current) && !(ret & VM_FAULT_OOM))
+                        mem_cgroup_oom_synchronize(false);
+        }
 
         return ret;
 }
diff --git a/mm/migrate.c b/mm/migrate.c
index a26bccd44ccb..7a7325ee1d08 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -161,6 +161,8 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
 
         get_page(new);
         pte = pte_mkold(mk_pte(new, vma->vm_page_prot));
+        if (pte_swp_soft_dirty(*ptep))
+                pte = pte_mksoft_dirty(pte);
         if (is_write_migration_entry(entry))
                 pte = pte_mkwrite(pte);
 #ifdef CONFIG_HUGETLB_PAGE
diff --git a/mm/mprotect.c b/mm/mprotect.c
index 94722a4d6b43..a3af058f68e4 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -94,13 +94,16 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
                         swp_entry_t entry = pte_to_swp_entry(oldpte);
 
                         if (is_write_migration_entry(entry)) {
+                                pte_t newpte;
                                 /*
                                  * A protection check is difficult so
                                  * just be safe and disable write
                                  */
                                 make_migration_entry_read(&entry);
-                                set_pte_at(mm, addr, pte,
-                                        swp_entry_to_pte(entry));
+                                newpte = swp_entry_to_pte(entry);
+                                if (pte_swp_soft_dirty(oldpte))
+                                        newpte = pte_swp_mksoft_dirty(newpte);
+                                set_pte_at(mm, addr, pte, newpte);
                         }
                         pages++;
                 }
diff --git a/mm/mremap.c b/mm/mremap.c
index 91b13d6a16d4..0843feb66f3d 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -25,7 +25,6 @@
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
-#include <asm/pgalloc.h>
 
 #include "internal.h"
 
@@ -63,10 +62,8 @@ static pmd_t *alloc_new_pmd(struct mm_struct *mm, struct vm_area_struct *vma,
                 return NULL;
 
         pmd = pmd_alloc(mm, pud, addr);
-        if (!pmd) {
-                pud_free(mm, pud);
+        if (!pmd)
                 return NULL;
-        }
 
         VM_BUG_ON(pmd_trans_huge(*pmd));
 
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 314e9d274381..6738c47f1f72 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -680,7 +680,7 @@ void pagefault_out_of_memory(void)
 {
         struct zonelist *zonelist;
 
-        if (mem_cgroup_oom_synchronize())
+        if (mem_cgroup_oom_synchronize(true))
                 return;
 
         zonelist = node_zonelist(first_online_node, GFP_KERNEL);
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index f5236f804aa6..63807583d8e8 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1210,11 +1210,11 @@ static unsigned long dirty_poll_interval(unsigned long dirty,
         return 1;
 }
 
-static long bdi_max_pause(struct backing_dev_info *bdi,
-                          unsigned long bdi_dirty)
+static unsigned long bdi_max_pause(struct backing_dev_info *bdi,
+                                   unsigned long bdi_dirty)
 {
-        long bw = bdi->avg_write_bandwidth;
-        long t;
+        unsigned long bw = bdi->avg_write_bandwidth;
+        unsigned long t;
 
         /*
          * Limit pause time for small memory systems. If sleeping for too long
@@ -1226,7 +1226,7 @@ static long bdi_max_pause(struct backing_dev_info *bdi,
         t = bdi_dirty / (1 + bw / roundup_pow_of_two(1 + HZ / 8));
         t++;
 
-        return min_t(long, t, MAX_PAUSE);
+        return min_t(unsigned long, t, MAX_PAUSE);
 }
 
 static long bdi_min_pause(struct backing_dev_info *bdi,
diff --git a/mm/slab_common.c b/mm/slab_common.c
index a3443278ce3a..e2e98af703ea 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -56,6 +56,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
                         continue;
                 }
 
+#if !defined(CONFIG_SLUB) || !defined(CONFIG_SLUB_DEBUG_ON)
                 /*
                  * For simplicity, we won't check this in the list of memcg
                  * caches. We have control over memcg naming, and if there
@@ -69,6 +70,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
                         s = NULL;
                         return -EINVAL;
                 }
+#endif
         }
 
         WARN_ON(strchr(name, ' '));     /* It confuses parsers */
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 3963fc24fcc1..de7c904e52e5 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1824,6 +1824,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
         struct filename *pathname;
         int i, type, prev;
         int err;
+        unsigned int old_block_size;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
@@ -1914,6 +1915,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
         }
 
         swap_file = p->swap_file;
+        old_block_size = p->old_block_size;
         p->swap_file = NULL;
         p->max = 0;
         swap_map = p->swap_map;
@@ -1938,7 +1940,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
         inode = mapping->host;
         if (S_ISBLK(inode->i_mode)) {
                 struct block_device *bdev = I_BDEV(inode);
-                set_blocksize(bdev, p->old_block_size);
+                set_blocksize(bdev, old_block_size);
                 blkdev_put(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL);
         } else {
                 mutex_lock(&inode->i_mutex);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 53f2f82f83ae..eea668d9cff6 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -211,6 +211,7 @@ void unregister_shrinker(struct shrinker *shrinker)
         down_write(&shrinker_rwsem);
         list_del(&shrinker->list);
         up_write(&shrinker_rwsem);
+        kfree(shrinker->nr_deferred);
 }
 EXPORT_SYMBOL(unregister_shrinker);
 
diff --git a/mm/zswap.c b/mm/zswap.c
index 841e35f1db22..d93510c6aa2d 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -804,6 +804,10 @@ static void zswap_frontswap_invalidate_area(unsigned type)
         }
         tree->rbroot = RB_ROOT;
         spin_unlock(&tree->lock);
+
+        zbud_destroy_pool(tree->pool);
+        kfree(tree);
+        zswap_trees[type] = NULL;
 }
 
 static struct zbud_ops zswap_zbud_ops = {
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 95c2b2689a03..7db9954f1af2 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -580,15 +580,13 @@ static struct aa_namespace *__next_namespace(struct aa_namespace *root,
 
         /* check if the next ns is a sibling, parent, gp, .. */
         parent = ns->parent;
-        while (parent) {
+        while (ns != root) {
                 mutex_unlock(&ns->lock);
                 next = list_entry_next(ns, base.list);
                 if (!list_entry_is_head(next, &parent->sub_ns, base.list)) {
                         mutex_lock(&next->lock);
                         return next;
                 }
-                if (parent == root)
-                        return NULL;
                 ns = parent;
                 parent = parent->parent;
         }
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 345bec07a27d..705c2879d3a9 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -610,6 +610,7 @@ void aa_free_profile(struct aa_profile *profile)
         aa_put_dfa(profile->policy.dfa);
         aa_put_replacedby(profile->replacedby);
 
+        kzfree(profile->hash);
         kzfree(profile);
 }
 
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index ac41e9cdc976..26ad4f0aade3 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -3531,7 +3531,7 @@ static int create_capture_mixers(struct hda_codec *codec)
                 if (!multi)
                         err = create_single_cap_vol_ctl(codec, n, vol, sw,
                                                         inv_dmic);
-                else if (!multi_cap_vol)
+                else if (!multi_cap_vol && !inv_dmic)
                         err = create_bind_cap_vol_ctl(codec, n, vol, sw);
                 else
                         err = create_multi_cap_vol_ctl(codec);
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 4f255dfee450..f59a321a6d6a 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -4845,6 +4845,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne
                         if ((err = hdsp_get_iobox_version(hdsp)) < 0)
                                 return err;
                 }
+                memset(&hdsp_version, 0, sizeof(hdsp_version));
                 hdsp_version.io_type = hdsp->io_type;
                 hdsp_version.firmware_rev = hdsp->firmware_rev;
                 if ((err = copy_to_user(argp, &hdsp_version, sizeof(hdsp_version))))
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index d0323a693ba2..999550bbad40 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -262,7 +262,9 @@ static int usb_stream_hwdep_mmap(struct snd_hwdep *hw,
         }
 
         area->vm_ops = &usb_stream_hwdep_vm_ops;
-        area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+        area->vm_flags |= VM_DONTDUMP;
+        if (!read)
+                area->vm_flags |= VM_DONTEXPAND;
         area->vm_private_data = us122l;
         atomic_inc(&us122l->mmap_count);
 out:
diff --git a/tools/testing/selftests/timers/posix_timers.c b/tools/testing/selftests/timers/posix_timers.c
index 4fa655d68a81..41bd85559d4b 100644
--- a/tools/testing/selftests/timers/posix_timers.c
+++ b/tools/testing/selftests/timers/posix_timers.c
@@ -151,7 +151,7 @@ static int check_timer_create(int which)
         fflush(stdout);
 
         done = 0;
-        timer_create(which, NULL, &id);
+        err = timer_create(which, NULL, &id);
         if (err < 0) {
                 perror("Can't create timer\n");
                 return -1;