591 files changed, 8295 insertions, 6041 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/connector/ucon.c b/Documentation/connector/ucon.c
index 4848db8c71ff..8a4da64e02a8 100644
--- a/Documentation/connector/ucon.c
+++ b/Documentation/connector/ucon.c
@@ -71,7 +71,7 @@ static int netlink_send(int s, struct cn_msg *msg)
         nlh->nlmsg_seq = seq++;
         nlh->nlmsg_pid = getpid();
         nlh->nlmsg_type = NLMSG_DONE;
-        nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));
+        nlh->nlmsg_len = size;
         nlh->nlmsg_flags = 0;
 
         m = NLMSG_DATA(nlh);
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/sound/cs42l73.txt b/Documentation/devicetree/bindings/sound/cs42l73.txt
new file mode 100644
index 000000000000..80ae910dbf6c
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cs42l73.txt
@@ -0,0 +1,22 @@
+CS42L73 audio CODEC
+
+Required properties:
+
+  - compatible : "cirrus,cs42l73"
+
+  - reg : the I2C address of the device for I2C
+
+Optional properties:
+
+  - reset_gpio : a GPIO spec for the reset pin.
+  - chgfreq    : Charge Pump Frequency values 0x00-0x0F
+
+
+Example:
+
+codec: cs42l73@4a {
+        compatible = "cirrus,cs42l73";
+        reg = <0x4a>;
+        reset_gpio = <&gpio 10 0>;
+        chgfreq = <0x05>;
+};
\ No newline at end of file
diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
new file mode 100644
index 000000000000..865178d5cdf3
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
@@ -0,0 +1,42 @@
+* Texas Instruments SoC audio setups with TLV320AIC3X Codec
+
+Required properties:
+- compatible : "ti,da830-evm-audio" : forDM365/DA8xx/OMAPL1x/AM33xx
+- ti,model : The user-visible name of this sound complex.
+- ti,audio-codec : The phandle of the TLV320AIC3x audio codec
+- ti,mcasp-controller : The phandle of the McASP controller
+- ti,codec-clock-rate : The Codec Clock rate (in Hz) applied to the Codec
+- ti,audio-routing : A list of the connections between audio components.
+  Each entry is a pair of strings, the first being the connection's sink,
+  the second being the connection's source. Valid names for sources and
+  sinks are the codec's pins, and the jacks on the board:
+
+  Board connectors:
+
+  * Headphone Jack
+  * Line Out
+  * Mic Jack
+  * Line In
+
+
+Example:
+
+sound {
+        compatible = "ti,da830-evm-audio";
+        ti,model = "DA830 EVM";
+        ti,audio-codec = <&tlv320aic3x>;
+        ti,mcasp-controller = <&mcasp1>;
+        ti,codec-clock-rate = <12000000>;
+        ti,audio-routing =
+                "Headphone Jack",       "HPLOUT",
+                "Headphone Jack",       "HPROUT",
+                "Line Out",             "LLOUT",
+                "Line Out",             "RLOUT",
+                "MIC3L",                "Mic Bias 2V",
+                "MIC3R",                "Mic Bias 2V",
+                "Mic Bias 2V",          "Mic Jack",
+                "LINE1L",               "Line In",
+                "LINE2L",               "Line In",
+                "LINE1R",               "Line In",
+                "LINE2R",               "Line In";
+};
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
index 374e145c2ef1..ed785b3f67be 100644
--- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
+++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
@@ -4,17 +4,25 @@ Required properties:
 - compatible :
         "ti,dm646x-mcasp-audio" : for DM646x platforms
         "ti,da830-mcasp-audio"  : for both DA830 & DA850 platforms
-        "ti,omap2-mcasp-audio"  : for OMAP2 platforms (TI81xx, AM33xx)
-
-- reg : Should contain McASP registers offset and length
-- interrupts : Interrupt number for McASP
-- op-mode : I2S/DIT ops mode.
-- tdm-slots : Slots for TDM operation.
-- num-serializer : Serializers used by McASP.
-- serial-dir : A list of serializer pin mode. The list number should be equal
-                to "num-serializer" parameter. Each entry is a number indication
-                serializer pin direction. (0 - INACTIVE, 1 - TX, 2 - RX)
+        "ti,am33xx-mcasp-audio" : for AM33xx platforms (AM33xx, TI81xx)
 
+- reg : Should contain reg specifiers for the entries in the reg-names property.
+- reg-names : Should contain:
+         * "mpu" for the main registers (required). For compatibility with
+           existing software, it is recommended this is the first entry.
+         * "dat" for separate data port register access (optional).
+- op-mode : I2S/DIT ops mode. 0 for I2S mode. 1 for DIT mode used for S/PDIF,
+            IEC60958-1, and AES-3 formats.
+- tdm-slots : Slots for TDM operation. Indicates number of channels transmitted
+              or received over one serializer.
+- serial-dir : A list of serializer configuration. Each entry is a number
+               indication for serializer pin direction.
+               (0 - INACTIVE, 1 - TX, 2 - RX)
+- dmas: two element list of DMA controller phandles and DMA request line
+        ordered pairs.
+- dma-names: identifier string for each DMA request line in the dmas property.
+             These strings correspond 1:1 with the ordered pairs in dmas. The dma
+             identifiers must be "rx" and "tx".
 
 Optional properties:
 
@@ -23,18 +31,23 @@ Optional properties:
 - rx-num-evt : FIFO levels.
 - sram-size-playback : size of sram to be allocated during playback
 - sram-size-capture  : size of sram to be allocated during capture
+- interrupts : Interrupt numbers for McASP, currently not used by the driver
+- interrupt-names : Known interrupt names are "tx" and "rx"
+- pinctrl-0: Should specify pin control group used for this controller.
+- pinctrl-names: Should contain only one value - "default", for more details
+                 please refer to pinctrl-bindings.txt
+  
 
 Example:
 
 mcasp0: mcasp0@1d00000 {
         compatible = "ti,da830-mcasp-audio";
-        #address-cells = <1>;
-        #size-cells = <0>;
         reg = <0x100000 0x3000>;
-        interrupts = <82 83>;
+        reg-names "mpu";
+        interrupts = <82>, <83>;
+        interrupts-names = "tx", "rx";
         op-mode = <0>;          /* MCASP_IIS_MODE */
         tdm-slots = <2>;
-        num-serializer = <16>;
         serial-dir = <
                         0 0 0 0 /* 0: INACTIVE, 1: TX, 2: RX */
                         0 0 0 0
diff --git a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
index 705a6b156c6c..5e6040c2c2e9 100644
--- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
+++ b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
@@ -24,10 +24,36 @@ Optional properties:
         3 - MICBIAS output is connected to AVDD,
         If this node is not mentioned or if the value is incorrect, then MicBias
         is powered down.
+- AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the
+  device as covered in Documentation/devicetree/bindings/regulator/regulator.txt
+
+CODEC output pins:
+  * LLOUT
+  * RLOUT
+  * MONO_LOUT
+  * HPLOUT
+  * HPROUT
+  * HPLCOM
+  * HPRCOM
+
+CODEC input pins:
+  * MIC3L
+  * MIC3R
+  * LINE1L
+  * LINE2L
+  * LINE1R
+  * LINE2R
+
+The pins can be used in referring sound node's audio-routing property.
 
 Example:
 
 tlv320aic3x: tlv320aic3x@1b {
         compatible = "ti,tlv320aic3x";
         reg = <0x1b>;
+
+        AVDD-supply = <&regulator>;
+        IOVDD-supply = <&regulator>;
+        DRVDD-supply = <&regulator>;
+        DVDD-supply = <&regulator>;
 };
diff --git a/Documentation/devicetree/bindings/sound/tpa6130a2.txt b/Documentation/devicetree/bindings/sound/tpa6130a2.txt
new file mode 100644
index 000000000000..6dfa740e4b2d
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/tpa6130a2.txt
@@ -0,0 +1,27 @@
+Texas Instruments - tpa6130a2 Codec module
+
+The tpa6130a2 serial control bus communicates through I2C protocols
+
+Required properties:
+
+- compatible - "string" - One of:
+    "ti,tpa6130a2" - TPA6130A2
+    "ti,tpa6140a2" - TPA6140A2
+
+
+- reg - <int> -  I2C slave address
+
+- Vdd-supply - <phandle> - power supply regulator
+
+Optional properties:
+
+- power-gpio - gpio pin to power the device
+
+Example:
+
+tpa6130a2: tpa6130a2@60 {
+        compatible = "ti,tpa6130a2";
+        reg = <0x60>;
+        Vdd-supply = <&vmmc2>;
+        power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>;
+};
diff --git a/Documentation/sound/alsa/soc/DPCM.txt b/Documentation/sound/alsa/soc/DPCM.txt
new file mode 100644
index 000000000000..aa8546f2d144
--- /dev/null
+++ b/Documentation/sound/alsa/soc/DPCM.txt
@@ -0,0 +1,380 @@
+Dynamic PCM
+===========
+
+1. Description
+==============
+
+Dynamic PCM allows an ALSA PCM device to digitally route its PCM audio to
+various digital endpoints during the PCM stream runtime. e.g. PCM0 can route
+digital audio to I2S DAI0, I2S DAI1 or PDM DAI2. This is useful for on SoC DSP
+drivers that expose several ALSA PCMs and can route to multiple DAIs.
+
+The DPCM runtime routing is determined by the ALSA mixer settings in the same
+way as the analog signal is routed in an ASoC codec driver. DPCM uses a DAPM
+graph representing the DSP internal audio paths and uses the mixer settings to
+determine the patch used by each ALSA PCM.
+
+DPCM re-uses all the existing component codec, platform and DAI drivers without
+any modifications.
+
+
+Phone Audio System with SoC based DSP
+-------------------------------------
+
+Consider the following phone audio subsystem. This will be used in this
+document for all examples :-
+
+| Front End PCMs    |  SoC DSP  | Back End DAIs | Audio devices |
+
+                    *************
+PCM0 <------------> *           * <----DAI0-----> Codec Headset
+                    *           *
+PCM1 <------------> *           * <----DAI1-----> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <----DAI2-----> MODEM
+                    *           *
+PCM3 <------------> *           * <----DAI3-----> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+This diagram shows a simple smart phone audio subsystem. It supports Bluetooth,
+FM digital radio, Speakers, Headset Jack, digital microphones and cellular
+modem. This sound card exposes 4 DSP front end (FE) ALSA PCM devices and
+supports 6 back end (BE) DAIs. Each FE PCM can digitally route audio data to any
+of the BE DAIs. The FE PCM devices can also route audio to more than 1 BE DAI.
+
+
+
+Example - DPCM Switching playback from DAI0 to DAI1
+---------------------------------------------------
+
+Audio is being played to the Headset. After a while the user removes the headset
+and audio continues playing on the speakers.
+
+Playback on PCM0 to Headset would look like :-
+
+                    *************
+PCM0 <============> *           * <====DAI0=====> Codec Headset
+                    *           *
+PCM1 <------------> *           * <----DAI1-----> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <----DAI2-----> MODEM
+                    *           *
+PCM3 <------------> *           * <----DAI3-----> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+The headset is removed from the jack by user so the speakers must now be used :-
+
+                    *************
+PCM0 <============> *           * <----DAI0-----> Codec Headset
+                    *           *
+PCM1 <------------> *           * <====DAI1=====> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <----DAI2-----> MODEM
+                    *           *
+PCM3 <------------> *           * <----DAI3-----> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+The audio driver processes this as follows :-
+
+ 1) Machine driver receives Jack removal event.
+
+ 2) Machine driver OR audio HAL disables the Headset path.
+
+ 3) DPCM runs the PCM trigger(stop), hw_free(), shutdown() operations on DAI0
+    for headset since the path is now disabled.
+
+ 4) Machine driver or audio HAL enables the speaker path.
+
+ 5) DPCM runs the PCM ops for startup(), hw_params(), prepapre() and
+    trigger(start) for DAI1 Speakers since the path is enabled.
+
+In this example, the machine driver or userspace audio HAL can alter the routing
+and then DPCM will take care of managing the DAI PCM operations to either bring
+the link up or down. Audio playback does not stop during this transition.
+
+
+
+DPCM machine driver
+===================
+
+The DPCM enabled ASoC machine driver is similar to normal machine drivers
+except that we also have to :-
+
+ 1) Define the FE and BE DAI links.
+
+ 2) Define any FE/BE PCM operations.
+
+ 3) Define widget graph connections.
+
+
+1 FE and BE DAI links
+---------------------
+
+| Front End PCMs    |  SoC DSP  | Back End DAIs | Audio devices |
+
+                    *************
+PCM0 <------------> *           * <----DAI0-----> Codec Headset
+                    *           *
+PCM1 <------------> *           * <----DAI1-----> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <----DAI2-----> MODEM
+                    *           *
+PCM3 <------------> *           * <----DAI3-----> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+For the example above we have to define 4 FE DAI links and 6 BE DAI links. The
+FE DAI links are defined as follows :-
+
+static struct snd_soc_dai_link machine_dais[] = {
+        {
+                .name = "PCM0 System",
+                .stream_name = "System Playback",
+                .cpu_dai_name = "System Pin",
+                .platform_name = "dsp-audio",
+                .codec_name = "snd-soc-dummy",
+                .codec_dai_name = "snd-soc-dummy-dai",
+                .dynamic = 1,
+                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+                .dpcm_playback = 1,
+        },
+        .....< other FE and BE DAI links here >
+};
+
+This FE DAI link is pretty similar to a regular DAI link except that we also
+set the DAI link to a DPCM FE with the "dynamic = 1". The supported FE stream
+directions should also be set with the "dpcm_playback" and "dpcm_capture"
+flags. There is also an option to specify the ordering of the trigger call for
+each FE. This allows the ASoC core to trigger the DSP before or after the other
+components (as some DSPs have strong requirements for the ordering DAI/DSP
+start and stop sequences).
+
+The FE DAI above sets the codec and code DAIs to dummy devices since the BE is
+dynamic and will change depending on runtime config.
+
+The BE DAIs are configured as follows :-
+
+static struct snd_soc_dai_link machine_dais[] = {
+        .....< FE DAI links here >
+        {
+                .name = "Codec Headset",
+                .cpu_dai_name = "ssp-dai.0",
+                .platform_name = "snd-soc-dummy",
+                .no_pcm = 1,
+                .codec_name = "rt5640.0-001c",
+                .codec_dai_name = "rt5640-aif1",
+                .ignore_suspend = 1,
+                .ignore_pmdown_time = 1,
+                .be_hw_params_fixup = hswult_ssp0_fixup,
+                .ops = &haswell_ops,
+                .dpcm_playback = 1,
+                .dpcm_capture = 1,
+        },
+        .....< other BE DAI links here >
+};
+
+This BE DAI link connects DAI0 to the codec (in this case RT5460 AIF1). It sets
+the "no_pcm" flag to mark it has a BE and sets flags for supported stream
+directions using "dpcm_playback" and "dpcm_capture" above.
+
+The BE has also flags set for ignoreing suspend and PM down time. This allows
+the BE to work in a hostless mode where the host CPU is not transferring data
+like a BT phone call :-
+
+                    *************
+PCM0 <------------> *           * <----DAI0-----> Codec Headset
+                    *           *
+PCM1 <------------> *           * <----DAI1-----> Codec Speakers
+                    *   DSP     *
+PCM2 <------------> *           * <====DAI2=====> MODEM
+                    *           *
+PCM3 <------------> *           * <====DAI3=====> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+This allows the host CPU to sleep whilst the DSP, MODEM DAI and the BT DAI are
+still in operation.
+
+A BE DAI link can also set the codec to a dummy device if the code is a device
+that is managed externally.
+
+Likewise a BE DAI can also set a dummy cpu DAI if the CPU DAI is managed by the
+DSP firmware.
+
+
+2 FE/BE PCM operations
+----------------------
+
+The BE above also exports some PCM operations and a "fixup" callback. The fixup
+callback is used by the machine driver to (re)configure the DAI based upon the
+FE hw params. i.e. the DSP may perform SRC or ASRC from the FE to BE.
+
+e.g. DSP converts all FE hw params to run at fixed rate of 48k, 16bit, stereo for
+DAI0. This means all FE hw_params have to be fixed in the machine driver for
+DAI0 so that the DAI is running at desired configuration regardless of the FE
+configuration.
+
+static int dai0_fixup(struct snd_soc_pcm_runtime *rtd,
+                        struct snd_pcm_hw_params *params)
+{
+        struct snd_interval *rate = hw_param_interval(params,
+                        SNDRV_PCM_HW_PARAM_RATE);
+        struct snd_interval *channels = hw_param_interval(params,
+                                                SNDRV_PCM_HW_PARAM_CHANNELS);
+
+        /* The DSP will covert the FE rate to 48k, stereo */
+        rate->min = rate->max = 48000;
+        channels->min = channels->max = 2;
+
+        /* set DAI0 to 16 bit */
+        snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT -
+                                    SNDRV_PCM_HW_PARAM_FIRST_MASK],
+                                    SNDRV_PCM_FORMAT_S16_LE);
+        return 0;
+}
+
+The other PCM operation are the same as for regular DAI links. Use as necessary.
+
+
+3 Widget graph connections
+--------------------------
+
+The BE DAI links will normally be connected to the graph at initialisation time
+by the ASoC DAPM core. However, if the BE codec or BE DAI is a dummy then this
+has to be set explicitly in the driver :-
+
+/* BE for codec Headset -  DAI0 is dummy and managed by DSP FW */
+{"DAI0 CODEC IN", NULL, "AIF1 Capture"},
+{"AIF1 Playback", NULL, "DAI0 CODEC OUT"},
+
+
+Writing a DPCM DSP driver
+=========================
+
+The DPCM DSP driver looks much like a standard platform class ASoC driver
+combined with elements from a codec class driver. A DSP platform driver must
+implement :-
+
+ 1) Front End PCM DAIs - i.e. struct snd_soc_dai_driver.
+
+ 2) DAPM graph showing DSP audio routing from FE DAIs to BEs.
+
+ 3) DAPM widgets from DSP graph.
+
+ 4) Mixers for gains, routing, etc.
+
+ 5) DMA configuration.
+
+ 6) BE AIF widgets.
+
+Items 6 is important for routing the audio outside of the DSP. AIF need to be
+defined for each BE and each stream direction. e.g for BE DAI0 above we would
+have :-
+
+SND_SOC_DAPM_AIF_IN("DAI0 RX", NULL, 0, SND_SOC_NOPM, 0, 0),
+SND_SOC_DAPM_AIF_OUT("DAI0 TX", NULL, 0, SND_SOC_NOPM, 0, 0),
+
+The BE AIF are used to connect the DSP graph to the graphs for the other
+component drivers (e.g. codec graph).
+
+
+Hostless PCM streams
+====================
+
+A hostless PCM stream is a stream that is not routed through the host CPU. An
+example of this would be a phone call from handset to modem.
+
+
+                    *************
+PCM0 <------------> *           * <----DAI0-----> Codec Headset
+                    *           *
+PCM1 <------------> *           * <====DAI1=====> Codec Speakers/Mic
+                    *   DSP     *
+PCM2 <------------> *           * <====DAI2=====> MODEM
+                    *           *
+PCM3 <------------> *           * <----DAI3-----> BT
+                    *           *
+                    *           * <----DAI4-----> DMIC
+                    *           *
+                    *           * <----DAI5-----> FM
+                    *************
+
+In this case the PCM data is routed via the DSP. The host CPU in this use case
+is only used for control and can sleep during the runtime of the stream.
+
+The host can control the hostless link either by :-
+
+ 1) Configuring the link as a CODEC <-> CODEC style link. In this case the link
+    is enabled or disabled by the state of the DAPM graph. This usually means
+    there is a mixer control that can be used to connect or disconnect the path
+    between both DAIs.
+
+ 2) Hostless FE. This FE has a virtual connection to the BE DAI links on the DAPM
+    graph. Control is then carried out by the FE as regualar PCM operations.
+    This method gives more control over the DAI links, but requires much more
+    userspace code to control the link. Its recommended to use CODEC<->CODEC
+    unless your HW needs more fine grained sequencing of the PCM ops.
+
+
+CODEC <-> CODEC link
+--------------------
+
+This DAI link is enabled when DAPM detects a valid path within the DAPM graph.
+The machine driver sets some additional parameters to the DAI link i.e.
+
+static const struct snd_soc_pcm_stream dai_params = {
+        .formats = SNDRV_PCM_FMTBIT_S32_LE,
+        .rate_min = 8000,
+        .rate_max = 8000,
+        .channels_min = 2,
+        .channels_max = 2,
+};
+
+static struct snd_soc_dai_link dais[] = {
+        < ... more DAI links above ... >
+        {
+                .name = "MODEM",
+                .stream_name = "MODEM",
+                .cpu_dai_name = "dai2",
+                .codec_dai_name = "modem-aif1",
+                .codec_name = "modem",
+                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                                | SND_SOC_DAIFMT_CBM_CFM,
+                .params = &dai_params,
+        }
+        < ... more DAI links here ... >
+
+These parameters are used to configure the DAI hw_params() when DAPM detects a
+valid path and then calls the PCM operations to start the link. DAPM will also
+call the appropriate PCM operations to disable the DAI when the path is no
+longer valid.
+
+
+Hostless FE
+-----------
+
+The DAI link(s) are enabled by a FE that does not read or write any PCM data.
+This means creating a new FE that is connected with a virtual path to both
+DAI links. The DAI links will be started when the FE PCM is started and stopped
+when the FE PCM is stopped. Note that the FE PCM cannot read or write data in
+this configuration.
+
+
diff --git a/Documentation/sound/alsa/soc/codec.txt b/Documentation/sound/alsa/soc/codec.txt
index bce23a4a7875..db5f9c9ae149 100644
--- a/Documentation/sound/alsa/soc/codec.txt
+++ b/Documentation/sound/alsa/soc/codec.txt
@@ -1,22 +1,23 @@
-ASoC Codec Driver
-=================
+ASoC Codec Class Driver
+=======================
 
-The codec driver is generic and hardware independent code that configures the
-codec to provide audio capture and playback. It should contain no code that is
-specific to the target platform or machine. All platform and machine specific
-code should be added to the platform and machine drivers respectively.
+The codec class driver is generic and hardware independent code that configures
+the codec, FM, MODEM, BT or external DSP to provide audio capture and playback.
+It should contain no code that is specific to the target platform or machine.
+All platform and machine specific code should be added to the platform and
+machine drivers respectively.
 
-Each codec driver *must* provide the following features:-
+Each codec class driver *must* provide the following features:-
 
  1) Codec DAI and PCM configuration
- 2) Codec control IO - using I2C, 3 Wire(SPI) or both APIs
+ 2) Codec control IO - using RegMap API
  3) Mixers and audio controls
  4) Codec audio operations
+ 5) DAPM description.
+ 6) DAPM event handler.
 
 Optionally, codec drivers can also provide:-
 
- 5) DAPM description.
- 6) DAPM event handler.
  7) DAC Digital mute control.
 
 Its probably best to use this guide in conjunction with the existing codec
@@ -64,26 +65,9 @@ struct snd_soc_dai_driver wm8731_dai = {
 2 - Codec control IO
 --------------------
 The codec can usually be controlled via an I2C or SPI style interface
-(AC97 combines control with data in the DAI). The codec drivers provide
-functions to read and write the codec registers along with supplying a
-register cache:-
-
-        /* IO control data and register cache */
-        void *control_data; /* codec control (i2c/3wire) data */
-        void *reg_cache;
-
-Codec read/write should do any data formatting and call the hardware
-read write below to perform the IO. These functions are called by the
-core and ALSA when performing DAPM or changing the mixer:-
-
-    unsigned int (*read)(struct snd_soc_codec *, unsigned int);
-    int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
-
-Codec hardware IO functions - usually points to either the I2C, SPI or AC97
-read/write:-
-
-        hw_write_t hw_write;
-        hw_read_t hw_read;
+(AC97 combines control with data in the DAI). The codec driver should use the
+Regmap API for all codec IO. Please see include/linux/regmap.h and existing
+codec drivers for example regmap usage.
 
 
 3 - Mixers and audio controls
@@ -127,7 +111,7 @@ Defines a stereo enumerated control
 
 4 - Codec Audio Operations
 --------------------------
-The codec driver also supports the following ALSA operations:-
+The codec driver also supports the following ALSA PCM operations:-
 
 /* SoC audio ops */
 struct snd_soc_ops {
diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt
index 05bf5a0eee41..7dfd88ce31ac 100644
--- a/Documentation/sound/alsa/soc/dapm.txt
+++ b/Documentation/sound/alsa/soc/dapm.txt
@@ -21,7 +21,7 @@ level power systems.
 
 There are 4 power domains within DAPM
 
-   1. Codec domain - VREF, VMID (core codec and audio power)
+   1. Codec bias domain - VREF, VMID (core codec and audio power)
       Usually controlled at codec probe/remove and suspend/resume, although
       can be set at stream time if power is not needed for sidetone, etc.
 
@@ -63,14 +63,22 @@ Audio DAPM widgets fall into a number of types:-
  o Line       - Line Input/Output (and optional Jack)
  o Speaker    - Speaker
  o Supply     - Power or clock supply widget used by other widgets.
+ o Regulator  - External regulator that supplies power to audio components.
+ o Clock      - External clock that supplies clock to audio componnents.
+ o AIF IN     - Audio Interface Input (with TDM slot mask).
+ o AIF OUT    - Audio Interface Output (with TDM slot mask).
+ o Siggen     - Signal Generator.
+ o DAI IN     - Digital Audio Interface Input.
+ o DAI OUT    - Digital Audio Interface Output.
+ o DAI Link   - DAI Link between two DAI structures */
  o Pre        - Special PRE widget (exec before all others)
  o Post       - Special POST widget (exec after all others)
 
 (Widgets are defined in include/sound/soc-dapm.h)
 
-Widgets are usually added in the codec driver and the machine driver. There are
-convenience macros defined in soc-dapm.h that can be used to quickly build a
-list of widgets of the codecs and machines DAPM widgets.
+Widgets can be added to the sound card by any of the component driver types.
+There are convenience macros defined in soc-dapm.h that can be used to quickly
+build a list of widgets of the codecs and machines DAPM widgets.
 
 Most widgets have a name, register, shift and invert. Some widgets have extra
 parameters for stream name and kcontrols.
@@ -80,11 +88,13 @@ parameters for stream name and kcontrols.
 -------------------------
 
 Stream Widgets relate to the stream power domain and only consist of ADCs
-(analog to digital converters) and DACs (digital to analog converters).
+(analog to digital converters), DACs (digital to analog converters),
+AIF IN and AIF OUT.
 
 Stream widgets have the following format:-
 
 SND_SOC_DAPM_DAC(name, stream name, reg, shift, invert),
+SND_SOC_DAPM_AIF_IN(name, stream, slot, reg, shift, invert)
 
 NOTE: the stream name must match the corresponding stream name in your codec
 snd_soc_codec_dai.
@@ -94,6 +104,11 @@ e.g. stream widgets for HiFi playback and capture
 SND_SOC_DAPM_DAC("HiFi DAC", "HiFi Playback", REG, 3, 1),
 SND_SOC_DAPM_ADC("HiFi ADC", "HiFi Capture", REG, 2, 1),
 
+e.g. stream widgets for AIF
+
+SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),
+SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),
+
 
 2.2 Path Domain Widgets
 -----------------------
@@ -121,12 +136,14 @@ If you dont want the mixer elements prefixed with the name of the mixer widget,
 you can use SND_SOC_DAPM_MIXER_NAMED_CTL instead. the parameters are the same
 as for SND_SOC_DAPM_MIXER.
 
-2.3 Platform/Machine domain Widgets
------------------------------------
+
+2.3 Machine domain Widgets
+--------------------------
 
 Machine widgets are different from codec widgets in that they don't have a
 codec register bit associated with them. A machine widget is assigned to each
-machine audio component (non codec) that can be independently powered. e.g.
+machine audio component (non codec or DSP) that can be independently
+powered. e.g.
 
  o Speaker Amp
  o Microphone Bias
@@ -146,12 +163,12 @@ static int spitz_mic_bias(struct snd_soc_dapm_widget* w, int event)
 SND_SOC_DAPM_MIC("Mic Jack", spitz_mic_bias),
 
 
-2.4 Codec Domain
-----------------
+2.4 Codec (BIAS) Domain
+-----------------------
 
-The codec power domain has no widgets and is handled by the codecs DAPM event
-handler. This handler is called when the codec powerstate is changed wrt to any
-stream event or by kernel PM events.
+The codec bias power domain has no widgets and is handled by the codecs DAPM
+event handler. This handler is called when the codec powerstate is changed wrt
+to any stream event or by kernel PM events.
 
 
 2.5 Virtual Widgets
@@ -169,15 +186,16 @@ After all the widgets have been defined, they can then be added to the DAPM
 subsystem individually with a call to snd_soc_dapm_new_control().
 
 
-3. Codec Widget Interconnections
-================================
+3. Codec/DSP Widget Interconnections
+====================================
 
-Widgets are connected to each other within the codec and machine by audio paths
-(called interconnections). Each interconnection must be defined in order to
-create a map of all audio paths between widgets.
+Widgets are connected to each other within the codec, platform and machine by
+audio paths (called interconnections). Each interconnection must be defined in
+order to create a map of all audio paths between widgets.
 
-This is easiest with a diagram of the codec (and schematic of the machine audio
-system), as it requires joining widgets together via their audio signal paths.
+This is easiest with a diagram of the codec or DSP (and schematic of the machine
+audio system), as it requires joining widgets together via their audio signal
+paths.
 
 e.g., from the WM8731 output mixer (wm8731.c)
 
@@ -247,16 +265,9 @@ machine and includes the codec. e.g.
  o Mic Jack
  o Codec Pins
 
-When a codec pin is NC it can be marked as not used with a call to
-
-snd_soc_dapm_set_endpoint(codec, "Widget Name", 0);
-
-The last argument is 0 for inactive and 1 for active. This way the pin and its
-input widget will never be powered up and consume power.
-
-This also applies to machine widgets. e.g. if a headphone is connected to a
-jack then the jack can be marked active. If the headphone is removed, then
-the headphone jack can be marked inactive.
+Endpoints are added to the DAPM graph so that their usage can be determined in
+order to save power. e.g. NC codecs pins will be switched OFF, unconnected
+jacks can also be switched OFF.
 
 
 5 DAPM Widget Events
diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt
index d50c14df3411..74056dba52be 100644
--- a/Documentation/sound/alsa/soc/machine.txt
+++ b/Documentation/sound/alsa/soc/machine.txt
@@ -1,8 +1,10 @@
 ASoC Machine Driver
 ===================
 
-The ASoC machine (or board) driver is the code that glues together the platform
-and codec drivers.
+The ASoC machine (or board) driver is the code that glues together all the
+component drivers (e.g. codecs, platforms and DAIs). It also describes the
+relationships between each componnent which include audio paths, GPIOs,
+interrupts, clocking, jacks and voltage regulators.
 
 The machine driver can contain codec and platform specific code. It registers
 the audio subsystem with the kernel as a platform device and is represented by
diff --git a/Documentation/sound/alsa/soc/platform.txt b/Documentation/sound/alsa/soc/platform.txt
index d57efad37e0a..3a08a2c9150c 100644
--- a/Documentation/sound/alsa/soc/platform.txt
+++ b/Documentation/sound/alsa/soc/platform.txt
@@ -1,9 +1,9 @@
 ASoC Platform Driver
 ====================
 
-An ASoC platform driver can be divided into audio DMA and SoC DAI configuration
-and control. The platform drivers only target the SoC CPU and must have no board
-specific code.
+An ASoC platform driver class can be divided into audio DMA drivers, SoC DAI
+drivers and DSP drivers. The platform drivers only target the SoC CPU and must
+have no board specific code.
 
 Audio DMA
 =========
@@ -64,3 +64,16 @@ Each SoC DAI driver must provide the following features:-
  5) Suspend and resume (optional)
 
 Please see codec.txt for a description of items 1 - 4.
+
+
+SoC DSP Drivers
+===============
+
+Each SoC DSP driver usually supplies the following features :-
+
+ 1) DAPM graph
+ 2) Mixer controls
+ 3) DMA IO to/from DSP buffers (if applicable)
+ 4) Definition of DSP front end (FE) PCM devices.
+
+Please see DPCM.txt for a description of item 4.
diff --git a/MAINTAINERS b/MAINTAINERS
index 8a0cbf3cf2c8..ffcaf975bed7 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
 
@@ -1009,6 +1009,7 @@ ARM/Marvell Armada 370 and Armada XP SOC support
 M:      Jason Cooper <jason@lakedaemon.net>
 M:      Andrew Lunn <andrew@lunn.ch>
 M:      Gregory Clement <gregory.clement@free-electrons.com>
+M:      Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-mvebu/
@@ -1016,6 +1017,7 @@ F:	arch/arm/mach-mvebu/
 ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
 M:      Jason Cooper <jason@lakedaemon.net>
 M:      Andrew Lunn <andrew@lunn.ch>
+M:      Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-dove/
@@ -1148,6 +1150,13 @@ F:	drivers/net/ethernet/i825xx/ether1*
 F:      drivers/net/ethernet/seeq/ether3*
 F:      drivers/scsi/arm/
 
+ARM/Rockchip SoC support
+M:      Heiko Stuebner <heiko@sntech.de>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-rockchip/
+F:      drivers/*/*rockchip*
+
 ARM/SHARK MACHINE SUPPORT
 M:      Alexander Schulz <alex@shark-linux.de>
 W:      http://www.shark-linux.de/shark.html
@@ -1791,6 +1800,7 @@ F:	include/net/bluetooth/
 
 BONDING DRIVER
 M:      Jay Vosburgh <fubar@us.ibm.com>
+M:      Veaceslav Falico <vfalico@redhat.com>
 M:      Andy Gospodarek <andy@greyhouse.net>
 L:      netdev@vger.kernel.org
 W:      http://sourceforge.net/projects/bonding/
@@ -2300,7 +2310,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 +2341,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
@@ -2718,6 +2728,8 @@ T:	git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:      Vinod Koul <vinod.koul@intel.com>
 M:      Dan Williams <dan.j.williams@intel.com>
+L:      dmaengine@vger.kernel.org
+Q:      https://patchwork.kernel.org/project/linux-dmaengine/list/
 S:      Supported
 F:      drivers/dma/
 F:      include/linux/dma*
@@ -2821,7 +2833,7 @@ M:	Terje Bergström <tbergstrom@nvidia.com>
 L:      dri-devel@lists.freedesktop.org
 L:      linux-tegra@vger.kernel.org
 T:      git git://anongit.freedesktop.org/tegra/linux.git
-S:      Maintained
+S:      Supported
 F:      drivers/gpu/host1x/
 F:      include/uapi/drm/tegra_drm.h
 F:      Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
@@ -3553,7 +3565,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 +3636,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 +3907,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 +4357,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
 
@@ -4351,7 +4369,10 @@ F:	arch/x86/kernel/microcode_intel.c
 
 INTEL I/OAT DMA DRIVER
 M:      Dan Williams <dan.j.williams@intel.com>
-S:      Maintained
+M:      Dave Jiang <dave.jiang@intel.com>
+L:      dmaengine@vger.kernel.org
+Q:      https://patchwork.kernel.org/project/linux-dmaengine/list/
+S:      Supported
 F:      drivers/dma/ioat*
 
 INTEL IOMMU (VT-d)
@@ -7816,6 +7837,13 @@ F:	Documentation/sound/alsa/soc/
 F:      sound/soc/
 F:      include/sound/soc*
 
+SOUND - DMAENGINE HELPERS
+M:      Lars-Peter Clausen <lars@metafoo.de>
+S:      Supported
+F:      include/sound/dmaengine_pcm.h
+F:      sound/core/pcm_dmaengine.c
+F:      sound/soc/soc-generic-dmaengine-pcm.c
+
 SPARC + UltraSPARC (sparc/sparc64)
 M:      "David S. Miller" <davem@davemloft.net>
 L:      sparclinux@vger.kernel.org
@@ -8095,7 +8123,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/
@@ -8288,14 +8316,72 @@ L:	linux-media@vger.kernel.org
 S:      Maintained
 F:      drivers/media/rc/ttusbir.c
 
-TEGRA SUPPORT
+TEGRA ARCHITECTURE SUPPORT
 M:      Stephen Warren <swarren@wwwdotorg.org>
+M:      Thierry Reding <thierry.reding@gmail.com>
 L:      linux-tegra@vger.kernel.org
 Q:      http://patchwork.ozlabs.org/project/linux-tegra/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
 S:      Supported
 N:      [^a-z]tegra
 
+TEGRA ASOC DRIVER
+M:      Stephen Warren <swarren@wwwdotorg.org>
+S:      Supported
+F:      sound/soc/tegra/
+
+TEGRA CLOCK DRIVER
+M:      Peter De Schrijver <pdeschrijver@nvidia.com>
+M:      Prashant Gaikwad <pgaikwad@nvidia.com>
+S:      Supported
+F:      drivers/clk/tegra/
+
+TEGRA DMA DRIVER
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/dma/tegra20-apb-dma.c
+
+TEGRA GPIO DRIVER
+M:      Stephen Warren <swarren@wwwdotorg.org>
+S:      Supported
+F:      drivers/gpio/gpio-tegra.c
+
+TEGRA I2C DRIVER
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/i2c/busses/i2c-tegra.c
+
+TEGRA IOMMU DRIVERS
+M:      Hiroshi Doyu <hdoyu@nvidia.com>
+S:      Supported
+F:      drivers/iommu/tegra*
+
+TEGRA KBC DRIVER
+M:      Rakesh Iyer <riyer@nvidia.com>
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/input/keyboard/tegra-kbc.c
+
+TEGRA PINCTRL DRIVER
+M:      Stephen Warren <swarren@wwwdotorg.org>
+S:      Supported
+F:      drivers/pinctrl/pinctrl-tegra*
+
+TEGRA PWM DRIVER
+M:      Thierry Reding <thierry.reding@gmail.com>
+S:      Supported
+F:      drivers/pwm/pwm-tegra.c
+
+TEGRA SERIAL DRIVER
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/tty/serial/serial-tegra.c
+
+TEGRA SPI DRIVER
+M:      Laxman Dewangan <ldewangan@nvidia.com>
+S:      Supported
+F:      drivers/spi/spi-tegra*
+
 TEHUTI ETHERNET DRIVER
 M:      Andy Gospodarek <andy@greyhouse.net>
 L:      netdev@vger.kernel.org
@@ -8831,61 +8917,14 @@ W:	http://pegasus2.sourceforge.net/
 S:      Maintained
 F:      drivers/net/usb/rtl8150.c
 
-USB SERIAL BELKIN F5U103 DRIVER
-M:      William Greathouse <wgreathouse@smva.com>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/belkin_sa.*
-
-USB SERIAL CYPRESS M8 DRIVER
-M:      Lonnie Mendez <dignome@gmail.com>
+USB SERIAL SUBSYSTEM
+M:      Johan Hovold <jhovold@gmail.com>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
-W:      http://geocities.com/i0xox0i
-W:      http://firstlight.net/cvs
-F:      drivers/usb/serial/cypress_m8.*
-
-USB SERIAL CYBERJACK DRIVER
-M:      Matthias Bruestle and Harald Welte <support@reiner-sct.com>
-W:      http://www.reiner-sct.de/support/treiber_cyberjack.php
-S:      Maintained
-F:      drivers/usb/serial/cyberjack.c
-
-USB SERIAL DIGI ACCELEPORT DRIVER
-M:      Peter Berger <pberger@brimson.com>
-M:      Al Borchers <alborchers@steinerpoint.com>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/digi_acceleport.c
-
-USB SERIAL DRIVER
-M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-L:      linux-usb@vger.kernel.org
-S:      Supported
 F:      Documentation/usb/usb-serial.txt
-F:      drivers/usb/serial/generic.c
-F:      drivers/usb/serial/usb-serial.c
+F:      drivers/usb/serial/
 F:      include/linux/usb/serial.h
 
-USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER
-M:      Gary Brubaker <xavyer@ix.netcom.com>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/empeg.c
-
-USB SERIAL KEYSPAN DRIVER
-M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/*keyspan*
-
-USB SERIAL WHITEHEAT DRIVER
-M:      Support Department <support@connecttech.com>
-L:      linux-usb@vger.kernel.org
-W:      http://www.connecttech.com
-S:      Supported
-F:      drivers/usb/serial/whiteheat*
-
 USB SMSC75XX ETHERNET DRIVER
 M:      Steve Glendinning <steve.glendinning@shawell.net>
 L:      netdev@vger.kernel.org
diff --git a/Makefile b/Makefile
index deec08b7612b..67077ad6edbb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 12
 SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION =
 NAME = One Giant Leap for Frogkind
 
 # *DOCUMENTATION*
diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c
index d63f3de0cd5b..0c14d8a52683 100644
--- a/arch/arc/mm/fault.c
+++ b/arch/arc/mm/fault.c
@@ -17,7 +17,7 @@
 #include <asm/pgalloc.h>
 #include <asm/mmu.h>
 
-static int handle_vmalloc_fault(struct mm_struct *mm, unsigned long address)
+static int handle_vmalloc_fault(unsigned long address)
 {
         /*
          * Synchronize this task's top level page-table
@@ -27,7 +27,7 @@ static int handle_vmalloc_fault(struct mm_struct *mm, unsigned long address)
         pud_t *pud, *pud_k;
         pmd_t *pmd, *pmd_k;
 
-        pgd = pgd_offset_fast(mm, address);
+        pgd = pgd_offset_fast(current->active_mm, address);
         pgd_k = pgd_offset_k(address);
 
         if (!pgd_present(*pgd_k))
@@ -72,7 +72,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address)
          * nothing more.
          */
         if (address >= VMALLOC_START && address <= VMALLOC_END) {
-                ret = handle_vmalloc_fault(mm, address);
+                ret = handle_vmalloc_fault(address);
                 if (unlikely(ret))
                         goto bad_area_nosemaphore;
                 else
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts
index ff1aea0ee043..72693a69f830 100644
--- a/arch/arm/boot/dts/integratorcp.dts
+++ b/arch/arm/boot/dts/integratorcp.dts
@@ -9,11 +9,6 @@
         model = "ARM Integrator/CP";
         compatible = "arm,integrator-cp";
 
-        aliases {
-                arm,timer-primary = &timer2;
-                arm,timer-secondary = &timer1;
-        };
-
         chosen {
                 bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk";
         };
@@ -24,14 +19,18 @@
         };
 
         timer0: timer@13000000 {
+                /* TIMER0 runs @ 25MHz */
                 compatible = "arm,integrator-cp-timer";
+                status = "disabled";
         };
 
         timer1: timer@13000100 {
+                /* TIMER1 runs @ 1MHz */
                 compatible = "arm,integrator-cp-timer";
         };
 
         timer2: timer@13000200 {
+                /* TIMER2 runs @ 1MHz */
                 compatible = "arm,integrator-cp-timer";
         };
 
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/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/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index f50d223a0bd3..99b44e0e8d86 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -930,4 +930,5 @@ void bpf_jit_free(struct sk_filter *fp)
 {
         if (fp->bpf_func != sk_run_filter)
                 module_free(NULL, fp->bpf_func);
+        kfree(fp);
 }
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index 45f1ffcf1a4b..24cdf64789c3 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -971,11 +971,11 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
 [C(LL)] = {
         [C(OP_READ)] = {
                 [C(RESULT_ACCESS)]      = { 0x1c, CNTR_ODD, P },
-                [C(RESULT_MISS)]        = { 0x1d, CNTR_EVEN | CNTR_ODD, P },
+                [C(RESULT_MISS)]        = { 0x1d, CNTR_EVEN, P },
         },
         [C(OP_WRITE)] = {
                 [C(RESULT_ACCESS)]      = { 0x1c, CNTR_ODD, P },
-                [C(RESULT_MISS)]        = { 0x1d, CNTR_EVEN | CNTR_ODD, P },
+                [C(RESULT_MISS)]        = { 0x1d, CNTR_EVEN, P },
         },
 },
 [C(ITLB)] = {
diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c
index c69da3734699..5b28e81d94a0 100644
--- a/arch/mips/mti-malta/malta-int.c
+++ b/arch/mips/mti-malta/malta-int.c
@@ -473,7 +473,7 @@ static void __init fill_ipi_map(void)
 {
         int cpu;
 
-        for (cpu = 0; cpu < NR_CPUS; cpu++) {
+        for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
                 fill_ipi_map1(gic_resched_int_base, cpu, GIC_CPU_INT1);
                 fill_ipi_map1(gic_call_int_base, cpu, GIC_CPU_INT2);
         }
@@ -574,8 +574,9 @@ void __init arch_init_irq(void)
                 /* FIXME */
                 int i;
 #if defined(CONFIG_MIPS_MT_SMP)
-                gic_call_int_base = GIC_NUM_INTRS - NR_CPUS;
-                gic_resched_int_base = gic_call_int_base - NR_CPUS;
+                gic_call_int_base = GIC_NUM_INTRS -
+                        (NR_CPUS - nr_cpu_ids) * 2 - nr_cpu_ids;
+                gic_resched_int_base = gic_call_int_base - nr_cpu_ids;
                 fill_ipi_map();
 #endif
                 gic_init(GIC_BASE_ADDR, GIC_ADDRSPACE_SZ, gic_intr_map,
@@ -599,7 +600,7 @@ void __init arch_init_irq(void)
                 printk("CPU%d: status register now %08x\n", smp_processor_id(), read_c0_status());
                 write_c0_status(0x1100dc00);
                 printk("CPU%d: status register frc %08x\n", smp_processor_id(), read_c0_status());
-                for (i = 0; i < NR_CPUS; i++) {
+                for (i = 0; i < nr_cpu_ids; i++) {
                         arch_init_ipiirq(MIPS_GIC_IRQ_BASE +
                                          GIC_RESCHED_INT(i), &irq_resched);
                         arch_init_ipiirq(MIPS_GIC_IRQ_BASE +
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c
index e49241a2c39a..202785709441 100644
--- a/arch/mips/ralink/timer.c
+++ b/arch/mips/ralink/timer.c
@@ -126,7 +126,7 @@ static int rt_timer_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        rt->membase = devm_request_and_ioremap(&pdev->dev, res);
+        rt->membase = devm_ioremap_resource(&pdev->dev, res);
         if (IS_ERR(rt->membase))
                 return PTR_ERR(rt->membase);
 
diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig
index 0f90569b9d85..9387cc2693f6 100644
--- a/arch/parisc/configs/712_defconfig
+++ b/arch/parisc/configs/712_defconfig
@@ -40,6 +40,8 @@ CONFIG_IP_NF_QUEUE=m
 CONFIG_LLC2=m
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_PARPORT=y
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig
index b647b182dacc..90025322b75e 100644
--- a/arch/parisc/configs/a500_defconfig
+++ b/arch/parisc/configs/a500_defconfig
@@ -79,6 +79,8 @@ CONFIG_IP_DCCP=m
 CONFIG_LLC2=m
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_BLK_DEV_UMEM=m
diff --git a/arch/parisc/configs/b180_defconfig b/arch/parisc/configs/b180_defconfig
index e289f5bf3148..f1a0c25bef8d 100644
--- a/arch/parisc/configs/b180_defconfig
+++ b/arch/parisc/configs/b180_defconfig
@@ -4,6 +4,7 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_BLK_DEV_INITRD=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODVERSIONS=y
@@ -27,6 +28,8 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_PARPORT=y
 CONFIG_PARPORT_PC=y
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig
index 311ca367b622..ec1b014952b6 100644
--- a/arch/parisc/configs/c3000_defconfig
+++ b/arch/parisc/configs/c3000_defconfig
@@ -5,6 +5,7 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EXPERT=y
 CONFIG_KALLSYMS_ALL=y
@@ -39,6 +40,8 @@ CONFIG_NETFILTER_DEBUG=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_BLK_DEV_UMEM=m
diff --git a/arch/parisc/configs/c8000_defconfig b/arch/parisc/configs/c8000_defconfig
index f11006361297..e1c8d2015c89 100644
--- a/arch/parisc/configs/c8000_defconfig
+++ b/arch/parisc/configs/c8000_defconfig
@@ -62,6 +62,8 @@ CONFIG_TIPC=m
 CONFIG_LLC2=m
 CONFIG_DNS_RESOLVER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 CONFIG_PARPORT=y
 CONFIG_PARPORT_PC=y
diff --git a/arch/parisc/configs/default_defconfig b/arch/parisc/configs/default_defconfig
index dfe88f6c95c4..ba61495e1fa4 100644
--- a/arch/parisc/configs/default_defconfig
+++ b/arch/parisc/configs/default_defconfig
@@ -49,6 +49,8 @@ CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
 CONFIG_LLC2=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_PARPORT=y
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index b521c0adf4ec..c035673209f7 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -602,7 +602,6 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long
                 __flush_cache_page(vma, vmaddr, PFN_PHYS(pfn));
         }
 }
-EXPORT_SYMBOL_GPL(flush_cache_page);
 
 #ifdef CONFIG_PARISC_TMPALIAS
 
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index 37aabd772fbb..d2d58258aea6 100644
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -195,6 +195,8 @@ common_stext:
         ldw             MEM_PDC_HI(%r0),%r6
         depd            %r6, 31, 32, %r3        /* move to upper word */
 
+        mfctl           %cr30,%r6               /* PCX-W2 firmware bug */
+
         ldo             PDC_PSW(%r0),%arg0              /* 21 */
         ldo             PDC_PSW_SET_DEFAULTS(%r0),%arg1 /* 2 */
         ldo             PDC_PSW_WIDE_BIT(%r0),%arg2     /* 2 */
@@ -203,6 +205,8 @@ common_stext:
         copy            %r0,%arg3
 
 stext_pdc_ret:
+        mtctl           %r6,%cr30               /* restore task thread info */
+
         /* restore rfi target address*/
         ldd             TI_TASK-THREAD_SZ_ALGN(%sp), %r10
         tophys_r1       %r10
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index bf56e33f8257..2345bdb4d917 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -691,4 +691,5 @@ void bpf_jit_free(struct sk_filter *fp)
 {
         if (fp->bpf_func != sk_run_filter)
                 module_free(NULL, fp->bpf_func);
+        kfree(fp);
 }
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 9b60a36c348d..2204400d0bd5 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -748,7 +748,9 @@ static inline void pgste_set_key(pte_t *ptep, pgste_t pgste, pte_t entry)
 
 static inline void pgste_set_pte(pte_t *ptep, pte_t entry)
 {
-        if (!MACHINE_HAS_ESOP && (pte_val(entry) & _PAGE_WRITE)) {
+        if (!MACHINE_HAS_ESOP &&
+            (pte_val(entry) & _PAGE_PRESENT) &&
+            (pte_val(entry) & _PAGE_WRITE)) {
                 /*
                  * Without enhanced suppression-on-protection force
                  * the dirty bit on for all writable ptes.
diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h
index 8ad8af915032..819b94d22720 100644
--- a/arch/s390/include/asm/timex.h
+++ b/arch/s390/include/asm/timex.h
@@ -71,30 +71,30 @@ static inline void local_tick_enable(unsigned long long comp)
 
 typedef unsigned long long cycles_t;
 
-static inline unsigned long long get_tod_clock(void)
-{
-        unsigned long long clk;
-
-#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES
-        asm volatile(".insn s,0xb27c0000,%0" : "=Q" (clk) : : "cc");
-#else
-        asm volatile("stck %0" : "=Q" (clk) : : "cc");
-#endif
-        return clk;
-}
-
 static inline void get_tod_clock_ext(char *clk)
 {
         asm volatile("stcke %0" : "=Q" (*clk) : : "cc");
 }
 
-static inline unsigned long long get_tod_clock_xt(void)
+static inline unsigned long long get_tod_clock(void)
 {
         unsigned char clk[16];
         get_tod_clock_ext(clk);
         return *((unsigned long long *)&clk[1]);
 }
 
+static inline unsigned long long get_tod_clock_fast(void)
+{
+#ifdef CONFIG_HAVE_MARCH_Z9_109_FEATURES
+        unsigned long long clk;
+
+        asm volatile("stckf %0" : "=Q" (clk) : : "cc");
+        return clk;
+#else
+        return get_tod_clock();
+#endif
+}
+
 static inline cycles_t get_cycles(void)
 {
         return (cycles_t) get_tod_clock() >> 2;
@@ -125,7 +125,7 @@ extern u64 sched_clock_base_cc;
  */
 static inline unsigned long long get_tod_clock_monotonic(void)
 {
-        return get_tod_clock_xt() - sched_clock_base_cc;
+        return get_tod_clock() - sched_clock_base_cc;
 }
 
 /**
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index 1389b637dae5..adaa9e9478d8 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -99,7 +99,7 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
                         break;
                 }
         }
-        return err;
+        return err ? -EFAULT : 0;
 }
 
 int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
@@ -148,7 +148,7 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from)
                         break;
                 }
         }
-        return err;
+        return err ? -EFAULT : 0;
 }
 
 static int save_sigregs32(struct pt_regs *regs, _sigregs32 __user *sregs)
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index f1279dc2e1bc..17d62fe5d7b7 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -867,7 +867,7 @@ static inline void
 debug_finish_entry(debug_info_t * id, debug_entry_t* active, int level,
                         int exception)
 {
-        active->id.stck = get_tod_clock();
+        active->id.stck = get_tod_clock_fast();
         active->id.fields.cpuid = smp_processor_id();
         active->caller = __builtin_return_address(0);
         active->id.fields.exception = exception;
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 7f35cb33e510..7f1f7ac5cf7f 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -385,7 +385,7 @@ static int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu)
         }
 
         if ((!rc) && (vcpu->arch.sie_block->ckc <
-                get_tod_clock() + vcpu->arch.sie_block->epoch)) {
+                get_tod_clock_fast() + vcpu->arch.sie_block->epoch)) {
                 if ((!psw_extint_disabled(vcpu)) &&
                         (vcpu->arch.sie_block->gcr[0] & 0x800ul))
                         rc = 1;
@@ -425,7 +425,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu)
                 goto no_timer;
         }
 
-        now = get_tod_clock() + vcpu->arch.sie_block->epoch;
+        now = get_tod_clock_fast() + vcpu->arch.sie_block->epoch;
         if (vcpu->arch.sie_block->ckc < now) {
                 __unset_cpu_idle(vcpu);
                 return 0;
@@ -515,7 +515,7 @@ void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu)
         }
 
         if ((vcpu->arch.sie_block->ckc <
-                get_tod_clock() + vcpu->arch.sie_block->epoch))
+                get_tod_clock_fast() + vcpu->arch.sie_block->epoch))
                 __try_deliver_ckc_interrupt(vcpu);
 
         if (atomic_read(&fi->active)) {
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index 57c87d7d7ede..a9f3d0042d58 100644
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -44,7 +44,7 @@ static void __udelay_disabled(unsigned long long usecs)
         do {
                 set_clock_comparator(end);
                 vtime_stop_cpu();
-        } while (get_tod_clock() < end);
+        } while (get_tod_clock_fast() < end);
         lockdep_on();
         __ctl_load(cr0, 0, 0);
         __ctl_load(cr6, 6, 6);
@@ -55,7 +55,7 @@ static void __udelay_enabled(unsigned long long usecs)
 {
         u64 clock_saved, end;
 
-        end = get_tod_clock() + (usecs << 12);
+        end = get_tod_clock_fast() + (usecs << 12);
         do {
                 clock_saved = 0;
                 if (end < S390_lowcore.clock_comparator) {
@@ -65,7 +65,7 @@ static void __udelay_enabled(unsigned long long usecs)
                 vtime_stop_cpu();
                 if (clock_saved)
                         local_tick_enable(clock_saved);
-        } while (get_tod_clock() < end);
+        } while (get_tod_clock_fast() < end);
 }
 
 /*
@@ -109,8 +109,8 @@ void udelay_simple(unsigned long long usecs)
 {
         u64 end;
 
-        end = get_tod_clock() + (usecs << 12);
-        while (get_tod_clock() < end)
+        end = get_tod_clock_fast() + (usecs << 12);
+        while (get_tod_clock_fast() < end)
                 cpu_relax();
 }
 
@@ -120,10 +120,10 @@ void __ndelay(unsigned long long nsecs)
 
         nsecs <<= 9;
         do_div(nsecs, 125);
-        end = get_tod_clock() + nsecs;
+        end = get_tod_clock_fast() + nsecs;
         if (nsecs & ~0xfffUL)
                 __udelay(nsecs >> 12);
-        while (get_tod_clock() < end)
+        while (get_tod_clock_fast() < end)
                 barrier();
 }
 EXPORT_SYMBOL(__ndelay);
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 709239285869..a5df511e27a2 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -881,7 +881,9 @@ void bpf_jit_free(struct sk_filter *fp)
         struct bpf_binary_header *header = (void *)addr;
 
         if (fp->bpf_func == sk_run_filter)
-                return;
+                goto free_filter;
         set_memory_rw(addr, header->pages);
         module_free(NULL, header);
+free_filter:
+        kfree(fp);
 }
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index 9c7be59e6f5a..218b6b23c378 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -808,4 +808,5 @@ void bpf_jit_free(struct sk_filter *fp)
 {
         if (fp->bpf_func != sk_run_filter)
                 module_free(NULL, fp->bpf_func);
+        kfree(fp);
 }
diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c
index 829df49dee99..41ebbfebb333 100644
--- a/arch/um/kernel/exitcode.c
+++ b/arch/um/kernel/exitcode.c
@@ -40,9 +40,11 @@ static ssize_t exitcode_proc_write(struct file *file,
                 const char __user *buffer, size_t count, loff_t *pos)
 {
         char *end, buf[sizeof("nnnnn\0")];
+        size_t size;
         int tmp;
 
-        if (copy_from_user(buf, buffer, count))
+        size = min(count, sizeof(buf));
+        if (copy_from_user(buf, buffer, size))
                 return -EFAULT;
 
         tmp = simple_strtol(buf, &end, 0);
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/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 0da5200ee79d..b3e18f800302 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -128,7 +128,8 @@ do {							\
 do {                                                                    \
         typedef typeof(var) pao_T__;                                    \
         const int pao_ID__ = (__builtin_constant_p(val) &&              \
-                              ((val) == 1 || (val) == -1)) ? (val) : 0; \
+                              ((val) == 1 || (val) == -1)) ?            \
+                                (int)(val) : 0;                         \
         if (0) {                                                        \
                 pao_T__ pao_tmp__;                                      \
                 pao_tmp__ = (val);                                      \
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/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 9d8449158cf9..8a87a3224121 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1276,16 +1276,16 @@ void perf_events_lapic_init(void)
 static int __kprobes
 perf_event_nmi_handler(unsigned int cmd, struct pt_regs *regs)
 {
-        int ret;
         u64 start_clock;
         u64 finish_clock;
+        int ret;
 
         if (!atomic_read(&active_events))
                 return NMI_DONE;
 
-        start_clock = local_clock();
+        start_clock = sched_clock();
         ret = x86_pmu.handle_irq(regs);
-        finish_clock = local_clock();
+        finish_clock = sched_clock();
 
         perf_sample_event_took(finish_clock - start_clock);
 
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 697b93af02dd..b2046e4d0b59 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -609,7 +609,7 @@ static struct dentry *d_kvm_debug;
 
 struct dentry *kvm_init_debugfs(void)
 {
-        d_kvm_debug = debugfs_create_dir("kvm", NULL);
+        d_kvm_debug = debugfs_create_dir("kvm-guest", NULL);
         if (!d_kvm_debug)
                 printk(KERN_WARNING "Could not create 'kvm' debugfs directory\n");
 
@@ -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/kernel/nmi.c b/arch/x86/kernel/nmi.c
index ba77ebc2c353..6fcb49ce50a1 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -113,10 +113,10 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
                 u64 before, delta, whole_msecs;
                 int remainder_ns, decimal_msecs, thishandled;
 
-                before = local_clock();
+                before = sched_clock();
                 thishandled = a->handler(type, regs);
                 handled += thishandled;
-                delta = local_clock() - before;
+                delta = sched_clock() - before;
                 trace_nmi_handler(a->handler, (int)delta, thishandled);
 
                 if (delta < nmi_longest_ns)
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 79c216aa0e2b..516593e1ce33 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -772,13 +772,21 @@ out:
         return;
 }
 
+static void bpf_jit_free_deferred(struct work_struct *work)
+{
+        struct sk_filter *fp = container_of(work, struct sk_filter, work);
+        unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
+        struct bpf_binary_header *header = (void *)addr;
+
+        set_memory_rw(addr, header->pages);
+        module_free(NULL, header);
+        kfree(fp);
+}
+
 void bpf_jit_free(struct sk_filter *fp)
 {
         if (fp->bpf_func != sk_run_filter) {
-                unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
-                struct bpf_binary_header *header = (void *)addr;
-
-                set_memory_rw(addr, header->pages);
-                module_free(NULL, header);
+                INIT_WORK(&fp->work, bpf_jit_free_deferred);
+                schedule_work(&fp->work);
         }
 }
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/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index de1dfa18d0a1..21dbe6bdb8ed 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -1122,7 +1122,7 @@ ENDPROC(fast_syscall_spill_registers)
  * a3: exctable, original value in excsave1
  */
 
-fast_syscall_spill_registers_fixup:
+ENTRY(fast_syscall_spill_registers_fixup)
 
         rsr     a2, windowbase  # get current windowbase (a2 is saved)
         xsr     a0, depc        # restore depc and a0
@@ -1134,22 +1134,26 @@ fast_syscall_spill_registers_fixup:
          */
 
         xsr     a3, excsave1    # get spill-mask
-        slli    a2, a3, 1       # shift left by one
+        slli    a3, a3, 1       # shift left by one
 
-        slli    a3, a2, 32-WSBITS
-        src     a2, a2, a3      # a1 = xxwww1yyxxxwww1yy......
+        slli    a2, a3, 32-WSBITS
+        src     a2, a3, a2      # a2 = xxwww1yyxxxwww1yy......
         wsr     a2, windowstart # set corrected windowstart
 
-        rsr     a3, excsave1
-        l32i    a2, a3, EXC_TABLE_DOUBLE_SAVE   # restore a2
-        l32i    a3, a3, EXC_TABLE_PARAM # original WB (in user task)
+        srli    a3, a3, 1
+        rsr     a2, excsave1
+        l32i    a2, a2, EXC_TABLE_DOUBLE_SAVE   # restore a2
+        xsr     a2, excsave1
+        s32i    a3, a2, EXC_TABLE_DOUBLE_SAVE   # save a3
+        l32i    a3, a2, EXC_TABLE_PARAM # original WB (in user task)
+        xsr     a2, excsave1
 
         /* Return to the original (user task) WINDOWBASE.
          * We leave the following frame behind:
          * a0, a1, a2   same
-         * a3:          trashed (saved in excsave_1)
+         * a3:          trashed (saved in EXC_TABLE_DOUBLE_SAVE)
          * depc:        depc (we have to return to that address)
-         * excsave_1:   a3
+         * excsave_1:   exctable
          */
 
         wsr     a3, windowbase
@@ -1159,9 +1163,9 @@ fast_syscall_spill_registers_fixup:
          *  a0: return address
          *  a1: used, stack pointer
          *  a2: kernel stack pointer
-         *  a3: available, saved in EXCSAVE_1
+         *  a3: available
          *  depc: exception address
-         *  excsave: a3
+         *  excsave: exctable
          * Note: This frame might be the same as above.
          */
 
@@ -1181,9 +1185,12 @@ fast_syscall_spill_registers_fixup:
         rsr     a0, exccause
         addx4   a0, a0, a3                      # find entry in table
         l32i    a0, a0, EXC_TABLE_FAST_USER     # load handler
+        l32i    a3, a3, EXC_TABLE_DOUBLE_SAVE
         jx      a0
 
-fast_syscall_spill_registers_fixup_return:
+ENDPROC(fast_syscall_spill_registers_fixup)
+
+ENTRY(fast_syscall_spill_registers_fixup_return)
 
         /* When we return here, all registers have been restored (a2: DEPC) */
 
@@ -1191,13 +1198,13 @@ fast_syscall_spill_registers_fixup_return:
 
         /* Restore fixup handler. */
 
-        xsr     a3, excsave1
-        movi    a2, fast_syscall_spill_registers_fixup
-        s32i    a2, a3, EXC_TABLE_FIXUP
-        s32i    a0, a3, EXC_TABLE_DOUBLE_SAVE
-        rsr     a2, windowbase
-        s32i    a2, a3, EXC_TABLE_PARAM
-        l32i    a2, a3, EXC_TABLE_KSTK
+        rsr     a2, excsave1
+        s32i    a3, a2, EXC_TABLE_DOUBLE_SAVE
+        movi    a3, fast_syscall_spill_registers_fixup
+        s32i    a3, a2, EXC_TABLE_FIXUP
+        rsr     a3, windowbase
+        s32i    a3, a2, EXC_TABLE_PARAM
+        l32i    a2, a2, EXC_TABLE_KSTK
 
         /* Load WB at the time the exception occurred. */
 
@@ -1206,8 +1213,12 @@ fast_syscall_spill_registers_fixup_return:
         wsr     a3, windowbase
         rsync
 
+        rsr     a3, excsave1
+        l32i    a3, a3, EXC_TABLE_DOUBLE_SAVE
+
         rfde
 
+ENDPROC(fast_syscall_spill_registers_fixup_return)
 
 /*
  * spill all registers.
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index 718eca1850bd..98b67d5f1514 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -341,7 +341,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
         sp = regs->areg[1];
 
-        if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! on_sig_stack(sp)) {
+        if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && sas_ss_flags(sp) == 0) {
                 sp = current->sas_ss_sp + current->sas_ss_size;
         }
 
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c
index 56f88b7afe2f..e9e1aad8c271 100644
--- a/arch/xtensa/platforms/iss/network.c
+++ b/arch/xtensa/platforms/iss/network.c
@@ -737,7 +737,8 @@ static int __init iss_net_setup(char *str)
                 return 1;
         }
 
-        if ((new = alloc_bootmem(sizeof new)) == NULL) {
+        new = alloc_bootmem(sizeof(*new));
+        if (new == NULL) {
                 printk("Alloc_bootmem failed\n");
                 return 1;
         }
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/ahci.c b/drivers/ata/ahci.c
index 9d715ae5ff6b..8e28f923cf7f 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1343,7 +1343,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)
                 host->flags |= ATA_HOST_PARALLEL_SCAN;
         else
-                printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n");
+                dev_info(&pdev->dev, "SSS flag set, parallel bus scan disabled\n");
 
         if (pi.flags & ATA_FLAG_EM)
                 ahci_reset_em(host);
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 2daaee05cab1..7d3b85385bfc 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -184,7 +184,7 @@ static int ahci_probe(struct platform_device *pdev)
         if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)
                 host->flags |= ATA_HOST_PARALLEL_SCAN;
         else
-                printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n");
+                dev_info(dev, "SSS flag set, parallel bus scan disabled\n");
 
         if (pi.flags & ATA_FLAG_EM)
                 ahci_reset_em(host);
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index acfd0f711069..aaac4fb0d564 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -778,8 +778,16 @@ static void ahci_start_port(struct ata_port *ap)
                                 rc = ap->ops->transmit_led_message(ap,
                                                                emp->led_state,
                                                                4);
+                                /*
+                                 * If busy, give a breather but do not
+                                 * release EH ownership by using msleep()
+                                 * instead of ata_msleep().  EM Transmit
+                                 * bit is busy for the whole host and
+                                 * releasing ownership will cause other
+                                 * ports to fail the same way.
+                                 */
                                 if (rc == -EBUSY)
-                                        ata_msleep(ap, 1);
+                                        msleep(1);
                                 else
                                         break;
                         }
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-eh.c b/drivers/ata/libata-eh.c
index c69fcce505c0..370462fa8e01 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1322,14 +1322,14 @@ void ata_eh_qc_complete(struct ata_queued_cmd *qc)
  *      should be retried.  To be used from EH.
  *
  *      SCSI midlayer limits the number of retries to scmd->allowed.
- *      scmd->retries is decremented for commands which get retried
+ *      scmd->allowed is incremented for commands which get retried
  *      due to unrelated failures (qc->err_mask is zero).
  */
 void ata_eh_qc_retry(struct ata_queued_cmd *qc)
 {
         struct scsi_cmnd *scmd = qc->scsicmd;
-        if (!qc->err_mask && scmd->retries)
-                scmd->retries--;
+        if (!qc->err_mask)
+                scmd->allowed++;
         __ata_eh_qc_complete(qc);
 }
 
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/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 4bceb8803a10..b33d1f99b3a4 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -78,7 +78,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
 
         ap->ioaddr.cmd_addr = cmd_addr;
 
-        if (pnp_port_valid(idev, 1) == 0) {
+        if (pnp_port_valid(idev, 1)) {
                 ctl_addr = devm_ioport_map(&idev->dev,
                                            pnp_port_start(idev, 1), 1);
                 ap->ioaddr.altstatus_addr = ctl_addr;
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/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 57f777835d97..33414b1de201 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -44,7 +44,6 @@ struct regmap_format {
 
 struct regmap_async {
         struct list_head list;
-        struct work_struct cleanup;
         struct regmap *map;
         void *work_buf;
 };
@@ -64,9 +63,11 @@ struct regmap {
         void *bus_context;
         const char *name;
 
+        bool async;
         spinlock_t async_lock;
         wait_queue_head_t async_waitq;
         struct list_head async_list;
+        struct list_head async_free;
         int async_ret;
 
 #ifdef CONFIG_DEBUG_FS
@@ -179,6 +180,9 @@ struct regmap_field {
         /* lsb */
         unsigned int shift;
         unsigned int reg;
+
+        unsigned int id_size;
+        unsigned int id_offset;
 };
 
 #ifdef CONFIG_DEBUG_FS
@@ -218,7 +222,7 @@ bool regcache_set_val(struct regmap *map, void *base, unsigned int idx,
 int regcache_lookup_reg(struct regmap *map, unsigned int reg);
 
 int _regmap_raw_write(struct regmap *map, unsigned int reg,
-                      const void *val, size_t val_len, bool async);
+                      const void *val, size_t val_len);
 
 void regmap_async_complete_cb(struct regmap_async *async, int ret);
 
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index d6c2d691b6e8..a36112af494c 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -631,8 +631,7 @@ static int regcache_sync_block_raw_flush(struct regmap *map, const void **data,
 
         map->cache_bypass = 1;
 
-        ret = _regmap_raw_write(map, base, *data, count * val_bytes,
-                                false);
+        ret = _regmap_raw_write(map, base, *data, count * val_bytes);
 
         map->cache_bypass = 0;
 
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 7d689a15c500..ccdac61ac5e2 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -42,15 +42,6 @@ static int _regmap_bus_formatted_write(void *context, unsigned int reg,
 static int _regmap_bus_raw_write(void *context, unsigned int reg,
                                  unsigned int val);
 
-static void async_cleanup(struct work_struct *work)
-{
-        struct regmap_async *async = container_of(work, struct regmap_async,
-                                                  cleanup);
-
-        kfree(async->work_buf);
-        kfree(async);
-}
-
 bool regmap_reg_in_ranges(unsigned int reg,
                           const struct regmap_range *ranges,
                           unsigned int nranges)
@@ -465,6 +456,7 @@ struct regmap *regmap_init(struct device *dev,
 
         spin_lock_init(&map->async_lock);
         INIT_LIST_HEAD(&map->async_list);
+        INIT_LIST_HEAD(&map->async_free);
         init_waitqueue_head(&map->async_waitq);
 
         if (config->read_flag_mask || config->write_flag_mask) {
@@ -821,6 +813,8 @@ static void regmap_field_init(struct regmap_field *rm_field,
         rm_field->reg = reg_field.reg;
         rm_field->shift = reg_field.lsb;
         rm_field->mask = ((BIT(field_bits) - 1) << reg_field.lsb);
+        rm_field->id_size = reg_field.id_size;
+        rm_field->id_offset = reg_field.id_offset;
 }
 
 /**
@@ -942,12 +936,22 @@ EXPORT_SYMBOL_GPL(regmap_reinit_cache);
  */
 void regmap_exit(struct regmap *map)
 {
+        struct regmap_async *async;
+
         regcache_exit(map);
         regmap_debugfs_exit(map);
         regmap_range_exit(map);
         if (map->bus && map->bus->free_context)
                 map->bus->free_context(map->bus_context);
         kfree(map->work_buf);
+        while (!list_empty(&map->async_free)) {
+                async = list_first_entry_or_null(&map->async_free,
+                                                 struct regmap_async,
+                                                 list);
+                list_del(&async->list);
+                kfree(async->work_buf);
+                kfree(async);
+        }
         kfree(map);
 }
 EXPORT_SYMBOL_GPL(regmap_exit);
@@ -1039,7 +1043,7 @@ static int _regmap_select_page(struct regmap *map, unsigned int *reg,
 }
 
 int _regmap_raw_write(struct regmap *map, unsigned int reg,
-                      const void *val, size_t val_len, bool async)
+                      const void *val, size_t val_len)
 {
         struct regmap_range_node *range;
         unsigned long flags;
@@ -1091,7 +1095,7 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
                         dev_dbg(map->dev, "Writing window %d/%zu\n",
                                 win_residue, val_len / map->format.val_bytes);
                         ret = _regmap_raw_write(map, reg, val, win_residue *
-                                                map->format.val_bytes, async);
+                                                map->format.val_bytes);
                         if (ret != 0)
                                 return ret;
 
@@ -1114,21 +1118,42 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
 
         u8[0] |= map->write_flag_mask;
 
-        if (async && map->bus->async_write) {
-                struct regmap_async *async = map->bus->async_alloc();
-                if (!async)
-                        return -ENOMEM;
+        /*
+         * Essentially all I/O mechanisms will be faster with a single
+         * buffer to write.  Since register syncs often generate raw
+         * writes of single registers optimise that case.
+         */
+        if (val != work_val && val_len == map->format.val_bytes) {
+                memcpy(work_val, val, map->format.val_bytes);
+                val = work_val;
+        }
+
+        if (map->async && map->bus->async_write) {
+                struct regmap_async *async;
 
                 trace_regmap_async_write_start(map->dev, reg, val_len);
 
-                async->work_buf = kzalloc(map->format.buf_size,
-                                          GFP_KERNEL | GFP_DMA);
-                if (!async->work_buf) {
-                        kfree(async);
-                        return -ENOMEM;
+                spin_lock_irqsave(&map->async_lock, flags);
+                async = list_first_entry_or_null(&map->async_free,
+                                                 struct regmap_async,
+                                                 list);
+                if (async)
+                        list_del(&async->list);
+                spin_unlock_irqrestore(&map->async_lock, flags);
+
+                if (!async) {
+                        async = map->bus->async_alloc();
+                        if (!async)
+                                return -ENOMEM;
+
+                        async->work_buf = kzalloc(map->format.buf_size,
+                                                  GFP_KERNEL | GFP_DMA);
+                        if (!async->work_buf) {
+                                kfree(async);
+                                return -ENOMEM;
+                        }
                 }
 
-                INIT_WORK(&async->cleanup, async_cleanup);
                 async->map = map;
 
                 /* If the caller supplied the value we can use it safely. */
@@ -1152,11 +1177,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
                                 ret);
 
                         spin_lock_irqsave(&map->async_lock, flags);
-                        list_del(&async->list);
+                        list_move(&async->list, &map->async_free);
                         spin_unlock_irqrestore(&map->async_lock, flags);
-
-                        kfree(async->work_buf);
-                        kfree(async);
                 }
 
                 return ret;
@@ -1253,7 +1275,7 @@ static int _regmap_bus_raw_write(void *context, unsigned int reg,
                                  map->work_buf +
                                  map->format.reg_bytes +
                                  map->format.pad_bytes,
-                                 map->format.val_bytes, false);
+                                 map->format.val_bytes);
 }
 
 static inline void *_regmap_map_get_context(struct regmap *map)
@@ -1318,6 +1340,37 @@ int regmap_write(struct regmap *map, unsigned int reg, unsigned int val)
 EXPORT_SYMBOL_GPL(regmap_write);
 
 /**
+ * regmap_write_async(): Write a value to a single register asynchronously
+ *
+ * @map: Register map to write to
+ * @reg: Register to write to
+ * @val: Value to be written
+ *
+ * A value of zero will be returned on success, a negative errno will
+ * be returned in error cases.
+ */
+int regmap_write_async(struct regmap *map, unsigned int reg, unsigned int val)
+{
+        int ret;
+
+        if (reg % map->reg_stride)
+                return -EINVAL;
+
+        map->lock(map->lock_arg);
+
+        map->async = true;
+
+        ret = _regmap_write(map, reg, val);
+
+        map->async = false;
+
+        map->unlock(map->lock_arg);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(regmap_write_async);
+
+/**
  * regmap_raw_write(): Write raw values to one or more registers
  *
  * @map: Register map to write to
@@ -1345,7 +1398,7 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,
 
         map->lock(map->lock_arg);
 
-        ret = _regmap_raw_write(map, reg, val, val_len, false);
+        ret = _regmap_raw_write(map, reg, val, val_len);
 
         map->unlock(map->lock_arg);
 
@@ -1369,6 +1422,74 @@ int regmap_field_write(struct regmap_field *field, unsigned int val)
 }
 EXPORT_SYMBOL_GPL(regmap_field_write);
 
+/**
+ * regmap_field_update_bits():  Perform a read/modify/write cycle
+ *                              on the register field
+ *
+ * @field: Register field to write to
+ * @mask: Bitmask to change
+ * @val: Value to be written
+ *
+ * A value of zero will be returned on success, a negative errno will
+ * be returned in error cases.
+ */
+int regmap_field_update_bits(struct regmap_field *field, unsigned int mask, unsigned int val)
+{
+        mask = (mask << field->shift) & field->mask;
+
+        return regmap_update_bits(field->regmap, field->reg,
+                                  mask, val << field->shift);
+}
+EXPORT_SYMBOL_GPL(regmap_field_update_bits);
+
+/**
+ * regmap_fields_write(): Write a value to a single register field with port ID
+ *
+ * @field: Register field to write to
+ * @id: port ID
+ * @val: Value to be written
+ *
+ * A value of zero will be returned on success, a negative errno will
+ * be returned in error cases.
+ */
+int regmap_fields_write(struct regmap_field *field, unsigned int id,
+                        unsigned int val)
+{
+        if (id >= field->id_size)
+                return -EINVAL;
+
+        return regmap_update_bits(field->regmap,
+                                  field->reg + (field->id_offset * id),
+                                  field->mask, val << field->shift);
+}
+EXPORT_SYMBOL_GPL(regmap_fields_write);
+
+/**
+ * regmap_fields_update_bits(): Perform a read/modify/write cycle
+ *                              on the register field
+ *
+ * @field: Register field to write to
+ * @id: port ID
+ * @mask: Bitmask to change
+ * @val: Value to be written
+ *
+ * A value of zero will be returned on success, a negative errno will
+ * be returned in error cases.
+ */
+int regmap_fields_update_bits(struct regmap_field *field,  unsigned int id,
+                              unsigned int mask, unsigned int val)
+{
+        if (id >= field->id_size)
+                return -EINVAL;
+
+        mask = (mask << field->shift) & field->mask;
+
+        return regmap_update_bits(field->regmap,
+                                  field->reg + (field->id_offset * id),
+                                  mask, val << field->shift);
+}
+EXPORT_SYMBOL_GPL(regmap_fields_update_bits);
+
 /*
  * regmap_bulk_write(): Write multiple registers to the device
  *
@@ -1426,8 +1547,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
                                 return ret;
                 }
         } else {
-                ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count,
-                                        false);
+                ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);
         }
 
         if (val_bytes != 1)
@@ -1473,7 +1593,11 @@ int regmap_raw_write_async(struct regmap *map, unsigned int reg,
 
         map->lock(map->lock_arg);
 
-        ret = _regmap_raw_write(map, reg, val, val_len, true);
+        map->async = true;
+
+        ret = _regmap_raw_write(map, reg, val, val_len);
+
+        map->async = false;
 
         map->unlock(map->lock_arg);
 
@@ -1677,6 +1801,39 @@ int regmap_field_read(struct regmap_field *field, unsigned int *val)
 EXPORT_SYMBOL_GPL(regmap_field_read);
 
 /**
+ * regmap_fields_read(): Read a value to a single register field with port ID
+ *
+ * @field: Register field to read from
+ * @id: port ID
+ * @val: Pointer to store read value
+ *
+ * A value of zero will be returned on success, a negative errno will
+ * be returned in error cases.
+ */
+int regmap_fields_read(struct regmap_field *field, unsigned int id,
+                       unsigned int *val)
+{
+        int ret;
+        unsigned int reg_val;
+
+        if (id >= field->id_size)
+                return -EINVAL;
+
+        ret = regmap_read(field->regmap,
+                          field->reg + (field->id_offset * id),
+                          &reg_val);
+        if (ret != 0)
+                return ret;
+
+        reg_val &= field->mask;
+        reg_val >>= field->shift;
+        *val = reg_val;
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(regmap_fields_read);
+
+/**
  * regmap_bulk_read(): Read multiple registers from the device
  *
  * @map: Register map to write to
@@ -1788,6 +1945,41 @@ int regmap_update_bits(struct regmap *map, unsigned int reg,
 EXPORT_SYMBOL_GPL(regmap_update_bits);
 
 /**
+ * regmap_update_bits_async: Perform a read/modify/write cycle on the register
+ *                           map asynchronously
+ *
+ * @map: Register map to update
+ * @reg: Register to update
+ * @mask: Bitmask to change
+ * @val: New value for bitmask
+ *
+ * With most buses the read must be done synchronously so this is most
+ * useful for devices with a cache which do not need to interact with
+ * the hardware to determine the current register value.
+ *
+ * Returns zero for success, a negative number on error.
+ */
+int regmap_update_bits_async(struct regmap *map, unsigned int reg,
+                             unsigned int mask, unsigned int val)
+{
+        bool change;
+        int ret;
+
+        map->lock(map->lock_arg);
+
+        map->async = true;
+
+        ret = _regmap_update_bits(map, reg, mask, val, &change);
+
+        map->async = false;
+
+        map->unlock(map->lock_arg);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(regmap_update_bits_async);
+
+/**
  * regmap_update_bits_check: Perform a read/modify/write cycle on the
  *                           register map and report if updated
  *
@@ -1812,6 +2004,43 @@ int regmap_update_bits_check(struct regmap *map, unsigned int reg,
 }
 EXPORT_SYMBOL_GPL(regmap_update_bits_check);
 
+/**
+ * regmap_update_bits_check_async: Perform a read/modify/write cycle on the
+ *                                 register map asynchronously and report if
+ *                                 updated
+ *
+ * @map: Register map to update
+ * @reg: Register to update
+ * @mask: Bitmask to change
+ * @val: New value for bitmask
+ * @change: Boolean indicating if a write was done
+ *
+ * With most buses the read must be done synchronously so this is most
+ * useful for devices with a cache which do not need to interact with
+ * the hardware to determine the current register value.
+ *
+ * Returns zero for success, a negative number on error.
+ */
+int regmap_update_bits_check_async(struct regmap *map, unsigned int reg,
+                                   unsigned int mask, unsigned int val,
+                                   bool *change)
+{
+        int ret;
+
+        map->lock(map->lock_arg);
+
+        map->async = true;
+
+        ret = _regmap_update_bits(map, reg, mask, val, change);
+
+        map->async = false;
+
+        map->unlock(map->lock_arg);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(regmap_update_bits_check_async);
+
 void regmap_async_complete_cb(struct regmap_async *async, int ret)
 {
         struct regmap *map = async->map;
@@ -1820,8 +2049,7 @@ void regmap_async_complete_cb(struct regmap_async *async, int ret)
         trace_regmap_async_io_complete(map->dev);
 
         spin_lock(&map->async_lock);
-
-        list_del(&async->list);
+        list_move(&async->list, &map->async_free);
         wake = list_empty(&map->async_list);
 
         if (ret != 0)
@@ -1829,8 +2057,6 @@ void regmap_async_complete_cb(struct regmap_async *async, int ret)
 
         spin_unlock(&map->async_lock);
 
-        schedule_work(&async->cleanup);
-
         if (wake)
                 wake_up(&map->async_waitq);
 }
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/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c
index 51410c2ac2cb..4d978a3c88f7 100644
--- a/drivers/clk/clk-nomadik.c
+++ b/drivers/clk/clk-nomadik.c
@@ -27,6 +27,14 @@
  */
 
 #define SRC_CR                  0x00U
+#define SRC_CR_T0_ENSEL         BIT(15)
+#define SRC_CR_T1_ENSEL         BIT(17)
+#define SRC_CR_T2_ENSEL         BIT(19)
+#define SRC_CR_T3_ENSEL         BIT(21)
+#define SRC_CR_T4_ENSEL         BIT(23)
+#define SRC_CR_T5_ENSEL         BIT(25)
+#define SRC_CR_T6_ENSEL         BIT(27)
+#define SRC_CR_T7_ENSEL         BIT(29)
 #define SRC_XTALCR              0x0CU
 #define SRC_XTALCR_XTALTIMEN    BIT(20)
 #define SRC_XTALCR_SXTALDIS     BIT(19)
@@ -543,6 +551,19 @@ void __init nomadik_clk_init(void)
                        __func__, np->name);
                 return;
         }
+
+        /* Set all timers to use the 2.4 MHz TIMCLK */
+        val = readl(src_base + SRC_CR);
+        val |= SRC_CR_T0_ENSEL;
+        val |= SRC_CR_T1_ENSEL;
+        val |= SRC_CR_T2_ENSEL;
+        val |= SRC_CR_T3_ENSEL;
+        val |= SRC_CR_T4_ENSEL;
+        val |= SRC_CR_T5_ENSEL;
+        val |= SRC_CR_T6_ENSEL;
+        val |= SRC_CR_T7_ENSEL;
+        writel(val, src_base + SRC_CR);
+
         val = readl(src_base + SRC_XTALCR);
         pr_info("SXTALO is %s\n",
                 (val & SRC_XTALCR_SXTALDIS) ? "disabled" : "enabled");
diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-370.c
index fc777bdc1886..81a202d12a7a 100644
--- a/drivers/clk/mvebu/armada-370.c
+++ b/drivers/clk/mvebu/armada-370.c
@@ -39,8 +39,8 @@ static const struct coreclk_ratio a370_coreclk_ratios[] __initconst = {
 };
 
 static const u32 a370_tclk_freqs[] __initconst = {
-        16600000,
-        20000000,
+        166000000,
+        200000000,
 };
 
 static u32 __init a370_get_tclk_freq(void __iomem *sar)
diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
index 5bb848cac6ec..81dd31a686df 100644
--- a/drivers/clk/socfpga/clk.c
+++ b/drivers/clk/socfpga/clk.c
@@ -49,7 +49,7 @@
 #define SOCFPGA_L4_SP_CLK               "l4_sp_clk"
 #define SOCFPGA_NAND_CLK                "nand_clk"
 #define SOCFPGA_NAND_X_CLK              "nand_x_clk"
-#define SOCFPGA_MMC_CLK                 "mmc_clk"
+#define SOCFPGA_MMC_CLK                 "sdmmc_clk"
 #define SOCFPGA_DB_CLK                  "gpio_db_clk"
 
 #define div_mask(width) ((1 << (width)) - 1)
diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
index 67ccf4aa7277..f5e4c21b301f 100644
--- a/drivers/clk/versatile/clk-icst.c
+++ b/drivers/clk/versatile/clk-icst.c
@@ -107,7 +107,7 @@ static int icst_set_rate(struct clk_hw *hw, unsigned long rate,
 
         vco = icst_hz_to_vco(icst->params, rate);
         icst->rate = icst_hz(icst->params, vco);
-        vco_set(icst->vcoreg, icst->lockreg, vco);
+        vco_set(icst->lockreg, icst->vcoreg, vco);
         return 0;
 }
 
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 08ae128cce9b..c73fc2b74de2 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -65,6 +65,7 @@ void proc_fork_connector(struct task_struct *task)
 
         msg = (struct cn_msg *)buffer;
         ev = (struct proc_event *)msg->data;
+        memset(&ev->event_data, 0, sizeof(ev->event_data));
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
         put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -80,6 +81,7 @@ void proc_fork_connector(struct task_struct *task)
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
+        msg->flags = 0; /* not used */
         /*  If cn_netlink_send() failed, the data is not sent */
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
@@ -96,6 +98,7 @@ void proc_exec_connector(struct task_struct *task)
 
         msg = (struct cn_msg *)buffer;
         ev = (struct proc_event *)msg->data;
+        memset(&ev->event_data, 0, sizeof(ev->event_data));
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
         put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -106,6 +109,7 @@ void proc_exec_connector(struct task_struct *task)
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
+        msg->flags = 0; /* not used */
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
@@ -122,6 +126,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
 
         msg = (struct cn_msg *)buffer;
         ev = (struct proc_event *)msg->data;
+        memset(&ev->event_data, 0, sizeof(ev->event_data));
         ev->what = which_id;
         ev->event_data.id.process_pid = task->pid;
         ev->event_data.id.process_tgid = task->tgid;
@@ -145,6 +150,7 @@ void proc_id_connector(struct task_struct *task, int which_id)
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
+        msg->flags = 0; /* not used */
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
@@ -160,6 +166,7 @@ void proc_sid_connector(struct task_struct *task)
 
         msg = (struct cn_msg *)buffer;
         ev = (struct proc_event *)msg->data;
+        memset(&ev->event_data, 0, sizeof(ev->event_data));
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
         put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -170,6 +177,7 @@ void proc_sid_connector(struct task_struct *task)
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
+        msg->flags = 0; /* not used */
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
@@ -185,6 +193,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
 
         msg = (struct cn_msg *)buffer;
         ev = (struct proc_event *)msg->data;
+        memset(&ev->event_data, 0, sizeof(ev->event_data));
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
         put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -203,6 +212,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id)
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
+        msg->flags = 0; /* not used */
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
@@ -218,6 +228,7 @@ void proc_comm_connector(struct task_struct *task)
 
         msg = (struct cn_msg *)buffer;
         ev = (struct proc_event *)msg->data;
+        memset(&ev->event_data, 0, sizeof(ev->event_data));
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
         put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -229,6 +240,7 @@ void proc_comm_connector(struct task_struct *task)
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
+        msg->flags = 0; /* not used */
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
@@ -244,6 +256,7 @@ void proc_coredump_connector(struct task_struct *task)
 
         msg = (struct cn_msg *)buffer;
         ev = (struct proc_event *)msg->data;
+        memset(&ev->event_data, 0, sizeof(ev->event_data));
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
         put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -254,6 +267,7 @@ void proc_coredump_connector(struct task_struct *task)
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
+        msg->flags = 0; /* not used */
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
@@ -269,6 +283,7 @@ void proc_exit_connector(struct task_struct *task)
 
         msg = (struct cn_msg *)buffer;
         ev = (struct proc_event *)msg->data;
+        memset(&ev->event_data, 0, sizeof(ev->event_data));
         get_seq(&msg->seq, &ev->cpu);
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
         put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -281,6 +296,7 @@ void proc_exit_connector(struct task_struct *task)
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = 0; /* not used */
         msg->len = sizeof(*ev);
+        msg->flags = 0; /* not used */
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
@@ -304,6 +320,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
 
         msg = (struct cn_msg *)buffer;
         ev = (struct proc_event *)msg->data;
+        memset(&ev->event_data, 0, sizeof(ev->event_data));
         msg->seq = rcvd_seq;
         ktime_get_ts(&ts); /* get high res monotonic timestamp */
         put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);
@@ -313,6 +330,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack)
         memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id));
         msg->ack = rcvd_ack + 1;
         msg->len = sizeof(*ev);
+        msg->flags = 0; /* not used */
         cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL);
 }
 
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 6ecfa758942c..a36749f1e44a 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -109,7 +109,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)
 
         data = nlmsg_data(nlh);
 
-        memcpy(data, msg, sizeof(*data) + msg->len);
+        memcpy(data, msg, size);
 
         NETLINK_CB(skb).dst_group = group;
 
@@ -157,17 +157,18 @@ static int cn_call_callback(struct sk_buff *skb)
 static void cn_rx_skb(struct sk_buff *__skb)
 {
         struct nlmsghdr *nlh;
-        int err;
         struct sk_buff *skb;
+        int len, err;
 
         skb = skb_get(__skb);
 
         if (skb->len >= NLMSG_HDRLEN) {
                 nlh = nlmsg_hdr(skb);
+                len = nlmsg_len(nlh);
 
-                if (nlh->nlmsg_len < sizeof(struct cn_msg) ||
+                if (len < (int)sizeof(struct cn_msg) ||
                     skb->len < nlh->nlmsg_len ||
-                    nlh->nlmsg_len > CONNECTOR_MAX_MSG_SIZE) {
+                    len > CONNECTOR_MAX_MSG_SIZE) {
                         kfree_skb(skb);
                         return;
                 }
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index d2c3253e015e..506fd23c7550 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -986,12 +986,12 @@ static int __init acpi_cpufreq_init(void)
 {
         int ret;
 
+        if (acpi_disabled)
+                return -ENODEV;
+
         /* don't keep reloading if cpufreq_driver exists */
         if (cpufreq_get_current_driver())
-                return 0;
-
-        if (acpi_disabled)
-                return 0;
+                return -EEXIST;
 
         pr_debug("acpi_cpufreq_init\n");
 
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 32b3479a2405..eb3fdc755000 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -48,7 +48,7 @@ static inline int32_t div_fp(int32_t x, int32_t y)
 }
 
 struct sample {
-        int core_pct_busy;
+        int32_t core_pct_busy;
         u64 aperf;
         u64 mperf;
         int freq;
@@ -68,7 +68,7 @@ struct _pid {
         int32_t i_gain;
         int32_t d_gain;
         int deadband;
-        int last_err;
+        int32_t last_err;
 };
 
 struct cpudata {
@@ -153,16 +153,15 @@ static inline void pid_d_gain_set(struct _pid *pid, int percent)
         pid->d_gain = div_fp(int_tofp(percent), int_tofp(100));
 }
 
-static signed int pid_calc(struct _pid *pid, int busy)
+static signed int pid_calc(struct _pid *pid, int32_t busy)
 {
-        signed int err, result;
+        signed int result;
         int32_t pterm, dterm, fp_error;
         int32_t integral_limit;
 
-        err = pid->setpoint - busy;
-        fp_error = int_tofp(err);
+        fp_error = int_tofp(pid->setpoint) - busy;
 
-        if (abs(err) <= pid->deadband)
+        if (abs(fp_error) <= int_tofp(pid->deadband))
                 return 0;
 
         pterm = mul_fp(pid->p_gain, fp_error);
@@ -176,8 +175,8 @@ static signed int pid_calc(struct _pid *pid, int busy)
         if (pid->integral < -integral_limit)
                 pid->integral = -integral_limit;
 
-        dterm = mul_fp(pid->d_gain, (err - pid->last_err));
-        pid->last_err = err;
+        dterm = mul_fp(pid->d_gain, fp_error - pid->last_err);
+        pid->last_err = fp_error;
 
         result = pterm + mul_fp(pid->integral, pid->i_gain) + dterm;
 
@@ -367,12 +366,13 @@ static int intel_pstate_turbo_pstate(void)
 static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max)
 {
         int max_perf = cpu->pstate.turbo_pstate;
+        int max_perf_adj;
         int min_perf;
         if (limits.no_turbo)
                 max_perf = cpu->pstate.max_pstate;
 
-        max_perf = fp_toint(mul_fp(int_tofp(max_perf), limits.max_perf));
-        *max = clamp_t(int, max_perf,
+        max_perf_adj = fp_toint(mul_fp(int_tofp(max_perf), limits.max_perf));
+        *max = clamp_t(int, max_perf_adj,
                         cpu->pstate.min_pstate, cpu->pstate.turbo_pstate);
 
         min_perf = fp_toint(mul_fp(int_tofp(max_perf), limits.min_perf));
@@ -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)
@@ -435,8 +436,9 @@ static inline void intel_pstate_calc_busy(struct cpudata *cpu,
                                         struct sample *sample)
 {
         u64 core_pct;
-        core_pct = div64_u64(sample->aperf * 100, sample->mperf);
-        sample->freq = cpu->pstate.max_pstate * core_pct * 1000;
+        core_pct = div64_u64(int_tofp(sample->aperf * 100),
+                             sample->mperf);
+        sample->freq = fp_toint(cpu->pstate.max_pstate * core_pct * 1000);
 
         sample->core_pct_busy = core_pct;
 }
@@ -468,22 +470,19 @@ static inline void intel_pstate_set_sample_time(struct cpudata *cpu)
         mod_timer_pinned(&cpu->timer, jiffies + delay);
 }
 
-static inline int intel_pstate_get_scaled_busy(struct cpudata *cpu)
+static inline int32_t intel_pstate_get_scaled_busy(struct cpudata *cpu)
 {
-        int32_t busy_scaled;
         int32_t core_busy, max_pstate, current_pstate;
 
-        core_busy = int_tofp(cpu->samples[cpu->sample_ptr].core_pct_busy);
+        core_busy = cpu->samples[cpu->sample_ptr].core_pct_busy;
         max_pstate = int_tofp(cpu->pstate.max_pstate);
         current_pstate = int_tofp(cpu->pstate.current_pstate);
-        busy_scaled = mul_fp(core_busy, div_fp(max_pstate, current_pstate));
-
-        return fp_toint(busy_scaled);
+        return mul_fp(core_busy, div_fp(max_pstate, current_pstate));
 }
 
 static inline void intel_pstate_adjust_busy_pstate(struct cpudata *cpu)
 {
-        int busy_scaled;
+        int32_t busy_scaled;
         struct _pid *pid;
         signed int ctl = 0;
         int steps;
@@ -637,8 +636,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 +651,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/dma/edma.c b/drivers/dma/edma.c
index 3519111c566b..10b577fcf48d 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -305,6 +305,7 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
                                 edma_alloc_slot(EDMA_CTLR(echan->ch_num),
                                                 EDMA_SLOT_ANY);
                         if (echan->slot[i] < 0) {
+                                kfree(edesc);
                                 dev_err(dev, "Failed to allocate slot\n");
                                 kfree(edesc);
                                 return NULL;
@@ -346,6 +347,7 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
                         ccnt = sg_dma_len(sg) / (acnt * bcnt);
                         if (ccnt > (SZ_64K - 1)) {
                                 dev_err(dev, "Exceeded max SG segment size\n");
+                                kfree(edesc);
                                 return NULL;
                         }
                         cidx = acnt * bcnt;
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/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index e572dd20bdee..fe58d0833a11 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -61,7 +61,7 @@ static int drm_version(struct drm_device *dev, void *data,
 
 /** Ioctl table */
 static const struct drm_ioctl_desc drm_ioctls[] = {
-        DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version, DRM_UNLOCKED),
+        DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version, DRM_UNLOCKED|DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0),
         DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0),
         DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY),
@@ -402,9 +402,16 @@ long drm_ioctl(struct file *filp,
                 cmd = ioctl->cmd_drv;
         }
         else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) {
+                u32 drv_size;
+
                 ioctl = &drm_ioctls[nr];
-                cmd = ioctl->cmd;
+
+                drv_size = _IOC_SIZE(ioctl->cmd);
                 usize = asize = _IOC_SIZE(cmd);
+                if (drv_size > asize)
+                        asize = drv_size;
+
+                cmd = ioctl->cmd;
         } else
                 goto err_i1;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 69d8ed5416c3..2ad27880cd04 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -505,6 +505,8 @@ static int i915_drm_freeze(struct drm_device *dev)
                 intel_modeset_suspend_hw(dev);
         }
 
+        i915_gem_suspend_gtt_mappings(dev);
+
         i915_save_state(dev);
 
         intel_opregion_fini(dev);
@@ -648,7 +650,8 @@ static int i915_drm_thaw(struct drm_device *dev)
                 mutex_lock(&dev->struct_mutex);
                 i915_gem_restore_gtt_mappings(dev);
                 mutex_unlock(&dev->struct_mutex);
-        }
+        } else if (drm_core_check_feature(dev, DRIVER_MODESET))
+                i915_check_and_clear_faults(dev);
 
         __i915_drm_thaw(dev);
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 35874b3a86dc..ab0f2c0a440c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -497,10 +497,12 @@ struct i915_address_space {
 
         /* FIXME: Need a more generic return type */
         gen6_gtt_pte_t (*pte_encode)(dma_addr_t addr,
-                                     enum i915_cache_level level);
+                                     enum i915_cache_level level,
+                                     bool valid); /* Create a valid PTE */
         void (*clear_range)(struct i915_address_space *vm,
                             unsigned int first_entry,
-                            unsigned int num_entries);
+                            unsigned int num_entries,
+                            bool use_scratch);
         void (*insert_entries)(struct i915_address_space *vm,
                                struct sg_table *st,
                                unsigned int first_entry,
@@ -2065,6 +2067,8 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt,
 void i915_ppgtt_unbind_object(struct i915_hw_ppgtt *ppgtt,
                               struct drm_i915_gem_object *obj);
 
+void i915_check_and_clear_faults(struct drm_device *dev);
+void i915_gem_suspend_gtt_mappings(struct drm_device *dev);
 void i915_gem_restore_gtt_mappings(struct drm_device *dev);
 int __must_check i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj);
 void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj,
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 212f6d8c35ec..1f7b4caefb6e 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -58,9 +58,10 @@
 #define HSW_WT_ELLC_LLC_AGE0            HSW_CACHEABILITY_CONTROL(0x6)
 
 static gen6_gtt_pte_t snb_pte_encode(dma_addr_t addr,
-                                     enum i915_cache_level level)
+                                     enum i915_cache_level level,
+                                     bool valid)
 {
-        gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+        gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
         pte |= GEN6_PTE_ADDR_ENCODE(addr);
 
         switch (level) {
@@ -79,9 +80,10 @@ static gen6_gtt_pte_t snb_pte_encode(dma_addr_t addr,
 }
 
 static gen6_gtt_pte_t ivb_pte_encode(dma_addr_t addr,
-                                     enum i915_cache_level level)
+                                     enum i915_cache_level level,
+                                     bool valid)
 {
-        gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+        gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
         pte |= GEN6_PTE_ADDR_ENCODE(addr);
 
         switch (level) {
@@ -105,9 +107,10 @@ static gen6_gtt_pte_t ivb_pte_encode(dma_addr_t addr,
 #define BYT_PTE_SNOOPED_BY_CPU_CACHES   (1 << 2)
 
 static gen6_gtt_pte_t byt_pte_encode(dma_addr_t addr,
-                                     enum i915_cache_level level)
+                                     enum i915_cache_level level,
+                                     bool valid)
 {
-        gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+        gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
         pte |= GEN6_PTE_ADDR_ENCODE(addr);
 
         /* Mark the page as writeable.  Other platforms don't have a
@@ -122,9 +125,10 @@ static gen6_gtt_pte_t byt_pte_encode(dma_addr_t addr,
 }
 
 static gen6_gtt_pte_t hsw_pte_encode(dma_addr_t addr,
-                                     enum i915_cache_level level)
+                                     enum i915_cache_level level,
+                                     bool valid)
 {
-        gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+        gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
         pte |= HSW_PTE_ADDR_ENCODE(addr);
 
         if (level != I915_CACHE_NONE)
@@ -134,9 +138,10 @@ static gen6_gtt_pte_t hsw_pte_encode(dma_addr_t addr,
 }
 
 static gen6_gtt_pte_t iris_pte_encode(dma_addr_t addr,
-                                      enum i915_cache_level level)
+                                      enum i915_cache_level level,
+                                      bool valid)
 {
-        gen6_gtt_pte_t pte = GEN6_PTE_VALID;
+        gen6_gtt_pte_t pte = valid ? GEN6_PTE_VALID : 0;
         pte |= HSW_PTE_ADDR_ENCODE(addr);
 
         switch (level) {
@@ -236,7 +241,8 @@ static int gen6_ppgtt_enable(struct drm_device *dev)
 /* PPGTT support for Sandybdrige/Gen6 and later */
 static void gen6_ppgtt_clear_range(struct i915_address_space *vm,
                                    unsigned first_entry,
-                                   unsigned num_entries)
+                                   unsigned num_entries,
+                                   bool use_scratch)
 {
         struct i915_hw_ppgtt *ppgtt =
                 container_of(vm, struct i915_hw_ppgtt, base);
@@ -245,7 +251,7 @@ static void gen6_ppgtt_clear_range(struct i915_address_space *vm,
         unsigned first_pte = first_entry % I915_PPGTT_PT_ENTRIES;
         unsigned last_pte, i;
 
-        scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC);
+        scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC, true);
 
         while (num_entries) {
                 last_pte = first_pte + num_entries;
@@ -282,7 +288,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,
                 dma_addr_t page_addr;
 
                 page_addr = sg_page_iter_dma_address(&sg_iter);
-                pt_vaddr[act_pte] = vm->pte_encode(page_addr, cache_level);
+                pt_vaddr[act_pte] = vm->pte_encode(page_addr, cache_level, true);
                 if (++act_pte == I915_PPGTT_PT_ENTRIES) {
                         kunmap_atomic(pt_vaddr);
                         act_pt++;
@@ -367,7 +373,7 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
         }
 
         ppgtt->base.clear_range(&ppgtt->base, 0,
-                                ppgtt->num_pd_entries * I915_PPGTT_PT_ENTRIES);
+                                ppgtt->num_pd_entries * I915_PPGTT_PT_ENTRIES, true);
 
         ppgtt->pd_offset = first_pd_entry_in_global_pt * sizeof(gen6_gtt_pte_t);
 
@@ -444,7 +450,8 @@ void i915_ppgtt_unbind_object(struct i915_hw_ppgtt *ppgtt,
 {
         ppgtt->base.clear_range(&ppgtt->base,
                                 i915_gem_obj_ggtt_offset(obj) >> PAGE_SHIFT,
-                                obj->base.size >> PAGE_SHIFT);
+                                obj->base.size >> PAGE_SHIFT,
+                                true);
 }
 
 extern int intel_iommu_gfx_mapped;
@@ -485,15 +492,65 @@ static void undo_idling(struct drm_i915_private *dev_priv, bool interruptible)
                 dev_priv->mm.interruptible = interruptible;
 }
 
+void i915_check_and_clear_faults(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_ring_buffer *ring;
+        int i;
+
+        if (INTEL_INFO(dev)->gen < 6)
+                return;
+
+        for_each_ring(ring, dev_priv, i) {
+                u32 fault_reg;
+                fault_reg = I915_READ(RING_FAULT_REG(ring));
+                if (fault_reg & RING_FAULT_VALID) {
+                        DRM_DEBUG_DRIVER("Unexpected fault\n"
+                                         "\tAddr: 0x%08lx\\n"
+                                         "\tAddress space: %s\n"
+                                         "\tSource ID: %d\n"
+                                         "\tType: %d\n",
+                                         fault_reg & PAGE_MASK,
+                                         fault_reg & RING_FAULT_GTTSEL_MASK ? "GGTT" : "PPGTT",
+                                         RING_FAULT_SRCID(fault_reg),
+                                         RING_FAULT_FAULT_TYPE(fault_reg));
+                        I915_WRITE(RING_FAULT_REG(ring),
+                                   fault_reg & ~RING_FAULT_VALID);
+                }
+        }
+        POSTING_READ(RING_FAULT_REG(&dev_priv->ring[RCS]));
+}
+
+void i915_gem_suspend_gtt_mappings(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        /* Don't bother messing with faults pre GEN6 as we have little
+         * documentation supporting that it's a good idea.
+         */
+        if (INTEL_INFO(dev)->gen < 6)
+                return;
+
+        i915_check_and_clear_faults(dev);
+
+        dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,
+                                       dev_priv->gtt.base.start / PAGE_SIZE,
+                                       dev_priv->gtt.base.total / PAGE_SIZE,
+                                       false);
+}
+
 void i915_gem_restore_gtt_mappings(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj;
 
+        i915_check_and_clear_faults(dev);
+
         /* First fill our portion of the GTT with scratch pages */
         dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,
                                        dev_priv->gtt.base.start / PAGE_SIZE,
-                                       dev_priv->gtt.base.total / PAGE_SIZE);
+                                       dev_priv->gtt.base.total / PAGE_SIZE,
+                                       true);
 
         list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
                 i915_gem_clflush_object(obj, obj->pin_display);
@@ -536,7 +593,7 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm,
 
         for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) {
                 addr = sg_page_iter_dma_address(&sg_iter);
-                iowrite32(vm->pte_encode(addr, level), &gtt_entries[i]);
+                iowrite32(vm->pte_encode(addr, level, true), &gtt_entries[i]);
                 i++;
         }
 
@@ -548,7 +605,7 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm,
          */
         if (i != 0)
                 WARN_ON(readl(&gtt_entries[i-1]) !=
-                        vm->pte_encode(addr, level));
+                        vm->pte_encode(addr, level, true));
 
         /* This next bit makes the above posting read even more important. We
          * want to flush the TLBs only after we're certain all the PTE updates
@@ -560,7 +617,8 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm,
 
 static void gen6_ggtt_clear_range(struct i915_address_space *vm,
                                   unsigned int first_entry,
-                                  unsigned int num_entries)
+                                  unsigned int num_entries,
+                                  bool use_scratch)
 {
         struct drm_i915_private *dev_priv = vm->dev->dev_private;
         gen6_gtt_pte_t scratch_pte, __iomem *gtt_base =
@@ -573,7 +631,8 @@ static void gen6_ggtt_clear_range(struct i915_address_space *vm,
                  first_entry, num_entries, max_entries))
                 num_entries = max_entries;
 
-        scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC);
+        scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC, use_scratch);
+
         for (i = 0; i < num_entries; i++)
                 iowrite32(scratch_pte, &gtt_base[i]);
         readl(gtt_base);
@@ -594,7 +653,8 @@ static void i915_ggtt_insert_entries(struct i915_address_space *vm,
 
 static void i915_ggtt_clear_range(struct i915_address_space *vm,
                                   unsigned int first_entry,
-                                  unsigned int num_entries)
+                                  unsigned int num_entries,
+                                  bool unused)
 {
         intel_gtt_clear_range(first_entry, num_entries);
 }
@@ -622,7 +682,8 @@ void i915_gem_gtt_unbind_object(struct drm_i915_gem_object *obj)
 
         dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,
                                        entry,
-                                       obj->base.size >> PAGE_SHIFT);
+                                       obj->base.size >> PAGE_SHIFT,
+                                       true);
 
         obj->has_global_gtt_mapping = 0;
 }
@@ -709,11 +770,11 @@ void i915_gem_setup_global_gtt(struct drm_device *dev,
                 const unsigned long count = (hole_end - hole_start) / PAGE_SIZE;
                 DRM_DEBUG_KMS("clearing unused GTT space: [%lx, %lx]\n",
                               hole_start, hole_end);
-                ggtt_vm->clear_range(ggtt_vm, hole_start / PAGE_SIZE, count);
+                ggtt_vm->clear_range(ggtt_vm, hole_start / PAGE_SIZE, count, true);
         }
 
         /* And finally clear the reserved guard page */
-        ggtt_vm->clear_range(ggtt_vm, end / PAGE_SIZE - 1, 1);
+        ggtt_vm->clear_range(ggtt_vm, end / PAGE_SIZE - 1, 1, true);
 }
 
 static bool
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 38f96f65d87a..ef9b35479f01 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -604,6 +604,10 @@
 #define   ARB_MODE_SWIZZLE_IVB  (1<<5)
 #define RENDER_HWS_PGA_GEN7     (0x04080)
 #define RING_FAULT_REG(ring)    (0x4094 + 0x100*(ring)->id)
+#define   RING_FAULT_GTTSEL_MASK (1<<11)
+#define   RING_FAULT_SRCID(x)   ((x >> 3) & 0xff)
+#define   RING_FAULT_FAULT_TYPE(x) ((x >> 1) & 0x3)
+#define   RING_FAULT_VALID      (1<<0)
 #define DONE_REG                0x40b0
 #define BSD_HWS_PGA_GEN7        (0x04180)
 #define BLT_HWS_PGA_GEN7        (0x04280)
@@ -4279,7 +4283,9 @@
 #define FDI_RX_CHICKEN(pipe) _PIPE(pipe, _FDI_RXA_CHICKEN, _FDI_RXB_CHICKEN)
 
 #define SOUTH_DSPCLK_GATE_D     0xc2020
+#define  PCH_DPLUNIT_CLOCK_GATE_DISABLE (1<<30)
 #define  PCH_DPLSUNIT_CLOCK_GATE_DISABLE (1<<29)
+#define  PCH_CPUNIT_CLOCK_GATE_DISABLE (1<<14)
 #define  PCH_LP_PARTITION_LEVEL_DISABLE  (1<<12)
 
 /* CPU: FDI_TX */
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index ea9022ef15d5..10d1de5bce6f 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -83,8 +83,7 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
         return true;
 }
 
-static void intel_crt_get_config(struct intel_encoder *encoder,
-                                 struct intel_crtc_config *pipe_config)
+static unsigned int intel_crt_get_flags(struct intel_encoder *encoder)
 {
         struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
         struct intel_crt *crt = intel_encoder_to_crt(encoder);
@@ -102,7 +101,25 @@ static void intel_crt_get_config(struct intel_encoder *encoder,
         else
                 flags |= DRM_MODE_FLAG_NVSYNC;
 
-        pipe_config->adjusted_mode.flags |= flags;
+        return flags;
+}
+
+static void intel_crt_get_config(struct intel_encoder *encoder,
+                                 struct intel_crtc_config *pipe_config)
+{
+        pipe_config->adjusted_mode.flags |= intel_crt_get_flags(encoder);
+}
+
+static void hsw_crt_get_config(struct intel_encoder *encoder,
+                               struct intel_crtc_config *pipe_config)
+{
+        intel_ddi_get_config(encoder, pipe_config);
+
+        pipe_config->adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC |
+                                              DRM_MODE_FLAG_NHSYNC |
+                                              DRM_MODE_FLAG_PVSYNC |
+                                              DRM_MODE_FLAG_NVSYNC);
+        pipe_config->adjusted_mode.flags |= intel_crt_get_flags(encoder);
 }
 
 /* Note: The caller is required to filter out dpms modes not supported by the
@@ -799,7 +816,10 @@ void intel_crt_init(struct drm_device *dev)
         crt->base.mode_set = intel_crt_mode_set;
         crt->base.disable = intel_disable_crt;
         crt->base.enable = intel_enable_crt;
-        crt->base.get_config = intel_crt_get_config;
+        if (IS_HASWELL(dev))
+                crt->base.get_config = hsw_crt_get_config;
+        else
+                crt->base.get_config = intel_crt_get_config;
         if (I915_HAS_HOTPLUG(dev))
                 crt->base.hpd_pin = HPD_CRT;
         if (HAS_DDI(dev))
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 63de2701b974..b53fff84a7d5 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1249,8 +1249,8 @@ static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder)
                 intel_dp_check_link_status(intel_dp);
 }
 
-static void intel_ddi_get_config(struct intel_encoder *encoder,
-                                 struct intel_crtc_config *pipe_config)
+void intel_ddi_get_config(struct intel_encoder *encoder,
+                          struct intel_crtc_config *pipe_config)
 {
         struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
@@ -1268,6 +1268,23 @@ static void intel_ddi_get_config(struct intel_encoder *encoder,
                 flags |= DRM_MODE_FLAG_NVSYNC;
 
         pipe_config->adjusted_mode.flags |= flags;
+
+        switch (temp & TRANS_DDI_BPC_MASK) {
+        case TRANS_DDI_BPC_6:
+                pipe_config->pipe_bpp = 18;
+                break;
+        case TRANS_DDI_BPC_8:
+                pipe_config->pipe_bpp = 24;
+                break;
+        case TRANS_DDI_BPC_10:
+                pipe_config->pipe_bpp = 30;
+                break;
+        case TRANS_DDI_BPC_12:
+                pipe_config->pipe_bpp = 36;
+                break;
+        default:
+                break;
+        }
 }
 
 static void intel_ddi_destroy(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 581fb4b2f766..d78d33f9337d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2327,9 +2327,10 @@ static void intel_fdi_normal_train(struct drm_crtc *crtc)
                            FDI_FE_ERRC_ENABLE);
 }
 
-static bool pipe_has_enabled_pch(struct intel_crtc *intel_crtc)
+static bool pipe_has_enabled_pch(struct intel_crtc *crtc)
 {
-        return intel_crtc->base.enabled && intel_crtc->config.has_pch_encoder;
+        return crtc->base.enabled && crtc->active &&
+                crtc->config.has_pch_encoder;
 }
 
 static void ivb_modeset_global_resources(struct drm_device *dev)
@@ -2979,6 +2980,48 @@ static void ironlake_pch_transcoder_set_timings(struct intel_crtc *crtc,
                    I915_READ(VSYNCSHIFT(cpu_transcoder)));
 }
 
+static void cpt_enable_fdi_bc_bifurcation(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        uint32_t temp;
+
+        temp = I915_READ(SOUTH_CHICKEN1);
+        if (temp & FDI_BC_BIFURCATION_SELECT)
+                return;
+
+        WARN_ON(I915_READ(FDI_RX_CTL(PIPE_B)) & FDI_RX_ENABLE);
+        WARN_ON(I915_READ(FDI_RX_CTL(PIPE_C)) & FDI_RX_ENABLE);
+
+        temp |= FDI_BC_BIFURCATION_SELECT;
+        DRM_DEBUG_KMS("enabling fdi C rx\n");
+        I915_WRITE(SOUTH_CHICKEN1, temp);
+        POSTING_READ(SOUTH_CHICKEN1);
+}
+
+static void ivybridge_update_fdi_bc_bifurcation(struct intel_crtc *intel_crtc)
+{
+        struct drm_device *dev = intel_crtc->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        switch (intel_crtc->pipe) {
+        case PIPE_A:
+                break;
+        case PIPE_B:
+                if (intel_crtc->config.fdi_lanes > 2)
+                        WARN_ON(I915_READ(SOUTH_CHICKEN1) & FDI_BC_BIFURCATION_SELECT);
+                else
+                        cpt_enable_fdi_bc_bifurcation(dev);
+
+                break;
+        case PIPE_C:
+                cpt_enable_fdi_bc_bifurcation(dev);
+
+                break;
+        default:
+                BUG();
+        }
+}
+
 /*
  * Enable PCH resources required for PCH ports:
  *   - PCH PLLs
@@ -2997,6 +3040,9 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
 
         assert_pch_transcoder_disabled(dev_priv, pipe);
 
+        if (IS_IVYBRIDGE(dev))
+                ivybridge_update_fdi_bc_bifurcation(intel_crtc);
+
         /* Write the TU size bits before fdi link training, so that error
          * detection works. */
         I915_WRITE(FDI_RX_TUSIZE1(pipe),
@@ -4983,6 +5029,22 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
         if (!(tmp & PIPECONF_ENABLE))
                 return false;
 
+        if (IS_G4X(dev) || IS_VALLEYVIEW(dev)) {
+                switch (tmp & PIPECONF_BPC_MASK) {
+                case PIPECONF_6BPC:
+                        pipe_config->pipe_bpp = 18;
+                        break;
+                case PIPECONF_8BPC:
+                        pipe_config->pipe_bpp = 24;
+                        break;
+                case PIPECONF_10BPC:
+                        pipe_config->pipe_bpp = 30;
+                        break;
+                default:
+                        break;
+                }
+        }
+
         intel_get_pipe_timings(crtc, pipe_config);
 
         i9xx_get_pfit_config(crtc, pipe_config);
@@ -5576,48 +5638,6 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc,
         return true;
 }
 
-static void cpt_enable_fdi_bc_bifurcation(struct drm_device *dev)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        uint32_t temp;
-
-        temp = I915_READ(SOUTH_CHICKEN1);
-        if (temp & FDI_BC_BIFURCATION_SELECT)
-                return;
-
-        WARN_ON(I915_READ(FDI_RX_CTL(PIPE_B)) & FDI_RX_ENABLE);
-        WARN_ON(I915_READ(FDI_RX_CTL(PIPE_C)) & FDI_RX_ENABLE);
-
-        temp |= FDI_BC_BIFURCATION_SELECT;
-        DRM_DEBUG_KMS("enabling fdi C rx\n");
-        I915_WRITE(SOUTH_CHICKEN1, temp);
-        POSTING_READ(SOUTH_CHICKEN1);
-}
-
-static void ivybridge_update_fdi_bc_bifurcation(struct intel_crtc *intel_crtc)
-{
-        struct drm_device *dev = intel_crtc->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        switch (intel_crtc->pipe) {
-        case PIPE_A:
-                break;
-        case PIPE_B:
-                if (intel_crtc->config.fdi_lanes > 2)
-                        WARN_ON(I915_READ(SOUTH_CHICKEN1) & FDI_BC_BIFURCATION_SELECT);
-                else
-                        cpt_enable_fdi_bc_bifurcation(dev);
-
-                break;
-        case PIPE_C:
-                cpt_enable_fdi_bc_bifurcation(dev);
-
-                break;
-        default:
-                BUG();
-        }
-}
-
 int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)
 {
         /*
@@ -5811,9 +5831,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
                                              &intel_crtc->config.fdi_m_n);
         }
 
-        if (IS_IVYBRIDGE(dev))
-                ivybridge_update_fdi_bc_bifurcation(intel_crtc);
-
         ironlake_set_pipeconf(crtc);
 
         /* Set up the display plane register */
@@ -5881,6 +5898,23 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
         if (!(tmp & PIPECONF_ENABLE))
                 return false;
 
+        switch (tmp & PIPECONF_BPC_MASK) {
+        case PIPECONF_6BPC:
+                pipe_config->pipe_bpp = 18;
+                break;
+        case PIPECONF_8BPC:
+                pipe_config->pipe_bpp = 24;
+                break;
+        case PIPECONF_10BPC:
+                pipe_config->pipe_bpp = 30;
+                break;
+        case PIPECONF_12BPC:
+                pipe_config->pipe_bpp = 36;
+                break;
+        default:
+                break;
+        }
+
         if (I915_READ(PCH_TRANSCONF(crtc->pipe)) & TRANS_ENABLE) {
                 struct intel_shared_dpll *pll;
 
@@ -8612,6 +8646,9 @@ intel_pipe_config_compare(struct drm_device *dev,
         PIPE_CONF_CHECK_X(dpll_hw_state.fp0);
         PIPE_CONF_CHECK_X(dpll_hw_state.fp1);
 
+        if (IS_G4X(dev) || INTEL_INFO(dev)->gen >= 5)
+                PIPE_CONF_CHECK_I(pipe_bpp);
+
 #undef PIPE_CONF_CHECK_X
 #undef PIPE_CONF_CHECK_I
 #undef PIPE_CONF_CHECK_FLAGS
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2c555f91bfae..1a431377d83b 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1401,6 +1401,26 @@ static void intel_dp_get_config(struct intel_encoder *encoder,
                 else
                         pipe_config->port_clock = 270000;
         }
+
+        if (is_edp(intel_dp) && dev_priv->vbt.edp_bpp &&
+            pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {
+                /*
+                 * This is a big fat ugly hack.
+                 *
+                 * Some machines in UEFI boot mode provide us a VBT that has 18
+                 * bpp and 1.62 GHz link bandwidth for eDP, which for reasons
+                 * unknown we fail to light up. Yet the same BIOS boots up with
+                 * 24 bpp and 2.7 GHz link. Use the same bpp as the BIOS uses as
+                 * max, not what it tells us to use.
+                 *
+                 * Note: This will still be broken if the eDP panel is not lit
+                 * up by the BIOS, and thus we can't get the mode at module
+                 * load.
+                 */
+                DRM_DEBUG_KMS("pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n",
+                              pipe_config->pipe_bpp, dev_priv->vbt.edp_bpp);
+                dev_priv->vbt.edp_bpp = pipe_config->pipe_bpp;
+        }
 }
 
 static bool is_edp_psr(struct intel_dp *intel_dp)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 9b7b68fd5d47..7f2b384ac939 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -765,6 +765,8 @@ extern void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder);
 extern bool
 intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
 extern void intel_ddi_fdi_disable(struct drm_crtc *crtc);
+extern void intel_ddi_get_config(struct intel_encoder *encoder,
+                                 struct intel_crtc_config *pipe_config);
 
 extern void intel_display_handle_reset(struct drm_device *dev);
 extern bool intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 831a5c021c4b..b8af94a5be39 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -700,6 +700,22 @@ static const struct dmi_system_id intel_no_lvds[] = {
         },
         {
                 .callback = intel_no_lvds_dmi_callback,
+                .ident = "Intel D410PT",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Intel"),
+                        DMI_MATCH(DMI_BOARD_NAME, "D410PT"),
+                },
+        },
+        {
+                .callback = intel_no_lvds_dmi_callback,
+                .ident = "Intel D425KT",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Intel"),
+                        DMI_EXACT_MATCH(DMI_BOARD_NAME, "D425KT"),
+                },
+        },
+        {
+                .callback = intel_no_lvds_dmi_callback,
                 .ident = "Intel D510MO",
                 .matches = {
                         DMI_MATCH(DMI_BOARD_VENDOR, "Intel"),
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index f4c5e95b2d6f..26c2ea3e985c 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4759,7 +4759,9 @@ static void cpt_init_clock_gating(struct drm_device *dev)
          * gating for the panel power sequencer or it will fail to
          * start up when no ports are active.
          */
-        I915_WRITE(SOUTH_DSPCLK_GATE_D, PCH_DPLSUNIT_CLOCK_GATE_DISABLE);
+        I915_WRITE(SOUTH_DSPCLK_GATE_D, PCH_DPLSUNIT_CLOCK_GATE_DISABLE |
+                   PCH_DPLUNIT_CLOCK_GATE_DISABLE |
+                   PCH_CPUNIT_CLOCK_GATE_DISABLE);
         I915_WRITE(SOUTH_CHICKEN2, I915_READ(SOUTH_CHICKEN2) |
                    DPLS_EDP_PPS_FIX_DIS);
         /* The below fixes the weird display corruption, a few pixels shifted
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index 32923d2f6002..5e891b226acf 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -707,24 +707,37 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
         switch (connector->connector_type) {
         case DRM_MODE_CONNECTOR_DVII:
         case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
-                if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||
-                    (drm_detect_hdmi_monitor(radeon_connector->edid) &&
-                     (radeon_connector->audio == RADEON_AUDIO_AUTO)))
-                        return ATOM_ENCODER_MODE_HDMI;
-                else if (radeon_connector->use_digital)
+                if (radeon_audio != 0) {
+                        if (radeon_connector->use_digital &&
+                            (radeon_connector->audio == RADEON_AUDIO_ENABLE))
+                                return ATOM_ENCODER_MODE_HDMI;
+                        else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
+                                 (radeon_connector->audio == RADEON_AUDIO_AUTO))
+                                return ATOM_ENCODER_MODE_HDMI;
+                        else if (radeon_connector->use_digital)
+                                return ATOM_ENCODER_MODE_DVI;
+                        else
+                                return ATOM_ENCODER_MODE_CRT;
+                } else if (radeon_connector->use_digital) {
                         return ATOM_ENCODER_MODE_DVI;
-                else
+                } else {
                         return ATOM_ENCODER_MODE_CRT;
+                }
                 break;
         case DRM_MODE_CONNECTOR_DVID:
         case DRM_MODE_CONNECTOR_HDMIA:
         default:
-                if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||
-                    (drm_detect_hdmi_monitor(radeon_connector->edid) &&
-                     (radeon_connector->audio == RADEON_AUDIO_AUTO)))
-                        return ATOM_ENCODER_MODE_HDMI;
-                else
+                if (radeon_audio != 0) {
+                        if (radeon_connector->audio == RADEON_AUDIO_ENABLE)
+                                return ATOM_ENCODER_MODE_HDMI;
+                        else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
+                                 (radeon_connector->audio == RADEON_AUDIO_AUTO))
+                                return ATOM_ENCODER_MODE_HDMI;
+                        else
+                                return ATOM_ENCODER_MODE_DVI;
+                } else {
                         return ATOM_ENCODER_MODE_DVI;
+                }
                 break;
         case DRM_MODE_CONNECTOR_LVDS:
                 return ATOM_ENCODER_MODE_LVDS;
@@ -732,14 +745,19 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
         case DRM_MODE_CONNECTOR_DisplayPort:
                 dig_connector = radeon_connector->con_priv;
                 if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
-                    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
+                    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) {
                         return ATOM_ENCODER_MODE_DP;
-                else if ((radeon_connector->audio == RADEON_AUDIO_ENABLE) ||
-                         (drm_detect_hdmi_monitor(radeon_connector->edid) &&
-                          (radeon_connector->audio == RADEON_AUDIO_AUTO)))
-                        return ATOM_ENCODER_MODE_HDMI;
-                else
+                } else if (radeon_audio != 0) {
+                        if (radeon_connector->audio == RADEON_AUDIO_ENABLE)
+                                return ATOM_ENCODER_MODE_HDMI;
+                        else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&
+                                 (radeon_connector->audio == RADEON_AUDIO_AUTO))
+                                return ATOM_ENCODER_MODE_HDMI;
+                        else
+                                return ATOM_ENCODER_MODE_DVI;
+                } else {
                         return ATOM_ENCODER_MODE_DVI;
+                }
                 break;
         case DRM_MODE_CONNECTOR_eDP:
                 return ATOM_ENCODER_MODE_DP;
@@ -1655,7 +1673,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)
                          * does the same thing and more.
                          */
                         if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730) &&
-                            (rdev->family != CHIP_RS880))
+                            (rdev->family != CHIP_RS780) && (rdev->family != CHIP_RS880))
                                 atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
                 }
                 if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) {
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index b874ccdf52f7..9cd2bc989ac7 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -1694,6 +1694,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
                                fw_name);
                         release_firmware(rdev->smc_fw);
                         rdev->smc_fw = NULL;
+                        err = 0;
                 } else if (rdev->smc_fw->size != smc_req_size) {
                         printk(KERN_ERR
                                "cik_smc: Bogus length %zu in firmware \"%s\"\n",
@@ -3182,6 +3183,7 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
         r = radeon_ib_get(rdev, ring->idx, &ib, NULL, 256);
         if (r) {
                 DRM_ERROR("radeon: failed to get ib (%d).\n", r);
+                radeon_scratch_free(rdev, scratch);
                 return r;
         }
         ib.ptr[0] = PACKET3(PACKET3_SET_UCONFIG_REG, 1);
@@ -3198,6 +3200,8 @@ int cik_ib_test(struct radeon_device *rdev, struct radeon_ring *ring)
         r = radeon_fence_wait(ib.fence, false);
         if (r) {
                 DRM_ERROR("radeon: fence wait failed (%d).\n", r);
+                radeon_scratch_free(rdev, scratch);
+                radeon_ib_free(rdev, &ib);
                 return r;
         }
         for (i = 0; i < rdev->usec_timeout; i++) {
diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c
index 85a69d2ea3d2..9fcd338c0fcf 100644
--- a/drivers/gpu/drm/radeon/dce6_afmt.c
+++ b/drivers/gpu/drm/radeon/dce6_afmt.c
@@ -113,6 +113,9 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder)
         u8 *sadb;
         int sad_count;
 
+        /* XXX: setting this register causes hangs on some asics */
+        return;
+
         if (!dig->afmt->pin)
                 return;
 
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
index f815c20640bd..57fcc4b16a52 100644
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
@@ -67,6 +67,9 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder)
         u8 *sadb;
         int sad_count;
 
+        /* XXX: setting this register causes hangs on some asics */
+        return;
+
         list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
                 if (connector->encoder == encoder)
                         radeon_connector = to_radeon_connector(connector);
@@ -288,6 +291,7 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
         /* fglrx clears sth in AFMT_AUDIO_PACKET_CONTROL2 here */
 
         WREG32(HDMI_ACR_PACKET_CONTROL + offset,
+               HDMI_ACR_SOURCE | /* select SW CTS value */
                HDMI_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */
 
         evergreen_hdmi_update_ACR(encoder, mode->clock);
diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
index 71399065db04..b41905573cd2 100644
--- a/drivers/gpu/drm/radeon/kv_dpm.c
+++ b/drivers/gpu/drm/radeon/kv_dpm.c
@@ -2635,7 +2635,7 @@ int kv_dpm_init(struct radeon_device *rdev)
         pi->caps_sclk_ds = true;
         pi->enable_auto_thermal_throttling = true;
         pi->disable_nb_ps3_in_battery = false;
-        pi->bapm_enable = true;
+        pi->bapm_enable = false;
         pi->voltage_drop_t = 0;
         pi->caps_sclk_throttle_low_notification = false;
         pi->caps_fps = false; /* true? */
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 93c1f9ef5da9..cac2866d79da 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -804,6 +804,7 @@ int ni_init_microcode(struct radeon_device *rdev)
                                fw_name);
                         release_firmware(rdev->smc_fw);
                         rdev->smc_fw = NULL;
+                        err = 0;
                 } else if (rdev->smc_fw->size != smc_req_size) {
                         printk(KERN_ERR
                                "ni_mc: Bogus length %zu in firmware \"%s\"\n",
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 2a1b1876b431..f9be22062df1 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2302,6 +2302,7 @@ int r600_init_microcode(struct radeon_device *rdev)
                                fw_name);
                         release_firmware(rdev->smc_fw);
                         rdev->smc_fw = NULL;
+                        err = 0;
                 } else if (rdev->smc_fw->size != smc_req_size) {
                         printk(KERN_ERR
                                "smc: Bogus length %zu in firmware \"%s\"\n",
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
index 5b729319f27b..06022e3b9c3b 100644
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
@@ -309,6 +309,9 @@ static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder)
         u8 *sadb;
         int sad_count;
 
+        /* XXX: setting this register causes hangs on some asics */
+        return;
+
         list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
                 if (connector->encoder == encoder)
                         radeon_connector = to_radeon_connector(connector);
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index a400ac1c4147..24f4960f59ee 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1272,8 +1272,8 @@ struct radeon_blacklist_clocks
 struct radeon_clock_and_voltage_limits {
         u32 sclk;
         u32 mclk;
-        u32 vddc;
-        u32 vddci;
+        u16 vddc;
+        u16 vddci;
 };
 
 struct radeon_clock_array {
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 79159b5da05b..64565732cb98 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1658,9 +1658,12 @@ radeon_add_atom_connector(struct drm_device *dev,
                         drm_object_attach_property(&radeon_connector->base.base,
                                                       rdev->mode_info.underscan_vborder_property,
                                                       0);
-                        drm_object_attach_property(&radeon_connector->base.base,
-                                                   rdev->mode_info.audio_property,
-                                                   RADEON_AUDIO_DISABLE);
+                        if (radeon_audio != 0)
+                                drm_object_attach_property(&radeon_connector->base.base,
+                                                           rdev->mode_info.audio_property,
+                                                           (radeon_audio == 1) ?
+                                                           RADEON_AUDIO_AUTO :
+                                                           RADEON_AUDIO_DISABLE);
                         subpixel_order = SubPixelHorizontalRGB;
                         connector->interlace_allowed = true;
                         if (connector_type == DRM_MODE_CONNECTOR_HDMIB)
@@ -1754,10 +1757,12 @@ radeon_add_atom_connector(struct drm_device *dev,
                                                               rdev->mode_info.underscan_vborder_property,
                                                               0);
                         }
-                        if (ASIC_IS_DCE2(rdev)) {
+                        if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
                                 drm_object_attach_property(&radeon_connector->base.base,
-                                                              rdev->mode_info.audio_property,
-                                                              RADEON_AUDIO_DISABLE);
+                                                           rdev->mode_info.audio_property,
+                                                           (radeon_audio == 1) ?
+                                                           RADEON_AUDIO_AUTO :
+                                                           RADEON_AUDIO_DISABLE);
                         }
                         if (connector_type == DRM_MODE_CONNECTOR_DVII) {
                                 radeon_connector->dac_load_detect = true;
@@ -1799,10 +1804,12 @@ radeon_add_atom_connector(struct drm_device *dev,
                                                               rdev->mode_info.underscan_vborder_property,
                                                               0);
                         }
-                        if (ASIC_IS_DCE2(rdev)) {
+                        if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
                                 drm_object_attach_property(&radeon_connector->base.base,
-                                                              rdev->mode_info.audio_property,
-                                                              RADEON_AUDIO_DISABLE);
+                                                           rdev->mode_info.audio_property,
+                                                           (radeon_audio == 1) ?
+                                                           RADEON_AUDIO_AUTO :
+                                                           RADEON_AUDIO_DISABLE);
                         }
                         subpixel_order = SubPixelHorizontalRGB;
                         connector->interlace_allowed = true;
@@ -1843,10 +1850,12 @@ radeon_add_atom_connector(struct drm_device *dev,
                                                               rdev->mode_info.underscan_vborder_property,
                                                               0);
                         }
-                        if (ASIC_IS_DCE2(rdev)) {
+                        if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
                                 drm_object_attach_property(&radeon_connector->base.base,
-                                                              rdev->mode_info.audio_property,
-                                                              RADEON_AUDIO_DISABLE);
+                                                           rdev->mode_info.audio_property,
+                                                           (radeon_audio == 1) ?
+                                                           RADEON_AUDIO_AUTO :
+                                                           RADEON_AUDIO_DISABLE);
                         }
                         connector->interlace_allowed = true;
                         /* in theory with a DP to VGA converter... */
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 66c222836631..80285e35bc65 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -85,9 +85,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                    VRAM, also but everything into VRAM on AGP cards to avoid
                    image corruptions */
                 if (p->ring == R600_RING_TYPE_UVD_INDEX &&
-                    p->rdev->family < CHIP_PALM &&
                     (i == 0 || drm_pci_device_is_agp(p->rdev->ddev))) {
-
+                        /* TODO: is this still needed for NI+ ? */
                         p->relocs[i].lobj.domain =
                                 RADEON_GEM_DOMAIN_VRAM;
 
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index cdd12dcd988b..9c14a1ba1de4 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -153,7 +153,7 @@ int radeon_benchmarking = 0;
 int radeon_testing = 0;
 int radeon_connector_table = 0;
 int radeon_tv = 1;
-int radeon_audio = 1;
+int radeon_audio = -1;
 int radeon_disp_priority = 0;
 int radeon_hw_i2c = 0;
 int radeon_pcie_gen2 = -1;
@@ -196,7 +196,7 @@ module_param_named(connector_table, radeon_connector_table, int, 0444);
 MODULE_PARM_DESC(tv, "TV enable (0 = disable)");
 module_param_named(tv, radeon_tv, int, 0444);
 
-MODULE_PARM_DESC(audio, "Audio enable (1 = enable)");
+MODULE_PARM_DESC(audio, "Audio enable (-1 = auto, 0 = disable, 1 = enable)");
 module_param_named(audio, radeon_audio, int, 0444);
 
 MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 = high)");
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index 4f2e73f79638..308eff5be1b4 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -476,7 +476,8 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p,
                 return -EINVAL;
         }
 
-        if (p->rdev->family < CHIP_PALM && (cmd == 0 || cmd == 0x3) &&
+        /* TODO: is this still necessary on NI+ ? */
+        if ((cmd == 0 || cmd == 0x3) &&
             (start >> 28) != (p->rdev->uvd.gpu_addr >> 28)) {
                 DRM_ERROR("msg/fb buffer %LX-%LX out of 256MB segment!\n",
                           start, end);
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index d4652af425b8..d96f7cbca0a1 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -1681,6 +1681,7 @@ static int si_init_microcode(struct radeon_device *rdev)
                        fw_name);
                 release_firmware(rdev->smc_fw);
                 rdev->smc_fw = NULL;
+                err = 0;
         } else if (rdev->smc_fw->size != smc_req_size) {
                 printk(KERN_ERR
                        "si_smc: Bogus length %zu in firmware \"%s\"\n",
diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c
index 3100fa9cb52f..7266805d9786 100644
--- a/drivers/gpu/drm/radeon/uvd_v1_0.c
+++ b/drivers/gpu/drm/radeon/uvd_v1_0.c
@@ -212,8 +212,8 @@ int uvd_v1_0_start(struct radeon_device *rdev)
         /* enable VCPU clock */
         WREG32(UVD_VCPU_CNTL,  1 << 9);
 
-        /* enable UMC and NC0 */
-        WREG32_P(UVD_LMI_CTRL2, 1 << 13, ~((1 << 8) | (1 << 13)));
+        /* enable UMC */
+        WREG32_P(UVD_LMI_CTRL2, 0, ~(1 << 8));
 
         /* boot up the VCPU */
         WREG32(UVD_SOFT_RESET, 0);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 1a90f0a2f7e5..0508f93b9795 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -740,9 +740,17 @@ static void vmw_postclose(struct drm_device *dev,
         struct vmw_fpriv *vmw_fp;
 
         vmw_fp = vmw_fpriv(file_priv);
-        ttm_object_file_release(&vmw_fp->tfile);
-        if (vmw_fp->locked_master)
+
+        if (vmw_fp->locked_master) {
+                struct vmw_master *vmaster =
+                        vmw_master(vmw_fp->locked_master);
+
+                ttm_lock_set_kill(&vmaster->lock, true, SIGTERM);
+                ttm_vt_unlock(&vmaster->lock);
                 drm_master_put(&vmw_fp->locked_master);
+        }
+
+        ttm_object_file_release(&vmw_fp->tfile);
         kfree(vmw_fp);
 }
 
@@ -925,14 +933,13 @@ static void vmw_master_drop(struct drm_device *dev,
 
         vmw_fp->locked_master = drm_master_get(file_priv->master);
         ret = ttm_vt_lock(&vmaster->lock, false, vmw_fp->tfile);
-        vmw_execbuf_release_pinned_bo(dev_priv);
-
         if (unlikely((ret != 0))) {
                 DRM_ERROR("Unable to lock TTM at VT switch.\n");
                 drm_master_put(&vmw_fp->locked_master);
         }
 
-        ttm_lock_set_kill(&vmaster->lock, true, SIGTERM);
+        ttm_lock_set_kill(&vmaster->lock, false, SIGTERM);
+        vmw_execbuf_release_pinned_bo(dev_priv);
 
         if (!dev_priv->enable_fb) {
                 ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index 0e67cf41065d..37fb4befec82 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -970,7 +970,7 @@ void vmw_resource_unreserve(struct vmw_resource *res,
         if (new_backup)
                 res->backup_offset = new_backup_offset;
 
-        if (!res->func->may_evict)
+        if (!res->func->may_evict || res->id == -1)
                 return;
 
         write_lock(&dev_priv->resource_lock);
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5a8c01112a23..e80da62363bc 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -319,7 +319,7 @@ static s32 item_sdata(struct hid_item *item)
 
 static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
 {
-        __u32 raw_value;
+        __s32 raw_value;
         switch (item->tag) {
         case HID_GLOBAL_ITEM_TAG_PUSH:
 
@@ -370,10 +370,11 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
                 return 0;
 
         case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT:
-                /* Units exponent negative numbers are given through a
-                 * two's complement.
-                 * See "6.2.2.7 Global Items" for more information. */
-                raw_value = item_udata(item);
+                /* Many devices provide unit exponent as a two's complement
+                 * nibble due to the common misunderstanding of HID
+                 * specification 1.11, 6.2.2.7 Global Items. Attempt to handle
+                 * both this and the standard encoding. */
+                raw_value = item_sdata(item);
                 if (!(raw_value & 0xfffffff0))
                         parser->global.unit_exponent = hid_snto32(raw_value, 4);
                 else
@@ -1870,6 +1871,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO2, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
         { }
 };
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 9cbc7ab07dfa..f0296a50be5f 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -633,6 +633,7 @@
 #define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN    0x0003
 
 #define USB_VENDOR_ID_NINTENDO          0x057e
+#define USB_VENDOR_ID_NINTENDO2         0x054c
 #define USB_DEVICE_ID_NINTENDO_WIIMOTE  0x0306
 #define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330
 
@@ -792,6 +793,8 @@
 #define USB_DEVICE_ID_SYNAPTICS_COMP_TP 0x0009
 #define USB_DEVICE_ID_SYNAPTICS_WTP     0x0010
 #define USB_DEVICE_ID_SYNAPTICS_DPAD    0x0013
+#define USB_DEVICE_ID_SYNAPTICS_LTS1    0x0af8
+#define USB_DEVICE_ID_SYNAPTICS_LTS2    0x1d10
 
 #define USB_VENDOR_ID_THINGM            0x27b8
 #define USB_DEVICE_ID_BLINK1            0x01ed
@@ -919,4 +922,7 @@
 #define USB_VENDOR_ID_PRIMAX    0x0461
 #define USB_DEVICE_ID_PRIMAX_KEYBOARD   0x4e05
 
+#define USB_VENDOR_ID_SIS       0x0457
+#define USB_DEVICE_ID_SIS_TS    0x1013
+
 #endif
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 8741d953dcc8..d97f2323af57 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -192,6 +192,7 @@ static int hidinput_setkeycode(struct input_dev *dev,
         return -EINVAL;
 }
 
+
 /**
  * hidinput_calc_abs_res - calculate an absolute axis resolution
  * @field: the HID report field to calculate resolution for
@@ -234,23 +235,17 @@ __s32 hidinput_calc_abs_res(const struct hid_field *field, __u16 code)
         case ABS_MT_TOOL_Y:
         case ABS_MT_TOUCH_MAJOR:
         case ABS_MT_TOUCH_MINOR:
-                if (field->unit & 0xffffff00)           /* Not a length */
-                        return 0;
-                unit_exponent += hid_snto32(field->unit >> 4, 4) - 1;
-                switch (field->unit & 0xf) {
-                case 0x1:                               /* If centimeters */
+                if (field->unit == 0x11) {              /* If centimeters */
                         /* Convert to millimeters */
                         unit_exponent += 1;
-                        break;
-                case 0x3:                               /* If inches */
+                } else if (field->unit == 0x13) {       /* If inches */
                         /* Convert to millimeters */
                         prev = physical_extents;
                         physical_extents *= 254;
                         if (physical_extents < prev)
                                 return 0;
                         unit_exponent -= 1;
-                        break;
-                default:
+                } else {
                         return 0;
                 }
                 break;
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c
index abb20db2b443..1446f526ee8b 100644
--- a/drivers/hid/hid-wiimote-core.c
+++ b/drivers/hid/hid-wiimote-core.c
@@ -834,7 +834,8 @@ static void wiimote_init_set_type(struct wiimote_data *wdata,
                 goto done;
         }
 
-        if (vendor == USB_VENDOR_ID_NINTENDO) {
+        if (vendor == USB_VENDOR_ID_NINTENDO ||
+            vendor == USB_VENDOR_ID_NINTENDO2) {
                 if (product == USB_DEVICE_ID_NINTENDO_WIIMOTE) {
                         devtype = WIIMOTE_DEV_GEN10;
                         goto done;
@@ -1855,6 +1856,8 @@ static void wiimote_hid_remove(struct hid_device *hdev)
 static const struct hid_device_id wiimote_hid_devices[] = {
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,
                                 USB_DEVICE_ID_NINTENDO_WIIMOTE) },
+        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO2,
+                                USB_DEVICE_ID_NINTENDO_WIIMOTE) },
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,
                                 USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
         { }
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 07345521f421..3fca3be08337 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -110,6 +110,9 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_DUOSENSE, HID_QUIRK_NO_INIT_REPORTS },
+        { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS1, HID_QUIRK_NO_INIT_REPORTS },
+        { USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_LTS2, HID_QUIRK_NO_INIT_REPORTS },
+        { USB_VENDOR_ID_SIS, USB_DEVICE_ID_SIS_TS, HID_QUIRK_NO_INIT_REPORTS },
 
         { 0, 0 }
 };
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/Kconfig b/drivers/infiniband/Kconfig
index 5ceda710f516..b84791f03a27 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -31,6 +31,17 @@ config INFINIBAND_USER_ACCESS
           libibverbs, libibcm and a hardware driver library from
           <http://www.openfabrics.org/git/>.
 
+config INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
+       bool "Experimental and unstable ABI for userspace access to flow steering verbs"
+       depends on INFINIBAND_USER_ACCESS
+       depends on STAGING
+        ---help---
+          The final ABI for userspace access to flow steering verbs
+          has not been defined.  To use the current ABI, *WHICH WILL
+          CHANGE IN THE FUTURE*, say Y here.
+
+          If unsure, say N.
+
 config INFINIBAND_USER_MEM
         bool
         depends on INFINIBAND_USER_ACCESS != n
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index d040b877475f..d8f9c6c272d7 100644
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -217,7 +217,9 @@ IB_UVERBS_DECLARE_CMD(destroy_srq);
 IB_UVERBS_DECLARE_CMD(create_xsrq);
 IB_UVERBS_DECLARE_CMD(open_xrcd);
 IB_UVERBS_DECLARE_CMD(close_xrcd);
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 IB_UVERBS_DECLARE_CMD(create_flow);
 IB_UVERBS_DECLARE_CMD(destroy_flow);
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 
 #endif /* UVERBS_H */
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index f2b81b9ee0d6..2f0f01b70e3b 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -54,7 +54,9 @@ static struct uverbs_lock_class qp_lock_class	= { .name = "QP-uobj" };
 static struct uverbs_lock_class ah_lock_class   = { .name = "AH-uobj" };
 static struct uverbs_lock_class srq_lock_class  = { .name = "SRQ-uobj" };
 static struct uverbs_lock_class xrcd_lock_class = { .name = "XRCD-uobj" };
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 static struct uverbs_lock_class rule_lock_class = { .name = "RULE-uobj" };
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 
 #define INIT_UDATA(udata, ibuf, obuf, ilen, olen)                       \
         do {                                                            \
@@ -2599,6 +2601,7 @@ out_put:
         return ret ? ret : in_len;
 }
 
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec,
                                 union ib_flow_spec *ib_spec)
 {
@@ -2824,6 +2827,7 @@ ssize_t ib_uverbs_destroy_flow(struct ib_uverbs_file *file,
 
         return ret ? ret : in_len;
 }
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 
 static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
                                 struct ib_uverbs_create_xsrq *cmd,
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 75ad86c4abf8..2df31f68ea09 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -115,8 +115,10 @@ static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file,
         [IB_USER_VERBS_CMD_CLOSE_XRCD]          = ib_uverbs_close_xrcd,
         [IB_USER_VERBS_CMD_CREATE_XSRQ]         = ib_uverbs_create_xsrq,
         [IB_USER_VERBS_CMD_OPEN_QP]             = ib_uverbs_open_qp,
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
         [IB_USER_VERBS_CMD_CREATE_FLOW]         = ib_uverbs_create_flow,
         [IB_USER_VERBS_CMD_DESTROY_FLOW]        = ib_uverbs_destroy_flow
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 };
 
 static void ib_uverbs_add_one(struct ib_device *device);
@@ -605,6 +607,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
         if (!(file->device->ib_dev->uverbs_cmd_mask & (1ull << hdr.command)))
                 return -ENOSYS;
 
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
         if (hdr.command >= IB_USER_VERBS_CMD_THRESHOLD) {
                 struct ib_uverbs_cmd_hdr_ex hdr_ex;
 
@@ -621,6 +624,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
                                                      (hdr_ex.out_words +
                                                       hdr_ex.provider_out_words) * 4);
         } else {
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
                 if (hdr.in_words * 4 != count)
                         return -EINVAL;
 
@@ -628,7 +632,9 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
                                                      buf + sizeof(hdr),
                                                      hdr.in_words * 4,
                                                      hdr.out_words * 4);
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
         }
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 }
 
 static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma)
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/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index d6c5a73becf4..f0612645de99 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1691,9 +1691,11 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
                 ibdev->ib_dev.create_flow       = mlx4_ib_create_flow;
                 ibdev->ib_dev.destroy_flow      = mlx4_ib_destroy_flow;
 
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
                 ibdev->ib_dev.uverbs_cmd_mask   |=
                         (1ull << IB_USER_VERBS_CMD_CREATE_FLOW) |
                         (1ull << IB_USER_VERBS_CMD_DESTROY_FLOW);
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
         }
 
         mlx4_ib_alloc_eqs(dev, ibdev);
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/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 3591855cc5b5..6df23502059a 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -594,7 +594,7 @@ isert_connect_release(struct isert_conn *isert_conn)
 
         pr_debug("Entering isert_connect_release(): >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
 
-        if (device->use_frwr)
+        if (device && device->use_frwr)
                 isert_conn_free_frwr_pool(isert_conn);
 
         if (isert_conn->conn_qp) {
diff --git a/drivers/input/input.c b/drivers/input/input.c
index c04469928925..e75d015024a1 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1734,6 +1734,7 @@ EXPORT_SYMBOL_GPL(input_class);
  */
 struct input_dev *input_allocate_device(void)
 {
+        static atomic_t input_no = ATOMIC_INIT(0);
         struct input_dev *dev;
 
         dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
@@ -1743,9 +1744,13 @@ struct input_dev *input_allocate_device(void)
                 device_initialize(&dev->dev);
                 mutex_init(&dev->mutex);
                 spin_lock_init(&dev->event_lock);
+                init_timer(&dev->timer);
                 INIT_LIST_HEAD(&dev->h_list);
                 INIT_LIST_HEAD(&dev->node);
 
+                dev_set_name(&dev->dev, "input%ld",
+                             (unsigned long) atomic_inc_return(&input_no) - 1);
+
                 __module_get(THIS_MODULE);
         }
 
@@ -2019,7 +2024,6 @@ static void devm_input_device_unregister(struct device *dev, void *res)
  */
 int input_register_device(struct input_dev *dev)
 {
-        static atomic_t input_no = ATOMIC_INIT(0);
         struct input_devres *devres = NULL;
         struct input_handler *handler;
         unsigned int packet_size;
@@ -2059,7 +2063,6 @@ int input_register_device(struct input_dev *dev)
          * If delay and period are pre-set by the driver, then autorepeating
          * is handled by the driver itself and we don't do it in input.c.
          */
-        init_timer(&dev->timer);
         if (!dev->rep[REP_DELAY] && !dev->rep[REP_PERIOD]) {
                 dev->timer.data = (long) dev;
                 dev->timer.function = input_repeat_key;
@@ -2073,9 +2076,6 @@ int input_register_device(struct input_dev *dev)
         if (!dev->setkeycode)
                 dev->setkeycode = input_default_setkeycode;
 
-        dev_set_name(&dev->dev, "input%ld",
-                     (unsigned long) atomic_inc_return(&input_no) - 1);
-
         error = device_add(&dev->dev);
         if (error)
                 goto err_free_vals;
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 134c3b404a54..a2e758d27584 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -786,10 +786,17 @@ static int pxa27x_keypad_probe(struct platform_device *pdev)
         input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         input_set_capability(input_dev, EV_MSC, MSC_SCAN);
 
-        if (pdata)
+        if (pdata) {
                 error = pxa27x_keypad_build_keycode(keypad);
-        else
+        } else {
                 error = pxa27x_keypad_build_keycode_from_dt(keypad);
+                /*
+                 * Data that we get from DT resides in dynamically
+                 * allocated memory so we need to update our pdata
+                 * pointer.
+                 */
+                pdata = keypad->pdata;
+        }
         if (error) {
                 dev_err(&pdev->dev, "failed to build keycode\n");
                 goto failed_put_clk;
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index 082684e7f390..9365535ba7f1 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -351,7 +351,9 @@ static void cm109_urb_irq_callback(struct urb *urb)
         if (status) {
                 if (status == -ESHUTDOWN)
                         return;
-                dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status);
+                dev_err_ratelimited(&dev->intf->dev, "%s: urb status %d\n",
+                                    __func__, status);
+                goto out;
         }
 
         /* Special keys */
@@ -418,8 +420,12 @@ static void cm109_urb_ctl_callback(struct urb *urb)
              dev->ctl_data->byte[2],
              dev->ctl_data->byte[3]);
 
-        if (status)
-                dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status);
+        if (status) {
+                if (status == -ESHUTDOWN)
+                        return;
+                dev_err_ratelimited(&dev->intf->dev, "%s: urb status %d\n",
+                                    __func__, status);
+        }
 
         spin_lock(&dev->ctl_submit_lock);
 
@@ -427,7 +433,7 @@ static void cm109_urb_ctl_callback(struct urb *urb)
 
         if (likely(!dev->shutdown)) {
 
-                if (dev->buzzer_pending) {
+                if (dev->buzzer_pending || status) {
                         dev->buzzer_pending = 0;
                         dev->ctl_urb_pending = 1;
                         cm109_submit_buzz_toggle(dev);
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 7c5d72a6a26a..83658472ad25 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -103,6 +103,7 @@ static const struct alps_model_info alps_model_data[] = {
         /* Dell Latitude E5500, E6400, E6500, Precision M4400 */
         { { 0x62, 0x02, 0x14 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf,
                 ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },
+        { { 0x73, 0x00, 0x14 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_DUALPOINT },              /* Dell XT2 */
         { { 0x73, 0x02, 0x50 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_FOUR_BUTTONS },           /* Dell Vostro 1400 */
         { { 0x52, 0x01, 0x14 }, 0x00, ALPS_PROTO_V2, 0xff, 0xff,
                 ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },                            /* Toshiba Tecra A11-11L */
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 78e4de42efaa..52c9ebf94729 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -223,21 +223,26 @@ static int i8042_flush(void)
 {
         unsigned long flags;
         unsigned char data, str;
-        int i = 0;
+        int count = 0;
+        int retval = 0;
 
         spin_lock_irqsave(&i8042_lock, flags);
 
-        while (((str = i8042_read_status()) & I8042_STR_OBF) && (i < I8042_BUFFER_SIZE)) {
-                udelay(50);
-                data = i8042_read_data();
-                i++;
-                dbg("%02x <- i8042 (flush, %s)\n",
-                    data, str & I8042_STR_AUXDATA ? "aux" : "kbd");
+        while ((str = i8042_read_status()) & I8042_STR_OBF) {
+                if (count++ < I8042_BUFFER_SIZE) {
+                        udelay(50);
+                        data = i8042_read_data();
+                        dbg("%02x <- i8042 (flush, %s)\n",
+                            data, str & I8042_STR_AUXDATA ? "aux" : "kbd");
+                } else {
+                        retval = -EIO;
+                        break;
+                }
         }
 
         spin_unlock_irqrestore(&i8042_lock, flags);
 
-        return i;
+        return retval;
 }
 
 /*
@@ -849,7 +854,7 @@ static int __init i8042_check_aux(void)
 
 static int i8042_controller_check(void)
 {
-        if (i8042_flush() == I8042_BUFFER_SIZE) {
+        if (i8042_flush()) {
                 pr_err("No controller found\n");
                 return -ENODEV;
         }
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 79b69ea47f74..e53416a4d7f3 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -1031,6 +1031,7 @@ static void wacom_destroy_leds(struct wacom *wacom)
 }
 
 static enum power_supply_property wacom_battery_props[] = {
+        POWER_SUPPLY_PROP_SCOPE,
         POWER_SUPPLY_PROP_CAPACITY
 };
 
@@ -1042,6 +1043,9 @@ static int wacom_battery_get_property(struct power_supply *psy,
         int ret = 0;
 
         switch (psp) {
+                case POWER_SUPPLY_PROP_SCOPE:
+                        val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+                        break;
                 case POWER_SUPPLY_PROP_CAPACITY:
                         val->intval =
                                 wacom->wacom_wac.battery_capacity * 100 / 31;
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index b2aa503c16b1..c59b797eeafa 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -2054,6 +2054,12 @@ static const struct wacom_features wacom_features_0x101 =
 static const struct wacom_features wacom_features_0x10D =
         { "Wacom ISDv4 10D",      WACOM_PKGLEN_MTTPC,     26202, 16325,  255,
           0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0x10E =
+        { "Wacom ISDv4 10E",      WACOM_PKGLEN_MTTPC,     27760, 15694,  255,
+          0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0x10F =
+        { "Wacom ISDv4 10F",      WACOM_PKGLEN_MTTPC,     27760, 15694,  255,
+          0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x4001 =
         { "Wacom ISDv4 4001",      WACOM_PKGLEN_MTTPC,     26202, 16325,  255,
           0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2248,6 +2254,8 @@ const struct usb_device_id wacom_ids[] = {
         { USB_DEVICE_WACOM(0x100) },
         { USB_DEVICE_WACOM(0x101) },
         { USB_DEVICE_WACOM(0x10D) },
+        { USB_DEVICE_WACOM(0x10E) },
+        { USB_DEVICE_WACOM(0x10F) },
         { USB_DEVICE_WACOM(0x300) },
         { USB_DEVICE_WACOM(0x301) },
         { USB_DEVICE_WACOM(0x304) },
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index b6a74bcbb08f..2a7f0dd6abab 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -1000,7 +1000,7 @@ static void request_write(struct cached_dev *dc, struct search *s)
 
                 if (bio->bi_rw & REQ_FLUSH) {
                         /* Also need to send a flush to the backing device */
-                        struct bio *flush = bio_alloc_bioset(0, GFP_NOIO,
+                        struct bio *flush = bio_alloc_bioset(GFP_NOIO, 0,
                                                              dc->disk.bio_split);
 
                         flush->bi_rw    = WRITE_FLUSH;
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/md/md.c b/drivers/md/md.c
index adf4d7e1d5e1..561a65f82e26 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -8111,6 +8111,7 @@ static int md_set_badblocks(struct badblocks *bb, sector_t s, int sectors,
         u64 *p;
         int lo, hi;
         int rv = 1;
+        unsigned long flags;
 
         if (bb->shift < 0)
                 /* badblocks are disabled */
@@ -8125,7 +8126,7 @@ static int md_set_badblocks(struct badblocks *bb, sector_t s, int sectors,
                 sectors = next - s;
         }
 
-        write_seqlock_irq(&bb->lock);
+        write_seqlock_irqsave(&bb->lock, flags);
 
         p = bb->page;
         lo = 0;
@@ -8241,7 +8242,7 @@ static int md_set_badblocks(struct badblocks *bb, sector_t s, int sectors,
         bb->changed = 1;
         if (!acknowledged)
                 bb->unacked_exist = 1;
-        write_sequnlock_irq(&bb->lock);
+        write_sequnlock_irqrestore(&bb->lock, flags);
 
         return rv;
 }
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index d60412c7f995..aacf6bf352d8 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1479,6 +1479,7 @@ static int raid1_spare_active(struct mddev *mddev)
                         }
                 }
                 if (rdev
+                    && rdev->recovery_offset == MaxSector
                     && !test_bit(Faulty, &rdev->flags)
                     && !test_and_set_bit(In_sync, &rdev->flags)) {
                         count++;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index df7b0a06b0ea..73dc8a377522 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1782,6 +1782,7 @@ static int raid10_spare_active(struct mddev *mddev)
                         }
                         sysfs_notify_dirent_safe(tmp->replacement->sysfs_state);
                 } else if (tmp->rdev
+                           && tmp->rdev->recovery_offset == MaxSector
                            && !test_bit(Faulty, &tmp->rdev->flags)
                            && !test_and_set_bit(In_sync, &tmp->rdev->flags)) {
                         count++;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 7ff4f252ca1a..f8b906843926 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -778,6 +778,12 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
                         bi->bi_io_vec[0].bv_len = STRIPE_SIZE;
                         bi->bi_io_vec[0].bv_offset = 0;
                         bi->bi_size = STRIPE_SIZE;
+                        /*
+                         * If this is discard request, set bi_vcnt 0. We don't
+                         * want to confuse SCSI because SCSI will replace payload
+                         */
+                        if (rw & REQ_DISCARD)
+                                bi->bi_vcnt = 0;
                         if (rrdev)
                                 set_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags);
 
@@ -816,6 +822,12 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
                         rbi->bi_io_vec[0].bv_len = STRIPE_SIZE;
                         rbi->bi_io_vec[0].bv_offset = 0;
                         rbi->bi_size = STRIPE_SIZE;
+                        /*
+                         * If this is discard request, set bi_vcnt 0. We don't
+                         * want to confuse SCSI because SCSI will replace payload
+                         */
+                        if (rw & REQ_DISCARD)
+                                rbi->bi_vcnt = 0;
                         if (conf->mddev->gendisk)
                                 trace_block_bio_remap(bdev_get_queue(rbi->bi_bdev),
                                                       rbi, disk_devt(conf->mddev->gendisk),
@@ -2910,6 +2922,14 @@ static void handle_stripe_clean_event(struct r5conf *conf,
                 }
                 /* now that discard is done we can proceed with any sync */
                 clear_bit(STRIPE_DISCARD, &sh->state);
+                /*
+                 * SCSI discard will change some bio fields and the stripe has
+                 * no updated data, so remove it from hash list and the stripe
+                 * will be reinitialized
+                 */
+                spin_lock_irq(&conf->device_lock);
+                remove_hash(sh);
+                spin_unlock_irq(&conf->device_lock);
                 if (test_bit(STRIPE_SYNC_REQUESTED, &sh->state))
                         set_bit(STRIPE_HANDLE, &sh->state);
 
diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index 2521f7e23018..e79749cfec81 100644
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -912,14 +912,8 @@ static int tda10071_init(struct dvb_frontend *fe)
                 { 0xd5, 0x03, 0x03 },
         };
 
-        /* firmware status */
-        ret = tda10071_rd_reg(priv, 0x51, &tmp);
-        if (ret)
-                goto error;
-
-        if (!tmp) {
+        if (priv->warm) {
                 /* warm state - wake up device from sleep */
-                priv->warm = 1;
 
                 for (i = 0; i < ARRAY_SIZE(tab); i++) {
                         ret = tda10071_wr_reg_mask(priv, tab[i].reg,
@@ -937,7 +931,6 @@ static int tda10071_init(struct dvb_frontend *fe)
                         goto error;
         } else {
                 /* cold state - try to download firmware */
-                priv->warm = 0;
 
                 /* request the firmware, this will block and timeout */
                 ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent);
diff --git a/drivers/media/i2c/ad9389b.c b/drivers/media/i2c/ad9389b.c
index bb0c99d7a4f1..b06a7e54ee0d 100644
--- a/drivers/media/i2c/ad9389b.c
+++ b/drivers/media/i2c/ad9389b.c
@@ -628,16 +628,13 @@ static int ad9389b_s_stream(struct v4l2_subdev *sd, int enable)
 
 static const struct v4l2_dv_timings_cap ad9389b_timings_cap = {
         .type = V4L2_DV_BT_656_1120,
-        .bt = {
-                .max_width = 1920,
-                .max_height = 1200,
-                .min_pixelclock = 25000000,
-                .max_pixelclock = 170000000,
-                .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
+        /* keep this initialization for compatibility with GCC < 4.4.6 */
+        .reserved = { 0 },
+        V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,
+                V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
                         V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
-                .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |
-                        V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM,
-        },
+                V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
+                V4L2_DV_BT_CAP_CUSTOM)
 };
 
 static int ad9389b_s_dv_timings(struct v4l2_subdev *sd,
diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c
index 7a576097471f..7c8d971f1f61 100644
--- a/drivers/media/i2c/adv7511.c
+++ b/drivers/media/i2c/adv7511.c
@@ -119,16 +119,14 @@ static int adv7511_s_clock_freq(struct v4l2_subdev *sd, u32 freq);
 
 static const struct v4l2_dv_timings_cap adv7511_timings_cap = {
         .type = V4L2_DV_BT_656_1120,
-        .bt = {
-                .max_width = ADV7511_MAX_WIDTH,
-                .max_height = ADV7511_MAX_HEIGHT,
-                .min_pixelclock = ADV7511_MIN_PIXELCLOCK,
-                .max_pixelclock = ADV7511_MAX_PIXELCLOCK,
-                .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
+        /* keep this initialization for compatibility with GCC < 4.4.6 */
+        .reserved = { 0 },
+        V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT,
+                ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK,
+                V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
                         V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
-                .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |
-                        V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM,
-        },
+                V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
+                        V4L2_DV_BT_CAP_CUSTOM)
 };
 
 static inline struct adv7511_state *get_adv7511_state(struct v4l2_subdev *sd)
@@ -1126,6 +1124,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *
         state->i2c_edid = i2c_new_dummy(client->adapter, state->i2c_edid_addr >> 1);
         if (state->i2c_edid == NULL) {
                 v4l2_err(sd, "failed to register edid i2c client\n");
+                err = -ENOMEM;
                 goto err_entity;
         }
 
@@ -1133,6 +1132,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *
         state->work_queue = create_singlethread_workqueue(sd->name);
         if (state->work_queue == NULL) {
                 v4l2_err(sd, "could not create workqueue\n");
+                err = -ENOMEM;
                 goto err_unreg_cec;
         }
 
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index d1748901337c..22f729d66a96 100644
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -546,30 +546,24 @@ static inline bool is_digital_input(struct v4l2_subdev *sd)
 
 static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = {
         .type = V4L2_DV_BT_656_1120,
-        .bt = {
-                .max_width = 1920,
-                .max_height = 1200,
-                .min_pixelclock = 25000000,
-                .max_pixelclock = 170000000,
-                .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
+        /* keep this initialization for compatibility with GCC < 4.4.6 */
+        .reserved = { 0 },
+        V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,
+                V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
                         V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
-                .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |
-                        V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM,
-        },
+                V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
+                        V4L2_DV_BT_CAP_CUSTOM)
 };
 
 static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = {
         .type = V4L2_DV_BT_656_1120,
-        .bt = {
-                .max_width = 1920,
-                .max_height = 1200,
-                .min_pixelclock = 25000000,
-                .max_pixelclock = 225000000,
-                .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
+        /* keep this initialization for compatibility with GCC < 4.4.6 */
+        .reserved = { 0 },
+        V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000,
+                V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
                         V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
-                .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE |
-                        V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM,
-        },
+                V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
+                        V4L2_DV_BT_CAP_CUSTOM)
 };
 
 static inline const struct v4l2_dv_timings_cap *
diff --git a/drivers/media/i2c/ths8200.c b/drivers/media/i2c/ths8200.c
index a58a8f663ffb..d9f65d7e3e58 100644
--- a/drivers/media/i2c/ths8200.c
+++ b/drivers/media/i2c/ths8200.c
@@ -46,14 +46,10 @@ struct ths8200_state {
 
 static const struct v4l2_dv_timings_cap ths8200_timings_cap = {
         .type = V4L2_DV_BT_656_1120,
-        .bt = {
-                .max_width = 1920,
-                .max_height = 1080,
-                .min_pixelclock = 25000000,
-                .max_pixelclock = 148500000,
-                .standards = V4L2_DV_BT_STD_CEA861,
-                .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE,
-        },
+        /* keep this initialization for compatibility with GCC < 4.4.6 */
+        .reserved = { 0 },
+        V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1080, 25000000, 148500000,
+                V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE)
 };
 
 static inline struct ths8200_state *to_state(struct v4l2_subdev *sd)
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index e12bbd8c3f0b..fb60da85bc2c 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1455,6 +1455,7 @@ static int video_release(struct file *file)
 
         /* stop video capture */
         if (res_check(fh, RESOURCE_VIDEO)) {
+                pm_qos_remove_request(&dev->qos_request);
                 videobuf_streamoff(&fh->cap);
                 res_free(dev,fh,RESOURCE_VIDEO);
         }
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 15d23968d1de..9b88a4601007 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1423,6 +1423,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
         jpeg->vfd_decoder->release      = video_device_release;
         jpeg->vfd_decoder->lock         = &jpeg->lock;
         jpeg->vfd_decoder->v4l2_dev     = &jpeg->v4l2_dev;
+        jpeg->vfd_decoder->vfl_dir      = VFL_DIR_M2M;
 
         ret = video_register_device(jpeg->vfd_decoder, VFL_TYPE_GRABBER, -1);
         if (ret) {
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index 7a9c5e9329f2..4f30341dc2ab 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -776,7 +776,7 @@ static int sh_vou_try_fmt_vid_out(struct file *file, void *priv,
         v4l_bound_align_image(&pix->width, 0, VOU_MAX_IMAGE_WIDTH, 1,
                               &pix->height, 0, VOU_MAX_IMAGE_HEIGHT, 1, 0);
 
-        for (i = 0; ARRAY_SIZE(vou_fmt); i++)
+        for (i = 0; i < ARRAY_SIZE(vou_fmt); i++)
                 if (vou_fmt[i].pfmt == pix->pixelformat)
                         return 0;
 
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index 8f9f6211c52e..f975b7008692 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -266,7 +266,6 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
         struct idmac_channel *ichan = mx3_cam->idmac_channel[0];
         struct idmac_video_param *video = &ichan->params.video;
         const struct soc_mbus_pixelfmt *host_fmt = icd->current_fmt->host_fmt;
-        unsigned long flags;
         dma_cookie_t cookie;
         size_t new_size;
 
@@ -328,7 +327,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
                 memset(vb2_plane_vaddr(vb, 0), 0xaa, vb2_get_plane_payload(vb, 0));
 #endif
 
-        spin_lock_irqsave(&mx3_cam->lock, flags);
+        spin_lock_irq(&mx3_cam->lock);
         list_add_tail(&buf->queue, &mx3_cam->capture);
 
         if (!mx3_cam->active)
@@ -351,7 +350,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
         if (mx3_cam->active == buf)
                 mx3_cam->active = NULL;
 
-        spin_unlock_irqrestore(&mx3_cam->lock, flags);
+        spin_unlock_irq(&mx3_cam->lock);
 error:
         vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
 }
diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c
index ad9309da4a91..6c96e4898777 100644
--- a/drivers/media/tuners/e4000.c
+++ b/drivers/media/tuners/e4000.c
@@ -19,6 +19,7 @@
  */
 
 #include "e4000_priv.h"
+#include <linux/math64.h>
 
 /* write multiple registers */
 static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len)
@@ -233,7 +234,7 @@ static int e4000_set_params(struct dvb_frontend *fe)
          * or more.
          */
         f_vco = c->frequency * e4000_pll_lut[i].mul;
-        sigma_delta = 0x10000UL * (f_vco % priv->cfg->clock) / priv->cfg->clock;
+        sigma_delta = div_u64(0x10000ULL * (f_vco % priv->cfg->clock), priv->cfg->clock);
         buf[0] = f_vco / priv->cfg->clock;
         buf[1] = (sigma_delta >> 0) & 0xff;
         buf[2] = (sigma_delta >> 8) & 0xff;
diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index c43c8d32be40..be77482c3070 100644
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -111,6 +111,13 @@ static const struct dmi_system_id stk_upside_down_dmi_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "F3JC")
                 }
         },
+        {
+                .ident = "T12Rg-H",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "HCL Infosystems Limited"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "T12Rg-H")
+                }
+        },
         {}
 };
 
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 81695d48c13e..c3bb2502225b 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2090,6 +2090,15 @@ static struct usb_device_id uvc_ids[] = {
           .bInterfaceSubClass   = 1,
           .bInterfaceProtocol   = 0,
           .driver_info          = UVC_QUIRK_PROBE_MINMAX },
+        /* Microsoft Lifecam NX-3000 */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x045e,
+          .idProduct            = 0x0721,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_DEF },
         /* Microsoft Lifecam VX-7000 */
         { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -2174,6 +2183,15 @@ static struct usb_device_id uvc_ids[] = {
           .bInterfaceSubClass   = 1,
           .bInterfaceProtocol   = 0,
           .driver_info          = UVC_QUIRK_PROBE_DEF },
+        /* Dell SP2008WFP Monitor */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x05a9,
+          .idProduct            = 0x2641,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_DEF },
         /* Dell Alienware X51 */
         { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
                                 | USB_DEVICE_ID_MATCH_INT_INFO,
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 594c75eab5a5..de0e87f0b2c3 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -353,7 +353,9 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 
                         if (b->m.planes[plane].bytesused > length)
                                 return -EINVAL;
-                        if (b->m.planes[plane].data_offset >=
+
+                        if (b->m.planes[plane].data_offset > 0 &&
+                            b->m.planes[plane].data_offset >=
                             b->m.planes[plane].bytesused)
                                 return -EINVAL;
                 }
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index fd56f2563201..646f08f4f504 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -423,6 +423,39 @@ static inline int vma_is_io(struct vm_area_struct *vma)
         return !!(vma->vm_flags & (VM_IO | VM_PFNMAP));
 }
 
+static int vb2_dc_get_user_pfn(unsigned long start, int n_pages,
+        struct vm_area_struct *vma, unsigned long *res)
+{
+        unsigned long pfn, start_pfn, prev_pfn;
+        unsigned int i;
+        int ret;
+
+        if (!vma_is_io(vma))
+                return -EFAULT;
+
+        ret = follow_pfn(vma, start, &pfn);
+        if (ret)
+                return ret;
+
+        start_pfn = pfn;
+        start += PAGE_SIZE;
+
+        for (i = 1; i < n_pages; ++i, start += PAGE_SIZE) {
+                prev_pfn = pfn;
+                ret = follow_pfn(vma, start, &pfn);
+
+                if (ret) {
+                        pr_err("no page for address %lu\n", start);
+                        return ret;
+                }
+                if (pfn != prev_pfn + 1)
+                        return -EINVAL;
+        }
+
+        *res = start_pfn;
+        return 0;
+}
+
 static int vb2_dc_get_user_pages(unsigned long start, struct page **pages,
         int n_pages, struct vm_area_struct *vma, int write)
 {
@@ -433,6 +466,9 @@ static int vb2_dc_get_user_pages(unsigned long start, struct page **pages,
                         unsigned long pfn;
                         int ret = follow_pfn(vma, start, &pfn);
 
+                        if (!pfn_valid(pfn))
+                                return -EINVAL;
+
                         if (ret) {
                                 pr_err("no page for address %lu\n", start);
                                 return ret;
@@ -468,16 +504,49 @@ static void vb2_dc_put_userptr(void *buf_priv)
         struct vb2_dc_buf *buf = buf_priv;
         struct sg_table *sgt = buf->dma_sgt;
 
-        dma_unmap_sg(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
-        if (!vma_is_io(buf->vma))
-                vb2_dc_sgt_foreach_page(sgt, vb2_dc_put_dirty_page);
+        if (sgt) {
+                dma_unmap_sg(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
+                if (!vma_is_io(buf->vma))
+                        vb2_dc_sgt_foreach_page(sgt, vb2_dc_put_dirty_page);
 
-        sg_free_table(sgt);
-        kfree(sgt);
+                sg_free_table(sgt);
+                kfree(sgt);
+        }
         vb2_put_vma(buf->vma);
         kfree(buf);
 }
 
+/*
+ * For some kind of reserved memory there might be no struct page available,
+ * so all that can be done to support such 'pages' is to try to convert
+ * pfn to dma address or at the last resort just assume that
+ * dma address == physical address (like it has been assumed in earlier version
+ * of videobuf2-dma-contig
+ */
+
+#ifdef __arch_pfn_to_dma
+static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn)
+{
+        return (dma_addr_t)__arch_pfn_to_dma(dev, pfn);
+}
+#elif defined(__pfn_to_bus)
+static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn)
+{
+        return (dma_addr_t)__pfn_to_bus(pfn);
+}
+#elif defined(__pfn_to_phys)
+static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn)
+{
+        return (dma_addr_t)__pfn_to_phys(pfn);
+}
+#else
+static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn)
+{
+        /* really, we cannot do anything better at this point */
+        return (dma_addr_t)(pfn) << PAGE_SHIFT;
+}
+#endif
+
 static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
         unsigned long size, int write)
 {
@@ -548,6 +617,14 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
         /* extract page list from userspace mapping */
         ret = vb2_dc_get_user_pages(start, pages, n_pages, vma, write);
         if (ret) {
+                unsigned long pfn;
+                if (vb2_dc_get_user_pfn(start, n_pages, vma, &pfn) == 0) {
+                        buf->dma_addr = vb2_dc_pfn_to_dma(buf->dev, pfn);
+                        buf->size = size;
+                        kfree(pages);
+                        return buf;
+                }
+
                 pr_err("failed to get user pages\n");
                 goto fail_vma;
         }
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 2a9b100c4825..dbbf8ee3f592 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -158,8 +158,6 @@ int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32 *val)
 {
         int ret;
 
-        BUG_ON(!mutex_is_locked(&mc13xxx->lock));
-
         if (offset > MC13XXX_NUMREGS)
                 return -EINVAL;
 
@@ -172,8 +170,6 @@ EXPORT_SYMBOL(mc13xxx_reg_read);
 
 int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int offset, u32 val)
 {
-        BUG_ON(!mutex_is_locked(&mc13xxx->lock));
-
         dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x\n", offset, val);
 
         if (offset > MC13XXX_NUMREGS || val > 0xffffff)
@@ -186,7 +182,6 @@ EXPORT_SYMBOL(mc13xxx_reg_write);
 int mc13xxx_reg_rmw(struct mc13xxx *mc13xxx, unsigned int offset,
                 u32 mask, u32 val)
 {
-        BUG_ON(!mutex_is_locked(&mc13xxx->lock));
         BUG_ON(val & ~mask);
         dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x (mask: 0x%06x)\n",
                         offset, val, mask);
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index 77189daadf1e..5f14ef6693c2 100644
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -94,10 +94,15 @@ static int mc13xxx_spi_write(void *context, const void *data, size_t count)
 {
         struct device *dev = context;
         struct spi_device *spi = to_spi_device(dev);
+        const char *reg = data;
 
         if (count != 4)
                 return -ENOTSUPP;
 
+        /* include errata fix for spi audio problems */
+        if (*reg == MC13783_AUDIO_CODEC || *reg == MC13783_AUDIO_DAC)
+                spi_write(spi, data, count);
+
         return spi_write(spi, data, count);
 }
 
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 59ab0692f0b9..a9830ff8e3f3 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -349,7 +349,7 @@ static int legacy_set_geometry(struct gpmi_nand_data *this)
 
 int common_nfc_set_geometry(struct gpmi_nand_data *this)
 {
-        return set_geometry_by_ecc_info(this) ? 0 : legacy_set_geometry(this);
+        return legacy_set_geometry(this);
 }
 
 struct dma_chan *get_dma_chan(struct gpmi_nand_data *this)
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index dd03dfdfb0d6..c28d4e29af1a 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1320,7 +1320,12 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
         for (cs = 0; cs < pdata->num_cs; cs++) {
                 struct mtd_info *mtd = info->host[cs]->mtd;
 
-                mtd->name = pdev->name;
+                /*
+                 * The mtd name matches the one used in 'mtdparts' kernel
+                 * parameter. This name cannot be changed or otherwise
+                 * user's mtd partitions configuration would get broken.
+                 */
+                mtd->name = "pxa3xx_nand-0";
                 info->cs = cs;
                 ret = pxa3xx_nand_scan(mtd);
                 if (ret) {
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 3b1ff6148702..693d8ffe4653 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -1405,10 +1405,10 @@ static int at91_can_remove(struct platform_device *pdev)
 
 static const struct platform_device_id at91_can_id_table[] = {
         {
-                .name = "at91_can",
+                .name = "at91sam9x5_can",
                 .driver_data = (kernel_ulong_t)&at91_at91sam9x5_data,
         }, {
-                .name = "at91sam9x5_can",
+                .name = "at91_can",
                 .driver_data = (kernel_ulong_t)&at91_at91sam9263_data,
         }, {
                 /* sentinel */
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index f9cba4123c66..1870c4731a57 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -705,14 +705,14 @@ static size_t can_get_size(const struct net_device *dev)
         size_t size;
 
         size = nla_total_size(sizeof(u32));   /* IFLA_CAN_STATE */
-        size += sizeof(struct can_ctrlmode);  /* IFLA_CAN_CTRLMODE */
+        size += nla_total_size(sizeof(struct can_ctrlmode));  /* IFLA_CAN_CTRLMODE */
         size += nla_total_size(sizeof(u32));  /* IFLA_CAN_RESTART_MS */
-        size += sizeof(struct can_bittiming); /* IFLA_CAN_BITTIMING */
-        size += sizeof(struct can_clock);     /* IFLA_CAN_CLOCK */
+        size += nla_total_size(sizeof(struct can_bittiming)); /* IFLA_CAN_BITTIMING */
+        size += nla_total_size(sizeof(struct can_clock));     /* IFLA_CAN_CLOCK */
         if (priv->do_get_berr_counter)        /* IFLA_CAN_BERR_COUNTER */
-                size += sizeof(struct can_berr_counter);
+                size += nla_total_size(sizeof(struct can_berr_counter));
         if (priv->bittiming_const)            /* IFLA_CAN_BITTIMING_CONST */
-                size += sizeof(struct can_bittiming_const);
+                size += nla_total_size(sizeof(struct can_bittiming_const));
 
         return size;
 }
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 3f21142138b7..8f5ce747feb5 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -62,7 +62,7 @@
 #define FLEXCAN_MCR_BCC                 BIT(16)
 #define FLEXCAN_MCR_LPRIO_EN            BIT(13)
 #define FLEXCAN_MCR_AEN                 BIT(12)
-#define FLEXCAN_MCR_MAXMB(x)            ((x) & 0xf)
+#define FLEXCAN_MCR_MAXMB(x)            ((x) & 0x1f)
 #define FLEXCAN_MCR_IDAM_A              (0 << 8)
 #define FLEXCAN_MCR_IDAM_B              (1 << 8)
 #define FLEXCAN_MCR_IDAM_C              (2 << 8)
@@ -735,9 +735,11 @@ static int flexcan_chip_start(struct net_device *dev)
          *
          */
         reg_mcr = flexcan_read(&regs->mcr);
+        reg_mcr &= ~FLEXCAN_MCR_MAXMB(0xff);
         reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_FEN | FLEXCAN_MCR_HALT |
                 FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN |
-                FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_SRX_DIS;
+                FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_SRX_DIS |
+                FLEXCAN_MCR_MAXMB(FLEXCAN_TX_BUF_ID);
         netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr);
         flexcan_write(reg_mcr, &regs->mcr);
 
@@ -771,6 +773,10 @@ static int flexcan_chip_start(struct net_device *dev)
         netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
         flexcan_write(reg_ctrl, &regs->ctrl);
 
+        /* Abort any pending TX, mark Mailbox as INACTIVE */
+        flexcan_write(FLEXCAN_MB_CNT_CODE(0x4),
+                      &regs->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl);
+
         /* acceptance mask/acceptance code (accept everything) */
         flexcan_write(0x0, &regs->rxgmask);
         flexcan_write(0x0, &regs->rx14mask);
@@ -979,9 +985,9 @@ static void unregister_flexcandev(struct net_device *dev)
 }
 
 static const struct of_device_id flexcan_of_match[] = {
-        { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
-        { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, },
         { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
+        { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, },
+        { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
         { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, flexcan_of_match);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 97b3d32a98bd..c5e375ddd6c0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1197,8 +1197,9 @@ union cdu_context {
 /* TM (timers) host DB constants */
 #define TM_ILT_PAGE_SZ_HW       0
 #define TM_ILT_PAGE_SZ          (4096 << TM_ILT_PAGE_SZ_HW) /* 4K */
-/* #define TM_CONN_NUM          (CNIC_STARTING_CID+CNIC_ISCSI_CXT_MAX) */
-#define TM_CONN_NUM             1024
+#define TM_CONN_NUM             (BNX2X_FIRST_VF_CID + \
+                                 BNX2X_VF_CIDS + \
+                                 CNIC_ISCSI_CID_MAX)
 #define TM_ILT_SZ               (8 * TM_CONN_NUM)
 #define TM_ILT_LINES            DIV_ROUND_UP(TM_ILT_SZ, TM_ILT_PAGE_SZ)
 
@@ -1527,7 +1528,6 @@ struct bnx2x {
 #define PCI_32BIT_FLAG                  (1 << 1)
 #define ONE_PORT_FLAG                   (1 << 2)
 #define NO_WOL_FLAG                     (1 << 3)
-#define USING_DAC_FLAG                  (1 << 4)
 #define USING_MSIX_FLAG                 (1 << 5)
 #define USING_MSI_FLAG                  (1 << 6)
 #define DISABLE_MSI_FLAG                (1 << 7)
@@ -1621,7 +1621,7 @@ struct bnx2x {
         u16                     rx_ticks_int;
         u16                     rx_ticks;
 /* Maximal coalescing timeout in us */
-#define BNX2X_MAX_COALESCE_TOUT         (0xf0*12)
+#define BNX2X_MAX_COALESCE_TOUT         (0xff*BNX2X_BTR)
 
         u32                     lin_cnt;
 
@@ -2072,7 +2072,8 @@ u32 bnx2x_dmae_opcode(struct bnx2x *bp, u8 src_type, u8 dst_type,
 
 void bnx2x_prep_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae,
                                u8 src_type, u8 dst_type);
-int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae);
+int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae,
+                               u32 *comp);
 
 /* FLR related routines */
 u32 bnx2x_flr_clnup_poll_count(struct bnx2x *bp);
@@ -2498,4 +2499,8 @@ enum bnx2x_pci_bus_speed {
 };
 
 void bnx2x_set_local_cmng(struct bnx2x *bp);
+
+#define MCPR_SCRATCH_BASE(bp) \
+        (CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH)
+
 #endif /* bnx2x.h */
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index e66beff2704d..4ab4c89c60cd 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -681,6 +681,7 @@ static void bnx2x_gro_receive(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                 }
         }
 #endif
+        skb_record_rx_queue(skb, fp->rx_queue);
         napi_gro_receive(&fp->napi, skb);
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 324de5f05332..e8efa1c93ffe 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -891,17 +891,8 @@ static void bnx2x_get_regs(struct net_device *dev,
          * will re-enable parity attentions right after the dump.
          */
 
-        /* Disable parity on path 0 */
-        bnx2x_pretend_func(bp, 0);
         bnx2x_disable_blocks_parity(bp);
 
-        /* Disable parity on path 1 */
-        bnx2x_pretend_func(bp, 1);
-        bnx2x_disable_blocks_parity(bp);
-
-        /* Return to current function */
-        bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
-
         dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1;
         dump_hdr.preset = DUMP_ALL_PRESETS;
         dump_hdr.version = BNX2X_DUMP_VERSION;
@@ -928,18 +919,9 @@ static void bnx2x_get_regs(struct net_device *dev,
         /* Actually read the registers */
         __bnx2x_get_regs(bp, p);
 
-        /* Re-enable parity attentions on path 0 */
-        bnx2x_pretend_func(bp, 0);
+        /* Re-enable parity attentions */
         bnx2x_clear_blocks_parity(bp);
         bnx2x_enable_blocks_parity(bp);
-
-        /* Re-enable parity attentions on path 1 */
-        bnx2x_pretend_func(bp, 1);
-        bnx2x_clear_blocks_parity(bp);
-        bnx2x_enable_blocks_parity(bp);
-
-        /* Return to current function */
-        bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
 }
 
 static int bnx2x_get_preset_regs_len(struct net_device *dev, u32 preset)
@@ -993,17 +975,8 @@ static int bnx2x_get_dump_data(struct net_device *dev,
          * will re-enable parity attentions right after the dump.
          */
 
-        /* Disable parity on path 0 */
-        bnx2x_pretend_func(bp, 0);
         bnx2x_disable_blocks_parity(bp);
 
-        /* Disable parity on path 1 */
-        bnx2x_pretend_func(bp, 1);
-        bnx2x_disable_blocks_parity(bp);
-
-        /* Return to current function */
-        bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
-
         dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1;
         dump_hdr.preset = bp->dump_preset_idx;
         dump_hdr.version = BNX2X_DUMP_VERSION;
@@ -1032,19 +1005,10 @@ static int bnx2x_get_dump_data(struct net_device *dev,
         /* Actually read the registers */
         __bnx2x_get_preset_regs(bp, p, dump_hdr.preset);
 
-        /* Re-enable parity attentions on path 0 */
-        bnx2x_pretend_func(bp, 0);
+        /* Re-enable parity attentions */
         bnx2x_clear_blocks_parity(bp);
         bnx2x_enable_blocks_parity(bp);
 
-        /* Re-enable parity attentions on path 1 */
-        bnx2x_pretend_func(bp, 1);
-        bnx2x_clear_blocks_parity(bp);
-        bnx2x_enable_blocks_parity(bp);
-
-        /* Return to current function */
-        bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
-
         return 0;
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
index 76df015f486a..c2dfea7968f4 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
@@ -640,23 +640,35 @@ static const struct {
  * [30] MCP Latched ump_tx_parity
  * [31] MCP Latched scpad_parity
  */
-#define MISC_AEU_ENABLE_MCP_PRTY_BITS   \
+#define MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS       \
         (AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY | \
          AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY | \
-         AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \
+         AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY)
+
+#define MISC_AEU_ENABLE_MCP_PRTY_BITS   \
+        (MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS | \
          AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY)
 
 /* Below registers control the MCP parity attention output. When
  * MISC_AEU_ENABLE_MCP_PRTY_BITS are set - attentions are
  * enabled, when cleared - disabled.
  */
-static const u32 mcp_attn_ctl_regs[] = {
-        MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0,
-        MISC_REG_AEU_ENABLE4_NIG_0,
-        MISC_REG_AEU_ENABLE4_PXP_0,
-        MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0,
-        MISC_REG_AEU_ENABLE4_NIG_1,
-        MISC_REG_AEU_ENABLE4_PXP_1
+static const struct {
+        u32 addr;
+        u32 bits;
+} mcp_attn_ctl_regs[] = {
+        { MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0,
+                MISC_AEU_ENABLE_MCP_PRTY_BITS },
+        { MISC_REG_AEU_ENABLE4_NIG_0,
+                MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
+        { MISC_REG_AEU_ENABLE4_PXP_0,
+                MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
+        { MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0,
+                MISC_AEU_ENABLE_MCP_PRTY_BITS },
+        { MISC_REG_AEU_ENABLE4_NIG_1,
+                MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
+        { MISC_REG_AEU_ENABLE4_PXP_1,
+                MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }
 };
 
 static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable)
@@ -665,14 +677,14 @@ static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable)
         u32 reg_val;
 
         for (i = 0; i < ARRAY_SIZE(mcp_attn_ctl_regs); i++) {
-                reg_val = REG_RD(bp, mcp_attn_ctl_regs[i]);
+                reg_val = REG_RD(bp, mcp_attn_ctl_regs[i].addr);
 
                 if (enable)
-                        reg_val |= MISC_AEU_ENABLE_MCP_PRTY_BITS;
+                        reg_val |= mcp_attn_ctl_regs[i].bits;
                 else
-                        reg_val &= ~MISC_AEU_ENABLE_MCP_PRTY_BITS;
+                        reg_val &= ~mcp_attn_ctl_regs[i].bits;
 
-                REG_WR(bp, mcp_attn_ctl_regs[i], reg_val);
+                REG_WR(bp, mcp_attn_ctl_regs[i].addr, reg_val);
         }
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 82b658d8c04c..b42f89ce02ef 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -503,9 +503,9 @@ void bnx2x_prep_dmae_with_comp(struct bnx2x *bp,
 }
 
 /* issue a dmae command over the init-channel and wait for completion */
-int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae)
+int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae,
+                               u32 *comp)
 {
-        u32 *wb_comp = bnx2x_sp(bp, wb_comp);
         int cnt = CHIP_REV_IS_SLOW(bp) ? (400000) : 4000;
         int rc = 0;
 
@@ -518,14 +518,14 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae)
         spin_lock_bh(&bp->dmae_lock);
 
         /* reset completion */
-        *wb_comp = 0;
+        *comp = 0;
 
         /* post the command on the channel used for initializations */
         bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));
 
         /* wait for completion */
         udelay(5);
-        while ((*wb_comp & ~DMAE_PCI_ERR_FLAG) != DMAE_COMP_VAL) {
+        while ((*comp & ~DMAE_PCI_ERR_FLAG) != DMAE_COMP_VAL) {
 
                 if (!cnt ||
                     (bp->recovery_state != BNX2X_RECOVERY_DONE &&
@@ -537,7 +537,7 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae)
                 cnt--;
                 udelay(50);
         }
-        if (*wb_comp & DMAE_PCI_ERR_FLAG) {
+        if (*comp & DMAE_PCI_ERR_FLAG) {
                 BNX2X_ERR("DMAE PCI error!\n");
                 rc = DMAE_PCI_ERROR;
         }
@@ -574,7 +574,7 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr,
         dmae.len = len32;
 
         /* issue the command and wait for completion */
-        rc = bnx2x_issue_dmae_with_comp(bp, &dmae);
+        rc = bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
         if (rc) {
                 BNX2X_ERR("DMAE returned failure %d\n", rc);
                 bnx2x_panic();
@@ -611,7 +611,7 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
         dmae.len = len32;
 
         /* issue the command and wait for completion */
-        rc = bnx2x_issue_dmae_with_comp(bp, &dmae);
+        rc = bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
         if (rc) {
                 BNX2X_ERR("DMAE returned failure %d\n", rc);
                 bnx2x_panic();
@@ -751,6 +751,10 @@ static int bnx2x_mc_assert(struct bnx2x *bp)
         return rc;
 }
 
+#define MCPR_TRACE_BUFFER_SIZE  (0x800)
+#define SCRATCH_BUFFER_SIZE(bp) \
+        (CHIP_IS_E1(bp) ? 0x10000 : (CHIP_IS_E1H(bp) ? 0x20000 : 0x28000))
+
 void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl)
 {
         u32 addr, val;
@@ -775,7 +779,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl)
                 trace_shmem_base = bp->common.shmem_base;
         else
                 trace_shmem_base = SHMEM2_RD(bp, other_shmem_base_addr);
-        addr = trace_shmem_base - 0x800;
+
+        /* sanity */
+        if (trace_shmem_base < MCPR_SCRATCH_BASE(bp) + MCPR_TRACE_BUFFER_SIZE ||
+            trace_shmem_base >= MCPR_SCRATCH_BASE(bp) +
+                                SCRATCH_BUFFER_SIZE(bp)) {
+                BNX2X_ERR("Unable to dump trace buffer (mark %x)\n",
+                          trace_shmem_base);
+                return;
+        }
+
+        addr = trace_shmem_base - MCPR_TRACE_BUFFER_SIZE;
 
         /* validate TRCB signature */
         mark = REG_RD(bp, addr);
@@ -787,14 +801,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl)
         /* read cyclic buffer pointer */
         addr += 4;
         mark = REG_RD(bp, addr);
-        mark = (CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH)
-                        + ((mark + 0x3) & ~0x3) - 0x08000000;
+        mark = MCPR_SCRATCH_BASE(bp) + ((mark + 0x3) & ~0x3) - 0x08000000;
+        if (mark >= trace_shmem_base || mark < addr + 4) {
+                BNX2X_ERR("Mark doesn't fall inside Trace Buffer\n");
+                return;
+        }
         printk("%s" "begin fw dump (mark 0x%x)\n", lvl, mark);
 
         printk("%s", lvl);
 
         /* dump buffer after the mark */
-        for (offset = mark; offset <= trace_shmem_base; offset += 0x8*4) {
+        for (offset = mark; offset < trace_shmem_base; offset += 0x8*4) {
                 for (word = 0; word < 8; word++)
                         data[word] = htonl(REG_RD(bp, offset + 4*word));
                 data[8] = 0x0;
@@ -4280,65 +4297,60 @@ static void _print_next_block(int idx, const char *blk)
         pr_cont("%s%s", idx ? ", " : "", blk);
 }
 
-static int bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig,
-                                            int par_num, bool print)
+static bool bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig,
+                                            int *par_num, bool print)
 {
-        int i = 0;
-        u32 cur_bit = 0;
+        u32 cur_bit;
+        bool res;
+        int i;
+
+        res = false;
+
         for (i = 0; sig; i++) {
-                cur_bit = ((u32)0x1 << i);
+                cur_bit = (0x1UL << i);
                 if (sig & cur_bit) {
-                        switch (cur_bit) {
-                        case AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "BRB");
+                        res |= true; /* Each bit is real error! */
+
+                        if (print) {
+                                switch (cur_bit) {
+                                case AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "BRB");
                                         _print_parity(bp,
                                                       BRB1_REG_BRB1_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_PARSER_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "PARSER");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_PARSER_PARITY_ERROR:
+                                        _print_next_block((*par_num)++,
+                                                          "PARSER");
                                         _print_parity(bp, PRS_REG_PRS_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_TSDM_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "TSDM");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_TSDM_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "TSDM");
                                         _print_parity(bp,
                                                       TSDM_REG_TSDM_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_SEARCHER_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++,
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_SEARCHER_PARITY_ERROR:
+                                        _print_next_block((*par_num)++,
                                                           "SEARCHER");
                                         _print_parity(bp, SRC_REG_SRC_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "TCM");
-                                        _print_parity(bp,
-                                                      TCM_REG_TCM_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "TSEMI");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "TCM");
+                                        _print_parity(bp, TCM_REG_TCM_PRTY_STS);
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR:
+                                        _print_next_block((*par_num)++,
+                                                          "TSEMI");
                                         _print_parity(bp,
                                                       TSEM_REG_TSEM_PRTY_STS_0);
                                         _print_parity(bp,
                                                       TSEM_REG_TSEM_PRTY_STS_1);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "XPB");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "XPB");
                                         _print_parity(bp, GRCBASE_XPB +
                                                           PB_REG_PB_PRTY_STS);
+                                        break;
                                 }
-                                break;
                         }
 
                         /* Clear the bit */
@@ -4346,53 +4358,59 @@ static int bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig,
                 }
         }
 
-        return par_num;
+        return res;
 }
 
-static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
-                                            int par_num, bool *global,
+static bool bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
+                                            int *par_num, bool *global,
                                             bool print)
 {
-        int i = 0;
-        u32 cur_bit = 0;
+        u32 cur_bit;
+        bool res;
+        int i;
+
+        res = false;
+
         for (i = 0; sig; i++) {
-                cur_bit = ((u32)0x1 << i);
+                cur_bit = (0x1UL << i);
                 if (sig & cur_bit) {
+                        res |= true; /* Each bit is real error! */
                         switch (cur_bit) {
                         case AEU_INPUTS_ATTN_BITS_PBF_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "PBF");
+                                        _print_next_block((*par_num)++, "PBF");
                                         _print_parity(bp, PBF_REG_PBF_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_QM_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "QM");
+                                        _print_next_block((*par_num)++, "QM");
                                         _print_parity(bp, QM_REG_QM_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_TIMERS_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "TM");
+                                        _print_next_block((*par_num)++, "TM");
                                         _print_parity(bp, TM_REG_TM_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_XSDM_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "XSDM");
+                                        _print_next_block((*par_num)++, "XSDM");
                                         _print_parity(bp,
                                                       XSDM_REG_XSDM_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_XCM_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "XCM");
+                                        _print_next_block((*par_num)++, "XCM");
                                         _print_parity(bp, XCM_REG_XCM_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_XSEMI_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "XSEMI");
+                                        _print_next_block((*par_num)++,
+                                                          "XSEMI");
                                         _print_parity(bp,
                                                       XSEM_REG_XSEM_PRTY_STS_0);
                                         _print_parity(bp,
@@ -4401,7 +4419,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
                                 break;
                         case AEU_INPUTS_ATTN_BITS_DOORBELLQ_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++,
+                                        _print_next_block((*par_num)++,
                                                           "DOORBELLQ");
                                         _print_parity(bp,
                                                       DORQ_REG_DORQ_PRTY_STS);
@@ -4409,7 +4427,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
                                 break;
                         case AEU_INPUTS_ATTN_BITS_NIG_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "NIG");
+                                        _print_next_block((*par_num)++, "NIG");
                                         if (CHIP_IS_E1x(bp)) {
                                                 _print_parity(bp,
                                                         NIG_REG_NIG_PRTY_STS);
@@ -4423,32 +4441,34 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
                                 break;
                         case AEU_INPUTS_ATTN_BITS_VAUX_PCI_CORE_PARITY_ERROR:
                                 if (print)
-                                        _print_next_block(par_num++,
+                                        _print_next_block((*par_num)++,
                                                           "VAUX PCI CORE");
                                 *global = true;
                                 break;
                         case AEU_INPUTS_ATTN_BITS_DEBUG_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "DEBUG");
+                                        _print_next_block((*par_num)++,
+                                                          "DEBUG");
                                         _print_parity(bp, DBG_REG_DBG_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_USDM_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "USDM");
+                                        _print_next_block((*par_num)++, "USDM");
                                         _print_parity(bp,
                                                       USDM_REG_USDM_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_UCM_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "UCM");
+                                        _print_next_block((*par_num)++, "UCM");
                                         _print_parity(bp, UCM_REG_UCM_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_USEMI_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "USEMI");
+                                        _print_next_block((*par_num)++,
+                                                          "USEMI");
                                         _print_parity(bp,
                                                       USEM_REG_USEM_PRTY_STS_0);
                                         _print_parity(bp,
@@ -4457,21 +4477,21 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
                                 break;
                         case AEU_INPUTS_ATTN_BITS_UPB_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "UPB");
+                                        _print_next_block((*par_num)++, "UPB");
                                         _print_parity(bp, GRCBASE_UPB +
                                                           PB_REG_PB_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_CSDM_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "CSDM");
+                                        _print_next_block((*par_num)++, "CSDM");
                                         _print_parity(bp,
                                                       CSDM_REG_CSDM_PRTY_STS);
                                 }
                                 break;
                         case AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR:
                                 if (print) {
-                                        _print_next_block(par_num++, "CCM");
+                                        _print_next_block((*par_num)++, "CCM");
                                         _print_parity(bp, CCM_REG_CCM_PRTY_STS);
                                 }
                                 break;
@@ -4482,80 +4502,73 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
                 }
         }
 
-        return par_num;
+        return res;
 }
 
-static int bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig,
-                                            int par_num, bool print)
+static bool bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig,
+                                            int *par_num, bool print)
 {
-        int i = 0;
-        u32 cur_bit = 0;
+        u32 cur_bit;
+        bool res;
+        int i;
+
+        res = false;
+
         for (i = 0; sig; i++) {
-                cur_bit = ((u32)0x1 << i);
+                cur_bit = (0x1UL << i);
                 if (sig & cur_bit) {
-                        switch (cur_bit) {
-                        case AEU_INPUTS_ATTN_BITS_CSEMI_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "CSEMI");
+                        res |= true; /* Each bit is real error! */
+                        if (print) {
+                                switch (cur_bit) {
+                                case AEU_INPUTS_ATTN_BITS_CSEMI_PARITY_ERROR:
+                                        _print_next_block((*par_num)++,
+                                                          "CSEMI");
                                         _print_parity(bp,
                                                       CSEM_REG_CSEM_PRTY_STS_0);
                                         _print_parity(bp,
                                                       CSEM_REG_CSEM_PRTY_STS_1);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_PXP_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "PXP");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_PXP_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "PXP");
                                         _print_parity(bp, PXP_REG_PXP_PRTY_STS);
                                         _print_parity(bp,
                                                       PXP2_REG_PXP2_PRTY_STS_0);
                                         _print_parity(bp,
                                                       PXP2_REG_PXP2_PRTY_STS_1);
-                                }
-                                break;
-                        case AEU_IN_ATTN_BITS_PXPPCICLOCKCLIENT_PARITY_ERROR:
-                                if (print)
-                                        _print_next_block(par_num++,
-                                        "PXPPCICLOCKCLIENT");
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_CFC_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "CFC");
+                                        break;
+                                case AEU_IN_ATTN_BITS_PXPPCICLOCKCLIENT_PARITY_ERROR:
+                                        _print_next_block((*par_num)++,
+                                                          "PXPPCICLOCKCLIENT");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_CFC_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "CFC");
                                         _print_parity(bp,
                                                       CFC_REG_CFC_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_CDU_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "CDU");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_CDU_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "CDU");
                                         _print_parity(bp, CDU_REG_CDU_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_DMAE_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "DMAE");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_DMAE_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "DMAE");
                                         _print_parity(bp,
                                                       DMAE_REG_DMAE_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_IGU_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "IGU");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_IGU_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "IGU");
                                         if (CHIP_IS_E1x(bp))
                                                 _print_parity(bp,
                                                         HC_REG_HC_PRTY_STS);
                                         else
                                                 _print_parity(bp,
                                                         IGU_REG_IGU_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_MISC_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "MISC");
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_MISC_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "MISC");
                                         _print_parity(bp,
                                                       MISC_REG_MISC_PRTY_STS);
+                                        break;
                                 }
-                                break;
                         }
 
                         /* Clear the bit */
@@ -4563,40 +4576,49 @@ static int bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig,
                 }
         }
 
-        return par_num;
+        return res;
 }
 
-static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num,
-                                           bool *global, bool print)
+static bool bnx2x_check_blocks_with_parity3(struct bnx2x *bp, u32 sig,
+                                            int *par_num, bool *global,
+                                            bool print)
 {
-        int i = 0;
-        u32 cur_bit = 0;
+        bool res = false;
+        u32 cur_bit;
+        int i;
+
         for (i = 0; sig; i++) {
-                cur_bit = ((u32)0x1 << i);
+                cur_bit = (0x1UL << i);
                 if (sig & cur_bit) {
                         switch (cur_bit) {
                         case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY:
                                 if (print)
-                                        _print_next_block(par_num++, "MCP ROM");
+                                        _print_next_block((*par_num)++,
+                                                          "MCP ROM");
                                 *global = true;
+                                res |= true;
                                 break;
                         case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY:
                                 if (print)
-                                        _print_next_block(par_num++,
+                                        _print_next_block((*par_num)++,
                                                           "MCP UMP RX");
                                 *global = true;
+                                res |= true;
                                 break;
                         case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY:
                                 if (print)
-                                        _print_next_block(par_num++,
+                                        _print_next_block((*par_num)++,
                                                           "MCP UMP TX");
                                 *global = true;
+                                res |= true;
                                 break;
                         case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY:
                                 if (print)
-                                        _print_next_block(par_num++,
+                                        _print_next_block((*par_num)++,
                                                           "MCP SCPAD");
-                                *global = true;
+                                /* clear latched SCPAD PATIRY from MCP */
+                                REG_WR(bp, MISC_REG_AEU_CLR_LATCH_SIGNAL,
+                                       1UL << 10);
                                 break;
                         }
 
@@ -4605,45 +4627,50 @@ static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num,
                 }
         }
 
-        return par_num;
+        return res;
 }
 
-static int bnx2x_check_blocks_with_parity4(struct bnx2x *bp, u32 sig,
-                                            int par_num, bool print)
+static bool bnx2x_check_blocks_with_parity4(struct bnx2x *bp, u32 sig,
+                                            int *par_num, bool print)
 {
-        int i = 0;
-        u32 cur_bit = 0;
+        u32 cur_bit;
+        bool res;
+        int i;
+
+        res = false;
+
         for (i = 0; sig; i++) {
-                cur_bit = ((u32)0x1 << i);
+                cur_bit = (0x1UL << i);
                 if (sig & cur_bit) {
-                        switch (cur_bit) {
-                        case AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "PGLUE_B");
+                        res |= true; /* Each bit is real error! */
+                        if (print) {
+                                switch (cur_bit) {
+                                case AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR:
+                                        _print_next_block((*par_num)++,
+                                                          "PGLUE_B");
                                         _print_parity(bp,
-                                                PGLUE_B_REG_PGLUE_B_PRTY_STS);
-                                }
-                                break;
-                        case AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR:
-                                if (print) {
-                                        _print_next_block(par_num++, "ATC");
+                                                      PGLUE_B_REG_PGLUE_B_PRTY_STS);
+                                        break;
+                                case AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR:
+                                        _print_next_block((*par_num)++, "ATC");
                                         _print_parity(bp,
                                                       ATC_REG_ATC_PRTY_STS);
+                                        break;
                                 }
-                                break;
                         }
-
                         /* Clear the bit */
                         sig &= ~cur_bit;
                 }
         }
 
-        return par_num;
+        return res;
 }
 
 static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print,
                               u32 *sig)
 {
+        bool res = false;
+
         if ((sig[0] & HW_PRTY_ASSERT_SET_0) ||
             (sig[1] & HW_PRTY_ASSERT_SET_1) ||
             (sig[2] & HW_PRTY_ASSERT_SET_2) ||
@@ -4660,23 +4687,22 @@ static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print,
                 if (print)
                         netdev_err(bp->dev,
                                    "Parity errors detected in blocks: ");
-                par_num = bnx2x_check_blocks_with_parity0(bp,
-                        sig[0] & HW_PRTY_ASSERT_SET_0, par_num, print);
-                par_num = bnx2x_check_blocks_with_parity1(bp,
-                        sig[1] & HW_PRTY_ASSERT_SET_1, par_num, global, print);
-                par_num = bnx2x_check_blocks_with_parity2(bp,
-                        sig[2] & HW_PRTY_ASSERT_SET_2, par_num, print);
-                par_num = bnx2x_check_blocks_with_parity3(
-                        sig[3] & HW_PRTY_ASSERT_SET_3, par_num, global, print);
-                par_num = bnx2x_check_blocks_with_parity4(bp,
-                        sig[4] & HW_PRTY_ASSERT_SET_4, par_num, print);
+                res |= bnx2x_check_blocks_with_parity0(bp,
+                        sig[0] & HW_PRTY_ASSERT_SET_0, &par_num, print);
+                res |= bnx2x_check_blocks_with_parity1(bp,
+                        sig[1] & HW_PRTY_ASSERT_SET_1, &par_num, global, print);
+                res |= bnx2x_check_blocks_with_parity2(bp,
+                        sig[2] & HW_PRTY_ASSERT_SET_2, &par_num, print);
+                res |= bnx2x_check_blocks_with_parity3(bp,
+                        sig[3] & HW_PRTY_ASSERT_SET_3, &par_num, global, print);
+                res |= bnx2x_check_blocks_with_parity4(bp,
+                        sig[4] & HW_PRTY_ASSERT_SET_4, &par_num, print);
 
                 if (print)
                         pr_cont("\n");
+        }
 
-                return true;
-        } else
-                return false;
+        return res;
 }
 
 /**
@@ -7126,7 +7152,7 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
         int port = BP_PORT(bp);
         int init_phase = port ? PHASE_PORT1 : PHASE_PORT0;
         u32 low, high;
-        u32 val;
+        u32 val, reg;
 
         DP(NETIF_MSG_HW, "starting port init  port %d\n", port);
 
@@ -7271,6 +7297,17 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
         val |= CHIP_IS_E1(bp) ? 0 : 0x10;
         REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4, val);
 
+        /* SCPAD_PARITY should NOT trigger close the gates */
+        reg = port ? MISC_REG_AEU_ENABLE4_NIG_1 : MISC_REG_AEU_ENABLE4_NIG_0;
+        REG_WR(bp, reg,
+               REG_RD(bp, reg) &
+               ~AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY);
+
+        reg = port ? MISC_REG_AEU_ENABLE4_PXP_1 : MISC_REG_AEU_ENABLE4_PXP_0;
+        REG_WR(bp, reg,
+               REG_RD(bp, reg) &
+               ~AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY);
+
         bnx2x_init_block(bp, BLOCK_NIG, init_phase);
 
         if (!CHIP_IS_E1x(bp)) {
@@ -11685,9 +11722,6 @@ static int bnx2x_init_bp(struct bnx2x *bp)
 static int bnx2x_open(struct net_device *dev)
 {
         struct bnx2x *bp = netdev_priv(dev);
-        bool global = false;
-        int other_engine = BP_PATH(bp) ? 0 : 1;
-        bool other_load_status, load_status;
         int rc;
 
         bp->stats_init = true;
@@ -11703,6 +11737,10 @@ static int bnx2x_open(struct net_device *dev)
          * Parity recovery is only relevant for PF driver.
          */
         if (IS_PF(bp)) {
+                int other_engine = BP_PATH(bp) ? 0 : 1;
+                bool other_load_status, load_status;
+                bool global = false;
+
                 other_load_status = bnx2x_get_load_status(bp, other_engine);
                 load_status = bnx2x_get_load_status(bp, BP_PATH(bp));
                 if (!bnx2x_reset_is_done(bp, BP_PATH(bp)) ||
@@ -12080,7 +12118,6 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp)
         struct device *dev = &bp->pdev->dev;
 
         if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {
-                bp->flags |= USING_DAC_FLAG;
                 if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {
                         dev_err(dev, "dma_set_coherent_mask failed, aborting\n");
                         return -EIO;
@@ -12248,8 +12285,7 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,
                 NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA;
 
         dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX;
-        if (bp->flags & USING_DAC_FLAG)
-                dev->features |= NETIF_F_HIGHDMA;
+        dev->features |= NETIF_F_HIGHDMA;
 
         /* Add Loopback capability to the device */
         dev->hw_features |= NETIF_F_LOOPBACK;
@@ -12612,24 +12648,24 @@ static int set_max_cos_est(int chip_id)
                 return BNX2X_MULTI_TX_COS_E1X;
         case BCM57712:
         case BCM57712_MF:
-        case BCM57712_VF:
                 return BNX2X_MULTI_TX_COS_E2_E3A0;
         case BCM57800:
         case BCM57800_MF:
-        case BCM57800_VF:
         case BCM57810:
         case BCM57810_MF:
         case BCM57840_4_10:
         case BCM57840_2_20:
         case BCM57840_O:
         case BCM57840_MFO:
-        case BCM57810_VF:
         case BCM57840_MF:
-        case BCM57840_VF:
         case BCM57811:
         case BCM57811_MF:
-        case BCM57811_VF:
                 return BNX2X_MULTI_TX_COS_E3B0;
+        case BCM57712_VF:
+        case BCM57800_VF:
+        case BCM57810_VF:
+        case BCM57840_VF:
+        case BCM57811_VF:
                 return 1;
         default:
                 pr_err("Unknown board_type (%d), aborting\n", chip_id);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index 9ad012bdd915..bf08ad68b405 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -470,10 +470,10 @@ static int bnx2x_vfop_qdtor_cmd(struct bnx2x *bp,
                                  bnx2x_vfop_qdtor, cmd->done);
                 return bnx2x_vfop_transition(bp, vf, bnx2x_vfop_qdtor,
                                              cmd->block);
+        } else {
+                BNX2X_ERR("VF[%d] failed to add a vfop\n", vf->abs_vfid);
+                return -ENOMEM;
         }
-        DP(BNX2X_MSG_IOV, "VF[%d] failed to add a vfop. rc %d\n",
-           vf->abs_vfid, vfop->rc);
-        return -ENOMEM;
 }
 
 static void
@@ -3390,14 +3390,16 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac)
                 rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_ETH_MAC, true);
                 if (rc) {
                         BNX2X_ERR("failed to delete eth macs\n");
-                        return -EINVAL;
+                        rc = -EINVAL;
+                        goto out;
                 }
 
                 /* remove existing uc list macs */
                 rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_UC_LIST_MAC, true);
                 if (rc) {
                         BNX2X_ERR("failed to delete uc_list macs\n");
-                        return -EINVAL;
+                        rc = -EINVAL;
+                        goto out;
                 }
 
                 /* configure the new mac to device */
@@ -3405,6 +3407,7 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac)
                 bnx2x_set_mac_one(bp, (u8 *)&bulletin->mac, mac_obj, true,
                                   BNX2X_ETH_MAC, &ramrod_flags);
 
+out:
                 bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_MAC);
         }
 
@@ -3467,7 +3470,8 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
                                           &ramrod_flags);
                 if (rc) {
                         BNX2X_ERR("failed to delete vlans\n");
-                        return -EINVAL;
+                        rc = -EINVAL;
+                        goto out;
                 }
 
                 /* send queue update ramrod to configure default vlan and silent
@@ -3501,7 +3505,8 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
                         rc = bnx2x_config_vlan_mac(bp, &ramrod_param);
                         if (rc) {
                                 BNX2X_ERR("failed to configure vlan\n");
-                                return -EINVAL;
+                                rc =  -EINVAL;
+                                goto out;
                         }
 
                         /* configure default vlan to vf queue and set silent
@@ -3519,18 +3524,18 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
                 rc = bnx2x_queue_state_change(bp, &q_params);
                 if (rc) {
                         BNX2X_ERR("Failed to configure default VLAN\n");
-                        return rc;
+                        goto out;
                 }
 
                 /* clear the flag indicating that this VF needs its vlan
-                 * (will only be set if the HV configured th Vlan before vf was
-                 * and we were called because the VF came up later
+                 * (will only be set if the HV configured the Vlan before vf was
+                 * up and we were called because the VF came up later
                  */
+out:
                 vf->cfg_flags &= ~VF_CFG_VLAN;
-
                 bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN);
         }
-        return 0;
+        return rc;
 }
 
 /* crc is the first field in the bulletin board. Compute the crc over the
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index 86436c77af03..3b75070411aa 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -196,7 +196,7 @@ static void bnx2x_hw_stats_post(struct bnx2x *bp)
 
         } else if (bp->func_stx) {
                 *stats_comp = 0;
-                bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));
+                bnx2x_issue_dmae_with_comp(bp, dmae, stats_comp);
         }
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
index da16953eb2ec..28757dfacf0d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
@@ -980,7 +980,7 @@ static int bnx2x_copy32_vf_dmae(struct bnx2x *bp, u8 from_vf,
         dmae.len = len32;
 
         /* issue the command and wait for completion */
-        return bnx2x_issue_dmae_with_comp(bp, &dmae);
+        return bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
 }
 
 static void bnx2x_vf_mbx_resp(struct bnx2x *bp, struct bnx2x_virtf *vf)
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index 78d6d6b970e1..48f52882a22b 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -106,7 +106,6 @@
 #define XGMAC_DMA_HW_FEATURE    0x00000f58      /* Enabled Hardware Features */
 
 #define XGMAC_ADDR_AE           0x80000000
-#define XGMAC_MAX_FILTER_ADDR   31
 
 /* PMT Control and Status */
 #define XGMAC_PMT_POINTER_RESET 0x80000000
@@ -384,6 +383,7 @@ struct xgmac_priv {
         struct device *device;
         struct napi_struct napi;
 
+        int max_macs;
         struct xgmac_extra_stats xstats;
 
         spinlock_t stats_lock;
@@ -1291,14 +1291,12 @@ static void xgmac_set_rx_mode(struct net_device *dev)
         netdev_dbg(priv->dev, "# mcasts %d, # unicast %d\n",
                  netdev_mc_count(dev), netdev_uc_count(dev));
 
-        if (dev->flags & IFF_PROMISC) {
-                writel(XGMAC_FRAME_FILTER_PR, ioaddr + XGMAC_FRAME_FILTER);
-                return;
-        }
+        if (dev->flags & IFF_PROMISC)
+                value |= XGMAC_FRAME_FILTER_PR;
 
         memset(hash_filter, 0, sizeof(hash_filter));
 
-        if (netdev_uc_count(dev) > XGMAC_MAX_FILTER_ADDR) {
+        if (netdev_uc_count(dev) > priv->max_macs) {
                 use_hash = true;
                 value |= XGMAC_FRAME_FILTER_HUC | XGMAC_FRAME_FILTER_HPF;
         }
@@ -1321,7 +1319,7 @@ static void xgmac_set_rx_mode(struct net_device *dev)
                 goto out;
         }
 
-        if ((netdev_mc_count(dev) + reg - 1) > XGMAC_MAX_FILTER_ADDR) {
+        if ((netdev_mc_count(dev) + reg - 1) > priv->max_macs) {
                 use_hash = true;
                 value |= XGMAC_FRAME_FILTER_HMC | XGMAC_FRAME_FILTER_HPF;
         } else {
@@ -1342,8 +1340,8 @@ static void xgmac_set_rx_mode(struct net_device *dev)
         }
 
 out:
-        for (i = reg; i < XGMAC_MAX_FILTER_ADDR; i++)
-                xgmac_set_mac_addr(ioaddr, NULL, reg);
+        for (i = reg; i <= priv->max_macs; i++)
+                xgmac_set_mac_addr(ioaddr, NULL, i);
         for (i = 0; i < XGMAC_NUM_HASH; i++)
                 writel(hash_filter[i], ioaddr + XGMAC_HASH(i));
 
@@ -1761,6 +1759,13 @@ static int xgmac_probe(struct platform_device *pdev)
         uid = readl(priv->base + XGMAC_VERSION);
         netdev_info(ndev, "h/w version is 0x%x\n", uid);
 
+        /* Figure out how many valid mac address filter registers we have */
+        writel(1, priv->base + XGMAC_ADDR_HIGH(31));
+        if (readl(priv->base + XGMAC_ADDR_HIGH(31)) == 1)
+                priv->max_macs = 31;
+        else
+                priv->max_macs = 7;
+
         writel(0, priv->base + XGMAC_DMA_INTR_ENA);
         ndev->irq = platform_get_irq(pdev, 0);
         if (ndev->irq == -ENXIO) {
diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
index 5f5896e522d2..a7a941b1a655 100644
--- a/drivers/net/ethernet/davicom/dm9000.c
+++ b/drivers/net/ethernet/davicom/dm9000.c
@@ -158,18 +158,6 @@ static inline board_info_t *to_dm9000_board(struct net_device *dev)
 
 /* DM9000 network board routine ---------------------------- */
 
-static void
-dm9000_reset(board_info_t * db)
-{
-        dev_dbg(db->dev, "resetting device\n");
-
-        /* RESET device */
-        writeb(DM9000_NCR, db->io_addr);
-        udelay(200);
-        writeb(NCR_RST, db->io_data);
-        udelay(200);
-}
-
 /*
  *   Read a byte from I/O port
  */
@@ -191,6 +179,27 @@ iow(board_info_t * db, int reg, int value)
         writeb(value, db->io_data);
 }
 
+static void
+dm9000_reset(board_info_t *db)
+{
+        dev_dbg(db->dev, "resetting device\n");
+
+        /* Reset DM9000, see DM9000 Application Notes V1.22 Jun 11, 2004 page 29
+         * The essential point is that we have to do a double reset, and the
+         * instruction is to set LBK into MAC internal loopback mode.
+         */
+        iow(db, DM9000_NCR, 0x03);
+        udelay(100); /* Application note says at least 20 us */
+        if (ior(db, DM9000_NCR) & 1)
+                dev_err(db->dev, "dm9000 did not respond to first reset\n");
+
+        iow(db, DM9000_NCR, 0);
+        iow(db, DM9000_NCR, 0x03);
+        udelay(100);
+        if (ior(db, DM9000_NCR) & 1)
+                dev_err(db->dev, "dm9000 did not respond to second reset\n");
+}
+
 /* routines for sending block to chip */
 
 static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count)
@@ -744,15 +753,20 @@ static const struct ethtool_ops dm9000_ethtool_ops = {
 static void dm9000_show_carrier(board_info_t *db,
                                 unsigned carrier, unsigned nsr)
 {
+        int lpa;
         struct net_device *ndev = db->ndev;
+        struct mii_if_info *mii = &db->mii;
         unsigned ncr = dm9000_read_locked(db, DM9000_NCR);
 
-        if (carrier)
-                dev_info(db->dev, "%s: link up, %dMbps, %s-duplex, no LPA\n",
+        if (carrier) {
+                lpa = mii->mdio_read(mii->dev, mii->phy_id, MII_LPA);
+                dev_info(db->dev,
+                         "%s: link up, %dMbps, %s-duplex, lpa 0x%04X\n",
                          ndev->name, (nsr & NSR_SPEED) ? 10 : 100,
-                         (ncr & NCR_FDX) ? "full" : "half");
-        else
+                         (ncr & NCR_FDX) ? "full" : "half", lpa);
+        } else {
                 dev_info(db->dev, "%s: link down\n", ndev->name);
+        }
 }
 
 static void
@@ -890,9 +904,15 @@ dm9000_init_dm9000(struct net_device *dev)
                         (dev->features & NETIF_F_RXCSUM) ? RCSR_CSUM : 0);
 
         iow(db, DM9000_GPCR, GPCR_GEP_CNTL);    /* Let GPIO0 output */
+        iow(db, DM9000_GPR, 0);
 
-        dm9000_phy_write(dev, 0, MII_BMCR, BMCR_RESET); /* PHY RESET */
-        dm9000_phy_write(dev, 0, MII_DM_DSPCR, DSPCR_INIT_PARAM); /* Init */
+        /* If we are dealing with DM9000B, some extra steps are required: a
+         * manual phy reset, and setting init params.
+         */
+        if (db->type == TYPE_DM9000B) {
+                dm9000_phy_write(dev, 0, MII_BMCR, BMCR_RESET);
+                dm9000_phy_write(dev, 0, MII_DM_DSPCR, DSPCR_INIT_PARAM);
+        }
 
         ncr = (db->flags & DM9000_PLATF_EXT_PHY) ? NCR_EXT_PHY : 0;
 
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index bd0e0c0bbcd8..c08fd32bb8e5 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1198,7 +1198,6 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo)
 
         if (lancer_chip(adapter)) {
                 req->hdr.version = 1;
-                req->if_id = cpu_to_le16(adapter->if_handle);
         } else if (BEx_chip(adapter)) {
                 if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC)
                         req->hdr.version = 2;
@@ -1206,6 +1205,8 @@ int be_cmd_txq_create(struct be_adapter *adapter, struct be_tx_obj *txo)
                 req->hdr.version = 2;
         }
 
+        if (req->hdr.version > 0)
+                req->if_id = cpu_to_le16(adapter->if_handle);
         req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size);
         req->ulp_num = BE_ULP1_NUM;
         req->type = BE_ETH_TX_RING_TYPE_STANDARD;
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index c4eaadeb572f..9fbe4dda7a0e 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -88,6 +88,7 @@
 
 #include <asm/io.h>
 #include <asm/reg.h>
+#include <asm/mpc85xx.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <linux/module.h>
@@ -939,9 +940,8 @@ static void gfar_init_filer_table(struct gfar_private *priv)
         }
 }
 
-static void gfar_detect_errata(struct gfar_private *priv)
+static void __gfar_detect_errata_83xx(struct gfar_private *priv)
 {
-        struct device *dev = &priv->ofdev->dev;
         unsigned int pvr = mfspr(SPRN_PVR);
         unsigned int svr = mfspr(SPRN_SVR);
         unsigned int mod = (svr >> 16) & 0xfff6; /* w/o E suffix */
@@ -957,15 +957,33 @@ static void gfar_detect_errata(struct gfar_private *priv)
             (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
                 priv->errata |= GFAR_ERRATA_76;
 
-        /* MPC8313 and MPC837x all rev */
-        if ((pvr == 0x80850010 && mod == 0x80b0) ||
-            (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
-                priv->errata |= GFAR_ERRATA_A002;
+        /* MPC8313 Rev < 2.0 */
+        if (pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020)
+                priv->errata |= GFAR_ERRATA_12;
+}
 
-        /* MPC8313 Rev < 2.0, MPC8548 rev 2.0 */
-        if ((pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020) ||
-            (pvr == 0x80210020 && mod == 0x8030 && rev == 0x0020))
+static void __gfar_detect_errata_85xx(struct gfar_private *priv)
+{
+        unsigned int svr = mfspr(SPRN_SVR);
+
+        if ((SVR_SOC_VER(svr) == SVR_8548) && (SVR_REV(svr) == 0x20))
                 priv->errata |= GFAR_ERRATA_12;
+        if (((SVR_SOC_VER(svr) == SVR_P2020) && (SVR_REV(svr) < 0x20)) ||
+            ((SVR_SOC_VER(svr) == SVR_P2010) && (SVR_REV(svr) < 0x20)))
+                priv->errata |= GFAR_ERRATA_76; /* aka eTSEC 20 */
+}
+
+static void gfar_detect_errata(struct gfar_private *priv)
+{
+        struct device *dev = &priv->ofdev->dev;
+
+        /* no plans to fix */
+        priv->errata |= GFAR_ERRATA_A002;
+
+        if (pvr_version_is(PVR_VER_E500V1) || pvr_version_is(PVR_VER_E500V2))
+                __gfar_detect_errata_85xx(priv);
+        else /* non-mpc85xx parts, i.e. e300 core based */
+                __gfar_detect_errata_83xx(priv);
 
         if (priv->errata)
                 dev_info(dev, "enabled errata workarounds, flags: 0x%x\n",
@@ -1599,7 +1617,7 @@ static int __gfar_is_rx_idle(struct gfar_private *priv)
         /* Normaly TSEC should not hang on GRS commands, so we should
          * actually wait for IEVENT_GRSC flag.
          */
-        if (likely(!gfar_has_errata(priv, GFAR_ERRATA_A002)))
+        if (!gfar_has_errata(priv, GFAR_ERRATA_A002))
                 return 0;
 
         /* Read the eTSEC register at offset 0xD1C. If bits 7-14 are
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 86d51429a189..151e00cad113 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -2655,6 +2655,8 @@ static int igb_set_eee(struct net_device *netdev,
             (hw->phy.media_type != e1000_media_type_copper))
                 return -EOPNOTSUPP;
 
+        memset(&eee_curr, 0, sizeof(struct ethtool_eee));
+
         ret_val = igb_get_eee(netdev, &eee_curr);
         if (ret_val)
                 return ret_val;
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 7fb5677451f9..2c210ec35d59 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1131,15 +1131,13 @@ static void mib_counters_update(struct mv643xx_eth_private *mp)
         p->rx_discard += rdlp(mp, RX_DISCARD_FRAME_CNT);
         p->rx_overrun += rdlp(mp, RX_OVERRUN_FRAME_CNT);
         spin_unlock_bh(&mp->mib_counters_lock);
-
-        mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ);
 }
 
 static void mib_counters_timer_wrapper(unsigned long _mp)
 {
         struct mv643xx_eth_private *mp = (void *)_mp;
-
         mib_counters_update(mp);
+        mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ);
 }
 
 
@@ -2237,6 +2235,7 @@ static int mv643xx_eth_open(struct net_device *dev)
                 mp->int_mask |= INT_TX_END_0 << i;
         }
 
+        add_timer(&mp->mib_counters_timer);
         port_start(mp);
 
         wrlp(mp, INT_MASK_EXT, INT_EXT_LINK_PHY | INT_EXT_TX);
@@ -2534,6 +2533,7 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev,
         if (!ppdev)
                 return -ENOMEM;
         ppdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        ppdev->dev.of_node = pnp;
 
         ret = platform_device_add_resources(ppdev, &res, 1);
         if (ret)
@@ -2916,7 +2916,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         mp->mib_counters_timer.data = (unsigned long)mp;
         mp->mib_counters_timer.function = mib_counters_timer_wrapper;
         mp->mib_counters_timer.expires = jiffies + 30 * HZ;
-        add_timer(&mp->mib_counters_timer);
 
         spin_lock_init(&mp->mib_counters_lock);
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index dec455c8f627..afe2efa69c86 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -70,14 +70,15 @@ static int mlx4_alloc_pages(struct mlx4_en_priv *priv,
                 put_page(page);
                 return -ENOMEM;
         }
-        page_alloc->size = PAGE_SIZE << order;
+        page_alloc->page_size = PAGE_SIZE << order;
         page_alloc->page = page;
         page_alloc->dma = dma;
-        page_alloc->offset = frag_info->frag_align;
+        page_alloc->page_offset = frag_info->frag_align;
         /* Not doing get_page() for each frag is a big win
          * on asymetric workloads.
          */
-        atomic_set(&page->_count, page_alloc->size / frag_info->frag_stride);
+        atomic_set(&page->_count,
+                   page_alloc->page_size / frag_info->frag_stride);
         return 0;
 }
 
@@ -96,16 +97,19 @@ static int mlx4_en_alloc_frags(struct mlx4_en_priv *priv,
         for (i = 0; i < priv->num_frags; i++) {
                 frag_info = &priv->frag_info[i];
                 page_alloc[i] = ring_alloc[i];
-                page_alloc[i].offset += frag_info->frag_stride;
-                if (page_alloc[i].offset + frag_info->frag_stride <= ring_alloc[i].size)
+                page_alloc[i].page_offset += frag_info->frag_stride;
+
+                if (page_alloc[i].page_offset + frag_info->frag_stride <=
+                    ring_alloc[i].page_size)
                         continue;
+
                 if (mlx4_alloc_pages(priv, &page_alloc[i], frag_info, gfp))
                         goto out;
         }
 
         for (i = 0; i < priv->num_frags; i++) {
                 frags[i] = ring_alloc[i];
-                dma = ring_alloc[i].dma + ring_alloc[i].offset;
+                dma = ring_alloc[i].dma + ring_alloc[i].page_offset;
                 ring_alloc[i] = page_alloc[i];
                 rx_desc->data[i].addr = cpu_to_be64(dma);
         }
@@ -117,7 +121,7 @@ out:
                 frag_info = &priv->frag_info[i];
                 if (page_alloc[i].page != ring_alloc[i].page) {
                         dma_unmap_page(priv->ddev, page_alloc[i].dma,
-                                page_alloc[i].size, PCI_DMA_FROMDEVICE);
+                                page_alloc[i].page_size, PCI_DMA_FROMDEVICE);
                         page = page_alloc[i].page;
                         atomic_set(&page->_count, 1);
                         put_page(page);
@@ -131,10 +135,12 @@ static void mlx4_en_free_frag(struct mlx4_en_priv *priv,
                               int i)
 {
         const struct mlx4_en_frag_info *frag_info = &priv->frag_info[i];
+        u32 next_frag_end = frags[i].page_offset + 2 * frag_info->frag_stride;
+
 
-        if (frags[i].offset + frag_info->frag_stride > frags[i].size)
-                dma_unmap_page(priv->ddev, frags[i].dma, frags[i].size,
-                                         PCI_DMA_FROMDEVICE);
+        if (next_frag_end > frags[i].page_size)
+                dma_unmap_page(priv->ddev, frags[i].dma, frags[i].page_size,
+                               PCI_DMA_FROMDEVICE);
 
         if (frags[i].page)
                 put_page(frags[i].page);
@@ -161,7 +167,7 @@ out:
 
                 page_alloc = &ring->page_alloc[i];
                 dma_unmap_page(priv->ddev, page_alloc->dma,
-                               page_alloc->size, PCI_DMA_FROMDEVICE);
+                               page_alloc->page_size, PCI_DMA_FROMDEVICE);
                 page = page_alloc->page;
                 atomic_set(&page->_count, 1);
                 put_page(page);
@@ -184,10 +190,11 @@ static void mlx4_en_destroy_allocator(struct mlx4_en_priv *priv,
                        i, page_count(page_alloc->page));
 
                 dma_unmap_page(priv->ddev, page_alloc->dma,
-                                page_alloc->size, PCI_DMA_FROMDEVICE);
-                while (page_alloc->offset + frag_info->frag_stride < page_alloc->size) {
+                                page_alloc->page_size, PCI_DMA_FROMDEVICE);
+                while (page_alloc->page_offset + frag_info->frag_stride <
+                       page_alloc->page_size) {
                         put_page(page_alloc->page);
-                        page_alloc->offset += frag_info->frag_stride;
+                        page_alloc->page_offset += frag_info->frag_stride;
                 }
                 page_alloc->page = NULL;
         }
@@ -478,7 +485,7 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
                 /* Save page reference in skb */
                 __skb_frag_set_page(&skb_frags_rx[nr], frags[nr].page);
                 skb_frag_size_set(&skb_frags_rx[nr], frag_info->frag_size);
-                skb_frags_rx[nr].page_offset = frags[nr].offset;
+                skb_frags_rx[nr].page_offset = frags[nr].page_offset;
                 skb->truesize += frag_info->frag_stride;
                 frags[nr].page = NULL;
         }
@@ -517,7 +524,7 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv,
 
         /* Get pointer to first fragment so we could copy the headers into the
          * (linear part of the) skb */
-        va = page_address(frags[0].page) + frags[0].offset;
+        va = page_address(frags[0].page) + frags[0].page_offset;
 
         if (length <= SMALL_PACKET_SIZE) {
                 /* We are copying all relevant data to the skb - temporarily
@@ -645,7 +652,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                         dma_sync_single_for_cpu(priv->ddev, dma, sizeof(*ethh),
                                                 DMA_FROM_DEVICE);
                         ethh = (struct ethhdr *)(page_address(frags[0].page) +
-                                                 frags[0].offset);
+                                                 frags[0].page_offset);
 
                         if (is_multicast_ether_addr(ethh->h_dest)) {
                                 struct mlx4_mac_entry *entry;
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 5e0aa569306a..bf06e3610d27 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -237,8 +237,8 @@ struct mlx4_en_tx_desc {
 struct mlx4_en_rx_alloc {
         struct page     *page;
         dma_addr_t      dma;
-        u32             offset;
-        u32             size;
+        u32             page_offset;
+        u32             page_size;
 };
 
 struct mlx4_en_tx_ring {
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/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c
index bd1a2d2bc2ae..ea54d95e5b9f 100644
--- a/drivers/net/ethernet/moxa/moxart_ether.c
+++ b/drivers/net/ethernet/moxa/moxart_ether.c
@@ -448,7 +448,8 @@ static int moxart_mac_probe(struct platform_device *pdev)
         irq = irq_of_parse_and_map(node, 0);
         if (irq <= 0) {
                 netdev_err(ndev, "irq_of_parse_and_map failed\n");
-                return -EINVAL;
+                ret = -EINVAL;
+                goto irq_map_fail;
         }
 
         priv = netdev_priv(ndev);
@@ -472,24 +473,32 @@ static int moxart_mac_probe(struct platform_device *pdev)
         priv->tx_desc_base = dma_alloc_coherent(NULL, TX_REG_DESC_SIZE *
                                                 TX_DESC_NUM, &priv->tx_base,
                                                 GFP_DMA | GFP_KERNEL);
-        if (priv->tx_desc_base == NULL)
+        if (priv->tx_desc_base == NULL) {
+                ret = -ENOMEM;
                 goto init_fail;
+        }
 
         priv->rx_desc_base = dma_alloc_coherent(NULL, RX_REG_DESC_SIZE *
                                                 RX_DESC_NUM, &priv->rx_base,
                                                 GFP_DMA | GFP_KERNEL);
-        if (priv->rx_desc_base == NULL)
+        if (priv->rx_desc_base == NULL) {
+                ret = -ENOMEM;
                 goto init_fail;
+        }
 
         priv->tx_buf_base = kmalloc(priv->tx_buf_size * TX_DESC_NUM,
                                     GFP_ATOMIC);
-        if (!priv->tx_buf_base)
+        if (!priv->tx_buf_base) {
+                ret = -ENOMEM;
                 goto init_fail;
+        }
 
         priv->rx_buf_base = kmalloc(priv->rx_buf_size * RX_DESC_NUM,
                                     GFP_ATOMIC);
-        if (!priv->rx_buf_base)
+        if (!priv->rx_buf_base) {
+                ret = -ENOMEM;
                 goto init_fail;
+        }
 
         platform_set_drvdata(pdev, ndev);
 
@@ -522,7 +531,8 @@ static int moxart_mac_probe(struct platform_device *pdev)
 init_fail:
         netdev_err(ndev, "init failed\n");
         moxart_mac_free_memory(ndev);
-
+irq_map_fail:
+        free_netdev(ndev);
         return ret;
 }
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index ebe4c86e5230..ff83a9fcd4c5 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -665,7 +665,7 @@ static int qlcnic_set_channels(struct net_device *dev,
                         return err;
         }
 
-        if (channel->tx_count) {
+        if (qlcnic_82xx_check(adapter) && channel->tx_count) {
                 err = qlcnic_validate_max_tx_rings(adapter, channel->tx_count);
                 if (err)
                         return err;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 21d00a0449a1..9e61eb867452 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2257,7 +2257,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         err = qlcnic_alloc_adapter_resources(adapter);
         if (err)
-                goto err_out_free_netdev;
+                goto err_out_free_wq;
 
         adapter->dev_rst_time = jiffies;
         adapter->ahw->revision_id = pdev->revision;
@@ -2396,6 +2396,9 @@ err_out_disable_msi:
 err_out_free_hw:
         qlcnic_free_adapter_resources(adapter);
 
+err_out_free_wq:
+        destroy_workqueue(adapter->qlcnic_wq);
+
 err_out_free_netdev:
         free_netdev(netdev);
 
@@ -3648,11 +3651,6 @@ int qlcnic_validate_max_tx_rings(struct qlcnic_adapter *adapter, u32 txq)
         u8 max_hw = QLCNIC_MAX_TX_RINGS;
         u32 max_allowed;
 
-        if (!qlcnic_82xx_check(adapter)) {
-                netdev_err(netdev, "No Multi TX-Q support\n");
-                return -EINVAL;
-        }
-
         if (!qlcnic_use_msi_x && !qlcnic_use_msi) {
                 netdev_err(netdev, "No Multi TX-Q support in INT-x mode\n");
                 return -EINVAL;
@@ -3692,8 +3690,7 @@ int qlcnic_validate_max_rss(struct qlcnic_adapter *adapter,
         u8 max_hw = adapter->ahw->max_rx_ques;
         u32 max_allowed;
 
-        if (qlcnic_82xx_check(adapter) && !qlcnic_use_msi_x &&
-            !qlcnic_use_msi) {
+        if (!qlcnic_use_msi_x && !qlcnic_use_msi) {
                 netdev_err(netdev, "No RSS support in INT-x mode\n");
                 return -EINVAL;
         }
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 5cd831ebfa83..b57c278d3b46 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -688,12 +688,16 @@ static struct sh_eth_cpu_data r8a7740_data = {
         .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
                           EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE |
                           EESR_TDE | EESR_ECI,
+        .fdr_value      = 0x0000070f,
+        .rmcr_value     = 0x00000001,
 
         .apr            = 1,
         .mpr            = 1,
         .tpauser        = 1,
         .bculr          = 1,
         .hw_swap        = 1,
+        .rpadir         = 1,
+        .rpadir_value   = 2 << 16,
         .no_trimd       = 1,
         .no_ade         = 1,
         .tsu            = 1,
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 9f18ae984f9e..21f9ad6392e9 100644
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -444,6 +444,18 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = {
         EF10_DMA_STAT(rx_align_error, RX_ALIGN_ERROR_PKTS),
         EF10_DMA_STAT(rx_length_error, RX_LENGTH_ERROR_PKTS),
         EF10_DMA_STAT(rx_nodesc_drops, RX_NODESC_DROPS),
+        EF10_DMA_STAT(rx_pm_trunc_bb_overflow, PM_TRUNC_BB_OVERFLOW),
+        EF10_DMA_STAT(rx_pm_discard_bb_overflow, PM_DISCARD_BB_OVERFLOW),
+        EF10_DMA_STAT(rx_pm_trunc_vfifo_full, PM_TRUNC_VFIFO_FULL),
+        EF10_DMA_STAT(rx_pm_discard_vfifo_full, PM_DISCARD_VFIFO_FULL),
+        EF10_DMA_STAT(rx_pm_trunc_qbb, PM_TRUNC_QBB),
+        EF10_DMA_STAT(rx_pm_discard_qbb, PM_DISCARD_QBB),
+        EF10_DMA_STAT(rx_pm_discard_mapping, PM_DISCARD_MAPPING),
+        EF10_DMA_STAT(rx_dp_q_disabled_packets, RXDP_Q_DISABLED_PKTS),
+        EF10_DMA_STAT(rx_dp_di_dropped_packets, RXDP_DI_DROPPED_PKTS),
+        EF10_DMA_STAT(rx_dp_streaming_packets, RXDP_STREAMING_PKTS),
+        EF10_DMA_STAT(rx_dp_emerg_fetch, RXDP_EMERGENCY_FETCH_CONDITIONS),
+        EF10_DMA_STAT(rx_dp_emerg_wait, RXDP_EMERGENCY_WAIT_CONDITIONS),
 };
 
 #define HUNT_COMMON_STAT_MASK ((1ULL << EF10_STAT_tx_bytes) |           \
@@ -498,44 +510,72 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = {
 #define HUNT_40G_EXTRA_STAT_MASK ((1ULL << EF10_STAT_rx_align_error) |  \
                                   (1ULL << EF10_STAT_rx_length_error))
 
-#if BITS_PER_LONG == 64
-#define STAT_MASK_BITMAP(bits) (bits)
-#else
-#define STAT_MASK_BITMAP(bits) (bits) & 0xffffffff, (bits) >> 32
-#endif
-
-static const unsigned long *efx_ef10_stat_mask(struct efx_nic *efx)
-{
-        static const unsigned long hunt_40g_stat_mask[] = {
-                STAT_MASK_BITMAP(HUNT_COMMON_STAT_MASK |
-                                 HUNT_40G_EXTRA_STAT_MASK)
-        };
-        static const unsigned long hunt_10g_only_stat_mask[] = {
-                STAT_MASK_BITMAP(HUNT_COMMON_STAT_MASK |
-                                 HUNT_10G_ONLY_STAT_MASK)
-        };
+/* These statistics are only provided if the firmware supports the
+ * capability PM_AND_RXDP_COUNTERS.
+ */
+#define HUNT_PM_AND_RXDP_STAT_MASK (                                    \
+        (1ULL << EF10_STAT_rx_pm_trunc_bb_overflow) |                   \
+        (1ULL << EF10_STAT_rx_pm_discard_bb_overflow) |                 \
+        (1ULL << EF10_STAT_rx_pm_trunc_vfifo_full) |                    \
+        (1ULL << EF10_STAT_rx_pm_discard_vfifo_full) |                  \
+        (1ULL << EF10_STAT_rx_pm_trunc_qbb) |                           \
+        (1ULL << EF10_STAT_rx_pm_discard_qbb) |                         \
+        (1ULL << EF10_STAT_rx_pm_discard_mapping) |                     \
+        (1ULL << EF10_STAT_rx_dp_q_disabled_packets) |                  \
+        (1ULL << EF10_STAT_rx_dp_di_dropped_packets) |                  \
+        (1ULL << EF10_STAT_rx_dp_streaming_packets) |                   \
+        (1ULL << EF10_STAT_rx_dp_emerg_fetch) |                         \
+        (1ULL << EF10_STAT_rx_dp_emerg_wait))
+
+static u64 efx_ef10_raw_stat_mask(struct efx_nic *efx)
+{
+        u64 raw_mask = HUNT_COMMON_STAT_MASK;
         u32 port_caps = efx_mcdi_phy_get_caps(efx);
+        struct efx_ef10_nic_data *nic_data = efx->nic_data;
 
         if (port_caps & (1 << MC_CMD_PHY_CAP_40000FDX_LBN))
-                return hunt_40g_stat_mask;
+                raw_mask |= HUNT_40G_EXTRA_STAT_MASK;
         else
-                return hunt_10g_only_stat_mask;
+                raw_mask |= HUNT_10G_ONLY_STAT_MASK;
+
+        if (nic_data->datapath_caps &
+            (1 << MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_LBN))
+                raw_mask |= HUNT_PM_AND_RXDP_STAT_MASK;
+
+        return raw_mask;
+}
+
+static void efx_ef10_get_stat_mask(struct efx_nic *efx, unsigned long *mask)
+{
+        u64 raw_mask = efx_ef10_raw_stat_mask(efx);
+
+#if BITS_PER_LONG == 64
+        mask[0] = raw_mask;
+#else
+        mask[0] = raw_mask & 0xffffffff;
+        mask[1] = raw_mask >> 32;
+#endif
 }
 
 static size_t efx_ef10_describe_stats(struct efx_nic *efx, u8 *names)
 {
+        DECLARE_BITMAP(mask, EF10_STAT_COUNT);
+
+        efx_ef10_get_stat_mask(efx, mask);
         return efx_nic_describe_stats(efx_ef10_stat_desc, EF10_STAT_COUNT,
-                                      efx_ef10_stat_mask(efx), names);
+                                      mask, names);
 }
 
 static int efx_ef10_try_update_nic_stats(struct efx_nic *efx)
 {
         struct efx_ef10_nic_data *nic_data = efx->nic_data;
-        const unsigned long *stats_mask = efx_ef10_stat_mask(efx);
+        DECLARE_BITMAP(mask, EF10_STAT_COUNT);
         __le64 generation_start, generation_end;
         u64 *stats = nic_data->stats;
         __le64 *dma_stats;
 
+        efx_ef10_get_stat_mask(efx, mask);
+
         dma_stats = efx->stats_buffer.addr;
         nic_data = efx->nic_data;
 
@@ -543,8 +583,9 @@ static int efx_ef10_try_update_nic_stats(struct efx_nic *efx)
         if (generation_end == EFX_MC_STATS_GENERATION_INVALID)
                 return 0;
         rmb();
-        efx_nic_update_stats(efx_ef10_stat_desc, EF10_STAT_COUNT, stats_mask,
+        efx_nic_update_stats(efx_ef10_stat_desc, EF10_STAT_COUNT, mask,
                              stats, efx->stats_buffer.addr, false);
+        rmb();
         generation_start = dma_stats[MC_CMD_MAC_GENERATION_START];
         if (generation_end != generation_start)
                 return -EAGAIN;
@@ -563,12 +604,14 @@ static int efx_ef10_try_update_nic_stats(struct efx_nic *efx)
 static size_t efx_ef10_update_stats(struct efx_nic *efx, u64 *full_stats,
                                     struct rtnl_link_stats64 *core_stats)
 {
-        const unsigned long *mask = efx_ef10_stat_mask(efx);
+        DECLARE_BITMAP(mask, EF10_STAT_COUNT);
         struct efx_ef10_nic_data *nic_data = efx->nic_data;
         u64 *stats = nic_data->stats;
         size_t stats_count = 0, index;
         int retry;
 
+        efx_ef10_get_stat_mask(efx, mask);
+
         /* If we're unlucky enough to read statistics during the DMA, wait
          * up to 10ms for it to finish (typically takes <500us)
          */
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
index c082562dbf4e..366c8e3e3784 100644
--- a/drivers/net/ethernet/sfc/mcdi.c
+++ b/drivers/net/ethernet/sfc/mcdi.c
@@ -963,7 +963,7 @@ static int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating,
                                bool *was_attached)
 {
         MCDI_DECLARE_BUF(inbuf, MC_CMD_DRV_ATTACH_IN_LEN);
-        MCDI_DECLARE_BUF(outbuf, MC_CMD_DRV_ATTACH_OUT_LEN);
+        MCDI_DECLARE_BUF(outbuf, MC_CMD_DRV_ATTACH_EXT_OUT_LEN);
         size_t outlen;
         int rc;
 
@@ -981,6 +981,22 @@ static int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating,
                 goto fail;
         }
 
+        /* We currently assume we have control of the external link
+         * and are completely trusted by firmware.  Abort probing
+         * if that's not true for this function.
+         */
+        if (driver_operating &&
+            outlen >= MC_CMD_DRV_ATTACH_EXT_OUT_LEN &&
+            (MCDI_DWORD(outbuf, DRV_ATTACH_EXT_OUT_FUNC_FLAGS) &
+             (1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_LINKCTRL |
+              1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_TRUSTED)) !=
+            (1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_LINKCTRL |
+             1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_TRUSTED)) {
+                netif_err(efx, probe, efx->net_dev,
+                          "This driver version only supports one function per port\n");
+                return -ENODEV;
+        }
+
         if (was_attached != NULL)
                 *was_attached = MCDI_DWORD(outbuf, DRV_ATTACH_OUT_OLD_STATE);
         return 0;
diff --git a/drivers/net/ethernet/sfc/mcdi_pcol.h b/drivers/net/ethernet/sfc/mcdi_pcol.h
index b5cf62492f8e..e0a63ddb7a6c 100644
--- a/drivers/net/ethernet/sfc/mcdi_pcol.h
+++ b/drivers/net/ethernet/sfc/mcdi_pcol.h
@@ -2574,8 +2574,58 @@
 #define          MC_CMD_MAC_RX_LANES01_DISP_ERR  0x39 /* enum */
 #define          MC_CMD_MAC_RX_LANES23_DISP_ERR  0x3a /* enum */
 #define          MC_CMD_MAC_RX_MATCH_FAULT  0x3b /* enum */
-#define          MC_CMD_GMAC_DMABUF_START  0x40 /* enum */
-#define          MC_CMD_GMAC_DMABUF_END    0x5f /* enum */
+/* enum: PM trunc_bb_overflow counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
+ * capability only.
+ */
+#define          MC_CMD_MAC_PM_TRUNC_BB_OVERFLOW  0x3c
+/* enum: PM discard_bb_overflow counter. Valid for EF10 with
+ * PM_AND_RXDP_COUNTERS capability only.
+ */
+#define          MC_CMD_MAC_PM_DISCARD_BB_OVERFLOW  0x3d
+/* enum: PM trunc_vfifo_full counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
+ * capability only.
+ */
+#define          MC_CMD_MAC_PM_TRUNC_VFIFO_FULL  0x3e
+/* enum: PM discard_vfifo_full counter. Valid for EF10 with
+ * PM_AND_RXDP_COUNTERS capability only.
+ */
+#define          MC_CMD_MAC_PM_DISCARD_VFIFO_FULL  0x3f
+/* enum: PM trunc_qbb counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
+ * capability only.
+ */
+#define          MC_CMD_MAC_PM_TRUNC_QBB  0x40
+/* enum: PM discard_qbb counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
+ * capability only.
+ */
+#define          MC_CMD_MAC_PM_DISCARD_QBB  0x41
+/* enum: PM discard_mapping counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
+ * capability only.
+ */
+#define          MC_CMD_MAC_PM_DISCARD_MAPPING  0x42
+/* enum: RXDP counter: Number of packets dropped due to the queue being
+ * disabled. Valid for EF10 with PM_AND_RXDP_COUNTERS capability only.
+ */
+#define          MC_CMD_MAC_RXDP_Q_DISABLED_PKTS  0x43
+/* enum: RXDP counter: Number of packets dropped by the DICPU. Valid for EF10
+ * with PM_AND_RXDP_COUNTERS capability only.
+ */
+#define          MC_CMD_MAC_RXDP_DI_DROPPED_PKTS  0x45
+/* enum: RXDP counter: Number of non-host packets. Valid for EF10 with
+ * PM_AND_RXDP_COUNTERS capability only.
+ */
+#define          MC_CMD_MAC_RXDP_STREAMING_PKTS  0x46
+/* enum: RXDP counter: Number of times an emergency descriptor fetch was
+ * performed. Valid for EF10 with PM_AND_RXDP_COUNTERS capability only.
+ */
+#define          MC_CMD_MAC_RXDP_EMERGENCY_FETCH_CONDITIONS  0x47
+/* enum: RXDP counter: Number of times the DPCPU waited for an existing
+ * descriptor fetch. Valid for EF10 with PM_AND_RXDP_COUNTERS capability only.
+ */
+#define          MC_CMD_MAC_RXDP_EMERGENCY_WAIT_CONDITIONS  0x48
+/* enum: Start of GMAC stats buffer space, for Siena only. */
+#define          MC_CMD_GMAC_DMABUF_START  0x40
+/* enum: End of GMAC stats buffer space, for Siena only. */
+#define          MC_CMD_GMAC_DMABUF_END    0x5f
 #define          MC_CMD_MAC_GENERATION_END 0x60 /* enum */
 #define          MC_CMD_MAC_NSTATS  0x61 /* enum */
 
@@ -5065,6 +5115,8 @@
 #define        MC_CMD_GET_CAPABILITIES_OUT_RX_BATCHING_WIDTH 1
 #define        MC_CMD_GET_CAPABILITIES_OUT_MCAST_FILTER_CHAINING_LBN 26
 #define        MC_CMD_GET_CAPABILITIES_OUT_MCAST_FILTER_CHAINING_WIDTH 1
+#define        MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_LBN 27
+#define        MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_WIDTH 1
 /* RxDPCPU firmware id. */
 #define       MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_OFST 4
 #define       MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_LEN 2
diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
index e7dbd2dd202e..9826594c8a48 100644
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -469,8 +469,7 @@ size_t efx_nic_describe_stats(const struct efx_hw_stat_desc *desc, size_t count,
  * @count: Length of the @desc array
  * @mask: Bitmask of which elements of @desc are enabled
  * @stats: Buffer to update with the converted statistics.  The length
- *      of this array must be at least the number of set bits in the
- *      first @count bits of @mask.
+ *      of this array must be at least @count.
  * @dma_buf: DMA buffer containing hardware statistics
  * @accumulate: If set, the converted values will be added rather than
  *      directly stored to the corresponding elements of @stats
@@ -503,11 +502,9 @@ void efx_nic_update_stats(const struct efx_hw_stat_desc *desc, size_t count,
                         }
 
                         if (accumulate)
-                                *stats += val;
+                                stats[index] += val;
                         else
-                                *stats = val;
+                                stats[index] = val;
                 }
-
-                ++stats;
         }
 }
diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
index fda29d39032f..890bbbe8320e 100644
--- a/drivers/net/ethernet/sfc/nic.h
+++ b/drivers/net/ethernet/sfc/nic.h
@@ -386,6 +386,18 @@ enum {
         EF10_STAT_rx_align_error,
         EF10_STAT_rx_length_error,
         EF10_STAT_rx_nodesc_drops,
+        EF10_STAT_rx_pm_trunc_bb_overflow,
+        EF10_STAT_rx_pm_discard_bb_overflow,
+        EF10_STAT_rx_pm_trunc_vfifo_full,
+        EF10_STAT_rx_pm_discard_vfifo_full,
+        EF10_STAT_rx_pm_trunc_qbb,
+        EF10_STAT_rx_pm_discard_qbb,
+        EF10_STAT_rx_pm_discard_mapping,
+        EF10_STAT_rx_dp_q_disabled_packets,
+        EF10_STAT_rx_dp_di_dropped_packets,
+        EF10_STAT_rx_dp_streaming_packets,
+        EF10_STAT_rx_dp_emerg_fetch,
+        EF10_STAT_rx_dp_emerg_wait,
         EF10_STAT_COUNT
 };
 
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 5730fe2445a6..98eedb90cdc3 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -1124,8 +1124,7 @@ static const char * chip_ids[ 16 ] =  {
                         void __iomem *__ioaddr = ioaddr;                \
                         if (__len >= 2 && (unsigned long)__ptr & 2) {   \
                                 __len -= 2;                             \
-                                SMC_outw(*(u16 *)__ptr, ioaddr,         \
-                                        DATA_REG(lp));          \
+                                SMC_outsw(ioaddr, DATA_REG(lp), __ptr, 1); \
                                 __ptr += 2;                             \
                         }                                               \
                         if (SMC_CAN_USE_DATACS && lp->datacs)           \
@@ -1133,8 +1132,7 @@ static const char * chip_ids[ 16 ] =  {
                         SMC_outsl(__ioaddr, DATA_REG(lp), __ptr, __len>>2); \
                         if (__len & 2) {                                \
                                 __ptr += (__len & ~3);                  \
-                                SMC_outw(*((u16 *)__ptr), ioaddr,       \
-                                         DATA_REG(lp));         \
+                                SMC_outsw(ioaddr, DATA_REG(lp), __ptr, 1); \
                         }                                               \
                 } else if (SMC_16BIT(lp))                               \
                         SMC_outsw(ioaddr, DATA_REG(lp), p, (l) >> 1);   \
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 79974e31187a..cc3ce557e4aa 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -639,13 +639,6 @@ void cpsw_rx_handler(void *token, int len, int status)
 static irqreturn_t cpsw_interrupt(int irq, void *dev_id)
 {
         struct cpsw_priv *priv = dev_id;
-        u32 rx, tx, rx_thresh;
-
-        rx_thresh = __raw_readl(&priv->wr_regs->rx_thresh_stat);
-        rx = __raw_readl(&priv->wr_regs->rx_stat);
-        tx = __raw_readl(&priv->wr_regs->tx_stat);
-        if (!rx_thresh && !rx && !tx)
-                return IRQ_NONE;
 
         cpsw_intr_disable(priv);
         if (priv->irq_enabled == true) {
@@ -1169,9 +1162,9 @@ static int cpsw_ndo_open(struct net_device *ndev)
                 }
         }
 
+        napi_enable(&priv->napi);
         cpdma_ctlr_start(priv->dma);
         cpsw_intr_enable(priv);
-        napi_enable(&priv->napi);
         cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_RX);
         cpdma_ctlr_eoi(priv->dma, CPDMA_EOI_TX);
 
@@ -1771,8 +1764,8 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
         }
         data->mac_control = prop;
 
-        if (!of_property_read_u32(node, "dual_emac", &prop))
-                data->dual_emac = prop;
+        if (of_property_read_bool(node, "dual_emac"))
+                data->dual_emac = 1;
 
         /*
          * Populate all the child nodes here...
@@ -1782,7 +1775,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
         if (ret)
                 pr_warn("Doesn't have any child node\n");
 
-        for_each_node_by_name(slave_node, "slave") {
+        for_each_child_of_node(node, slave_node) {
                 struct cpsw_slave_data *slave_data = data->slave_data + i;
                 const void *mac_addr = NULL;
                 u32 phyid;
@@ -1791,6 +1784,10 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                 struct device_node *mdio_node;
                 struct platform_device *mdio;
 
+                /* This is no slave child node, continue */
+                if (strcmp(slave_node->name, "slave"))
+                        continue;
+
                 parp = of_get_property(slave_node, "phy_id", &lenp);
                 if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) {
                         pr_err("Missing slave[%d] phy_id property\n", i);
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 67df09ea9d04..6a32ef9d63ae 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -876,8 +876,7 @@ static void emac_dev_mcast_set(struct net_device *ndev)
                     netdev_mc_count(ndev) > EMAC_DEF_MAX_MULTICAST_ADDRESSES) {
                         mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST);
                         emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL);
-                }
-                if (!netdev_mc_empty(ndev)) {
+                } else if (!netdev_mc_empty(ndev)) {
                         struct netdev_hw_addr *ha;
 
                         mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST);
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 0721e72f9299..5af1c3e5032a 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -975,7 +975,6 @@ static int yam_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                         return -EINVAL;         /* Cannot change this parameter when up */
                 if ((ym = kmalloc(sizeof(struct yamdrv_ioctl_mcs), GFP_KERNEL)) == NULL)
                         return -ENOBUFS;
-                ym->bitrate = 9600;
                 if (copy_from_user(ym, ifr->ifr_data, sizeof(struct yamdrv_ioctl_mcs))) {
                         kfree(ym);
                         return -EFAULT;
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 42e6deee6db5..0632d34905c7 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -82,7 +82,6 @@ struct mrf24j40 {
 
         struct mutex buffer_mutex; /* only used to protect buf */
         struct completion tx_complete;
-        struct work_struct irqwork;
         u8 *buf; /* 3 bytes. Used for SPI single-register transfers. */
 };
 
@@ -344,6 +343,8 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb)
         if (ret)
                 goto err;
 
+        INIT_COMPLETION(devrec->tx_complete);
+
         /* Set TXNTRIG bit of TXNCON to send packet */
         ret = read_short_reg(devrec, REG_TXNCON, &val);
         if (ret)
@@ -354,8 +355,6 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb)
                 val |= 0x4;
         write_short_reg(devrec, REG_TXNCON, val);
 
-        INIT_COMPLETION(devrec->tx_complete);
-
         /* Wait for the device to send the TX complete interrupt. */
         ret = wait_for_completion_interruptible_timeout(
                                                 &devrec->tx_complete,
@@ -590,17 +589,6 @@ static struct ieee802154_ops mrf24j40_ops = {
 static irqreturn_t mrf24j40_isr(int irq, void *data)
 {
         struct mrf24j40 *devrec = data;
-
-        disable_irq_nosync(irq);
-
-        schedule_work(&devrec->irqwork);
-
-        return IRQ_HANDLED;
-}
-
-static void mrf24j40_isrwork(struct work_struct *work)
-{
-        struct mrf24j40 *devrec = container_of(work, struct mrf24j40, irqwork);
         u8 intstat;
         int ret;
 
@@ -618,7 +606,7 @@ static void mrf24j40_isrwork(struct work_struct *work)
                 mrf24j40_handle_rx(devrec);
 
 out:
-        enable_irq(devrec->spi->irq);
+        return IRQ_HANDLED;
 }
 
 static int mrf24j40_probe(struct spi_device *spi)
@@ -642,7 +630,6 @@ static int mrf24j40_probe(struct spi_device *spi)
 
         mutex_init(&devrec->buffer_mutex);
         init_completion(&devrec->tx_complete);
-        INIT_WORK(&devrec->irqwork, mrf24j40_isrwork);
         devrec->spi = spi;
         spi_set_drvdata(spi, devrec);
 
@@ -688,11 +675,12 @@ static int mrf24j40_probe(struct spi_device *spi)
         val &= ~0x3; /* Clear RX mode (normal) */
         write_short_reg(devrec, REG_RXMCR, val);
 
-        ret = request_irq(spi->irq,
-                          mrf24j40_isr,
-                          IRQF_TRIGGER_FALLING,
-                          dev_name(&spi->dev),
-                          devrec);
+        ret = request_threaded_irq(spi->irq,
+                                   NULL,
+                                   mrf24j40_isr,
+                                   IRQF_TRIGGER_LOW|IRQF_ONESHOT,
+                                   dev_name(&spi->dev),
+                                   devrec);
 
         if (ret) {
                 dev_err(printdev(devrec), "Unable to get IRQ");
@@ -721,7 +709,6 @@ static int mrf24j40_remove(struct spi_device *spi)
         dev_dbg(printdev(devrec), "remove\n");
 
         free_irq(spi->irq, devrec);
-        flush_work(&devrec->irqwork); /* TODO: Is this the right call? */
         ieee802154_unregister_device(devrec->dev);
         ieee802154_free_device(devrec->dev);
         /* TODO: Will ieee802154_free_device() wait until ->xmit() is
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 807815fc9968..7cb105c103fe 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1293,7 +1293,8 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
         if (unlikely(!noblock))
                 add_wait_queue(&tfile->wq.wait, &wait);
         while (len) {
-                current->state = TASK_INTERRUPTIBLE;
+                if (unlikely(!noblock))
+                        current->state = TASK_INTERRUPTIBLE;
 
                 /* Read frames from the queue */
                 if (!(skb = skb_dequeue(&tfile->socket.sk->sk_receive_queue))) {
@@ -1320,9 +1321,10 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
                 break;
         }
 
-        current->state = TASK_RUNNING;
-        if (unlikely(!noblock))
+        if (unlikely(!noblock)) {
+                current->state = TASK_RUNNING;
                 remove_wait_queue(&tfile->wq.wait, &wait);
+        }
 
         return ret;
 }
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 3569293df872..846cc19c04f2 100644
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -36,8 +36,8 @@
 #define AX_RXHDR_L4_TYPE_TCP                    16
 #define AX_RXHDR_L3CSUM_ERR                     2
 #define AX_RXHDR_L4CSUM_ERR                     1
-#define AX_RXHDR_CRC_ERR                        ((u32)BIT(31))
-#define AX_RXHDR_DROP_ERR                       ((u32)BIT(30))
+#define AX_RXHDR_CRC_ERR                        ((u32)BIT(29))
+#define AX_RXHDR_DROP_ERR                       ((u32)BIT(31))
 #define AX_ACCESS_MAC                           0x01
 #define AX_ACCESS_PHY                           0x02
 #define AX_ACCESS_EEPROM                        0x04
@@ -1406,6 +1406,19 @@ static const struct driver_info sitecom_info = {
         .tx_fixup = ax88179_tx_fixup,
 };
 
+static const struct driver_info samsung_info = {
+        .description = "Samsung USB Ethernet Adapter",
+        .bind = ax88179_bind,
+        .unbind = ax88179_unbind,
+        .status = ax88179_status,
+        .link_reset = ax88179_link_reset,
+        .reset = ax88179_reset,
+        .stop = ax88179_stop,
+        .flags = FLAG_ETHER | FLAG_FRAMING_AX,
+        .rx_fixup = ax88179_rx_fixup,
+        .tx_fixup = ax88179_tx_fixup,
+};
+
 static const struct usb_device_id products[] = {
 {
         /* ASIX AX88179 10/100/1000 */
@@ -1418,7 +1431,11 @@ static const struct usb_device_id products[] = {
 }, {
         /* Sitecom USB 3.0 to Gigabit Adapter */
         USB_DEVICE(0x0df6, 0x0072),
-        .driver_info = (unsigned long) &sitecom_info,
+        .driver_info = (unsigned long)&sitecom_info,
+}, {
+        /* Samsung USB Ethernet Adapter */
+        USB_DEVICE(0x04e8, 0xa100),
+        .driver_info = (unsigned long)&samsung_info,
 },
         { },
 };
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 3d6aaf79d8b2..818ce90185b5 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -714,6 +714,7 @@ static const struct usb_device_id products[] = {
         {QMI_FIXED_INTF(0x2357, 0x0201, 4)},    /* TP-LINK HSUPA Modem MA180 */
         {QMI_FIXED_INTF(0x2357, 0x9000, 4)},    /* TP-LINK MA260 */
         {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},    /* Telit LE920 */
+        {QMI_FIXED_INTF(0x0b3c, 0xc005, 6)},    /* Olivetti Olicard 200 */
         {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)},    /* Cinterion PLxx */
 
         /* 4. Gobi 1000 devices */
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index bf94e10a37c8..90a429b7ebad 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1688,8 +1688,10 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         if (dev->can_dma_sg && !(info->flags & FLAG_SEND_ZLP) &&
                 !(info->flags & FLAG_MULTI_PACKET)) {
                 dev->padding_pkt = kzalloc(1, GFP_KERNEL);
-                if (!dev->padding_pkt)
+                if (!dev->padding_pkt) {
+                        status = -ENOMEM;
                         goto out4;
+                }
         }
 
         status = register_netdev (net);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index defec2b3c5a4..9fbdfcd1e1a0 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -938,7 +938,9 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs)
                 return -EINVAL;
         } else {
                 vi->curr_queue_pairs = queue_pairs;
-                schedule_delayed_work(&vi->refill, 0);
+                /* virtnet_open() will refill when device is going to up. */
+                if (dev->flags & IFF_UP)
+                        schedule_delayed_work(&vi->refill, 0);
         }
 
         return 0;
@@ -1116,6 +1118,11 @@ static int virtnet_cpu_callback(struct notifier_block *nfb,
 {
         struct virtnet_info *vi = container_of(nfb, struct virtnet_info, nb);
 
+        mutex_lock(&vi->config_lock);
+
+        if (!vi->config_enable)
+                goto done;
+
         switch(action & ~CPU_TASKS_FROZEN) {
         case CPU_ONLINE:
         case CPU_DOWN_FAILED:
@@ -1128,6 +1135,9 @@ static int virtnet_cpu_callback(struct notifier_block *nfb,
         default:
                 break;
         }
+
+done:
+        mutex_unlock(&vi->config_lock);
         return NOTIFY_OK;
 }
 
@@ -1733,7 +1743,9 @@ static int virtnet_restore(struct virtio_device *vdev)
         vi->config_enable = true;
         mutex_unlock(&vi->config_lock);
 
+        rtnl_lock();
         virtnet_set_queues(vi, vi->curr_queue_pairs);
+        rtnl_unlock();
 
         return 0;
 }
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 3f0c4f268751..bcfff0d62de4 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -1972,6 +1972,7 @@ fst_get_iface(struct fst_card_info *card, struct fst_port_info *port,
         }
 
         i = port->index;
+        memset(&sync, 0, sizeof(sync));
         sync.clock_rate = FST_RDL(card, portConfig[i].lineSpeed);
         /* Lucky card and linux use same encoding here */
         sync.clock_type = FST_RDB(card, portConfig[i].internalClock) ==
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 6a24a5a70cc7..4c0a69779b89 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -355,6 +355,7 @@ static int wanxl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                         ifr->ifr_settings.size = size; /* data size wanted */
                         return -ENOBUFS;
                 }
+                memset(&line, 0, sizeof(line));
                 line.clock_type = get_status(port)->clocking;
                 line.clock_rate = 0;
                 line.loopback = 0;
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index e4f65900132d..709301f88dcd 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -208,6 +208,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
         unsigned long flags;
+        int i;
 
         if (ath_startrecv(sc) != 0) {
                 ath_err(common, "Unable to restart recv logic\n");
@@ -235,6 +236,15 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
                 }
         work:
                 ath_restart_work(sc);
+
+                for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
+                        if (!ATH_TXQ_SETUP(sc, i))
+                                continue;
+
+                        spin_lock_bh(&sc->tx.txq[i].axq_lock);
+                        ath_txq_schedule(sc, &sc->tx.txq[i]);
+                        spin_unlock_bh(&sc->tx.txq[i].axq_lock);
+                }
         }
 
         ieee80211_wake_queues(sc->hw);
@@ -539,21 +549,10 @@ chip_reset:
 
 static int ath_reset(struct ath_softc *sc)
 {
-        int i, r;
+        int r;
 
         ath9k_ps_wakeup(sc);
-
         r = ath_reset_internal(sc, NULL);
-
-        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-                if (!ATH_TXQ_SETUP(sc, i))
-                        continue;
-
-                spin_lock_bh(&sc->tx.txq[i].axq_lock);
-                ath_txq_schedule(sc, &sc->tx.txq[i]);
-                spin_unlock_bh(&sc->tx.txq[i].axq_lock);
-        }
-
         ath9k_ps_restore(sc);
 
         return r;
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 5ac713d2ff5d..dd30452df966 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1969,15 +1969,18 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,
 static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
                                struct ath_atx_tid *tid, struct sk_buff *skb)
 {
+        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         struct ath_frame_info *fi = get_frame_info(skb);
         struct list_head bf_head;
-        struct ath_buf *bf;
-
-        bf = fi->bf;
+        struct ath_buf *bf = fi->bf;
 
         INIT_LIST_HEAD(&bf_head);
         list_add_tail(&bf->list, &bf_head);
         bf->bf_state.bf_type = 0;
+        if (tid && (tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {
+                bf->bf_state.bf_type = BUF_AMPDU;
+                ath_tx_addto_baw(sc, tid, bf);
+        }
 
         bf->bf_next = NULL;
         bf->bf_lastbf = bf;
diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/cw1200/cw1200_spi.c
index 899cad34ccd3..755a0c8edfe1 100644
--- a/drivers/net/wireless/cw1200/cw1200_spi.c
+++ b/drivers/net/wireless/cw1200/cw1200_spi.c
@@ -237,7 +237,9 @@ static irqreturn_t cw1200_spi_irq_handler(int irq, void *dev_id)
         struct hwbus_priv *self = dev_id;
 
         if (self->core) {
+                cw1200_spi_lock(self);
                 cw1200_irq_handler(self->core);
+                cw1200_spi_unlock(self);
                 return IRQ_HANDLED;
         } else {
                 return IRQ_NONE;
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 30d45e2fc193..8ac305be68f4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -240,6 +240,12 @@ const struct iwl_cfg iwl6035_2agn_cfg = {
         .ht_params = &iwl6000_ht_params,
 };
 
+const struct iwl_cfg iwl6035_2agn_sff_cfg = {
+        .name = "Intel(R) Centrino(R) Ultimate-N 6235 AGN",
+        IWL_DEVICE_6035,
+        .ht_params = &iwl6000_ht_params,
+};
+
 const struct iwl_cfg iwl1030_bgn_cfg = {
         .name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",
         IWL_DEVICE_6030,
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index e4d370bff306..b03c25e14903 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -280,6 +280,7 @@ extern const struct iwl_cfg iwl2000_2bgn_cfg;
 extern const struct iwl_cfg iwl2000_2bgn_d_cfg;
 extern const struct iwl_cfg iwl2030_2bgn_cfg;
 extern const struct iwl_cfg iwl6035_2agn_cfg;
+extern const struct iwl_cfg iwl6035_2agn_sff_cfg;
 extern const struct iwl_cfg iwl105_bgn_cfg;
 extern const struct iwl_cfg iwl105_bgn_d_cfg;
 extern const struct iwl_cfg iwl135_bgn_cfg;
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index dd57a36ecb10..80b47508647c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -601,8 +601,10 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
 {
         int ret;
 
-        WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
-                  "%s bad state = %d", __func__, trans->state);
+        if (trans->state != IWL_TRANS_FW_ALIVE) {
+                IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);
+                return -EIO;
+        }
 
         if (!(cmd->flags & CMD_ASYNC))
                 lock_map_acquire_read(&trans->sync_cmd_lockdep_map);
diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c
index 21407a353a3b..d58e393324ef 100644
--- a/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -273,7 +273,10 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm,
                 if (!mvmvif->queue_params[ac].uapsd)
                         continue;
 
-                cmd->flags |= cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK);
+                if (mvm->cur_ucode != IWL_UCODE_WOWLAN)
+                        cmd->flags |=
+                                cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK);
+
                 cmd->uapsd_ac_flags |= BIT(ac);
 
                 /* QNDP TID - the highest TID with no admission control */
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 9a7ab8495300..621fb71f282a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -394,6 +394,11 @@ static bool iwl_mvm_scan_abort_notif(struct iwl_notif_wait_data *notif_wait,
                         return false;
                 }
 
+                /*
+                 * If scan cannot be aborted, it means that we had a
+                 * SCAN_COMPLETE_NOTIFICATION in the pipe and it called
+                 * ieee80211_scan_completed already.
+                 */
                 IWL_DEBUG_SCAN(mvm, "Scan cannot be aborted, exit now: %d\n",
                                *resp);
                 return true;
@@ -417,14 +422,19 @@ void iwl_mvm_cancel_scan(struct iwl_mvm *mvm)
                                                SCAN_COMPLETE_NOTIFICATION };
         int ret;
 
+        if (mvm->scan_status == IWL_MVM_SCAN_NONE)
+                return;
+
         iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_abort,
                                    scan_abort_notif,
                                    ARRAY_SIZE(scan_abort_notif),
                                    iwl_mvm_scan_abort_notif, NULL);
 
-        ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, CMD_SYNC, 0, NULL);
+        ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD,
+                                   CMD_SYNC | CMD_SEND_IN_RFKILL, 0, NULL);
         if (ret) {
                 IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret);
+                /* mac80211's state will be cleaned in the fw_restart flow */
                 goto out_remove_notif;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index dc02cb9792af..26108a1a29fa 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -139,13 +139,16 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
 
 /* 6x00 Series */
         {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)},
+        {IWL_PCI_DEVICE(0x422B, 0x1108, iwl6000_3agn_cfg)},
         {IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)},
+        {IWL_PCI_DEVICE(0x422B, 0x1128, iwl6000_3agn_cfg)},
         {IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)},
         {IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)},
         {IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)},
         {IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)},
         {IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)},
         {IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)},
+        {IWL_PCI_DEVICE(0x4238, 0x1118, iwl6000_3agn_cfg)},
         {IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)},
         {IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)},
 
@@ -153,12 +156,16 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
         {IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)},
         {IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)},
         {IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1308, iwl6005_2agn_cfg)},
         {IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)},
         {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)},
+        {IWL_PCI_DEVICE(0x0082, 0x1328, iwl6005_2agn_cfg)},
         {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x0085, 0x1318, iwl6005_2agn_cfg)},
         {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)},
         {IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)},
         {IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)},
+        {IWL_PCI_DEVICE(0x0085, 0xC228, iwl6005_2agn_sff_cfg)},
         {IWL_PCI_DEVICE(0x0082, 0x4820, iwl6005_2agn_d_cfg)},
         {IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_2agn_mow1_cfg)},/* low 5GHz active */
         {IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_2agn_mow2_cfg)},/* high 5GHz active */
@@ -240,8 +247,11 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
 
 /* 6x35 Series */
         {IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x088E, 0x406A, iwl6035_2agn_sff_cfg)},
         {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x088F, 0x426A, iwl6035_2agn_sff_cfg)},
         {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)},
+        {IWL_PCI_DEVICE(0x088E, 0x446A, iwl6035_2agn_sff_cfg)},
         {IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)},
         {IWL_PCI_DEVICE(0x088F, 0x5260, iwl6035_2agn_cfg)},
 
@@ -260,54 +270,86 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
 #if IS_ENABLED(CONFIG_IWLMVM)
 /* 7000 Series */
         {IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0x4270, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B2, 0x4272, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0x4260, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B2, 0x426A, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0x4262, iwl7260_n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4470, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x4472, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4460, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x446A, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4462, iwl7260_n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4870, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x486E, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4A70, iwl7260_2ac_cfg_high_temp)},
         {IWL_PCI_DEVICE(0x08B1, 0x4A6E, iwl7260_2ac_cfg_high_temp)},
         {IWL_PCI_DEVICE(0x08B1, 0x4A6C, iwl7260_2ac_cfg_high_temp)},
+        {IWL_PCI_DEVICE(0x08B1, 0x4570, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x4560, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B2, 0x4370, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B2, 0x4360, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x5070, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4020, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0x402A, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0x4220, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0x4420, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC070, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xC072, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC170, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC060, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xC06A, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC160, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC062, iwl7260_n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC162, iwl7260_n_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xC770, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xC760, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0xC270, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B2, 0xC272, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0xC260, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B2, 0xC26A, iwl7260_n_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0xC262, iwl7260_n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC470, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xC472, iwl7260_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC460, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC462, iwl7260_n_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xC570, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xC560, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B2, 0xC370, iwl7260_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xC360, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC020, iwl7260_2n_cfg)},
+        {IWL_PCI_DEVICE(0x08B1, 0xC02A, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B2, 0xC220, iwl7260_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B1, 0xC420, iwl7260_2n_cfg)},
 
 /* 3160 Series */
         {IWL_PCI_DEVICE(0x08B3, 0x0070, iwl3160_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B3, 0x0072, iwl3160_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x0170, iwl3160_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B3, 0x0172, iwl3160_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x0060, iwl3160_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x0062, iwl3160_n_cfg)},
         {IWL_PCI_DEVICE(0x08B4, 0x0270, iwl3160_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B4, 0x0272, iwl3160_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x0470, iwl3160_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B3, 0x0472, iwl3160_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B4, 0x0370, iwl3160_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x8070, iwl3160_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B3, 0x8072, iwl3160_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x8170, iwl3160_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B3, 0x8172, iwl3160_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x8060, iwl3160_2n_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},
         {IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},
         {IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)},
 #endif /* CONFIG_IWLMVM */
 
         {0}
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index bad95d28d50d..c3f904d422b0 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1401,6 +1401,10 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         spin_lock_init(&trans_pcie->reg_lock);
         init_waitqueue_head(&trans_pcie->ucode_write_waitq);
 
+        err = pci_enable_device(pdev);
+        if (err)
+                goto out_no_pci;
+
         if (!cfg->base_params->pcie_l1_allowed) {
                 /*
                  * W/A - seems to solve weird behavior. We need to remove this
@@ -1412,10 +1416,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
                                        PCIE_LINK_STATE_CLKPM);
         }
 
-        err = pci_enable_device(pdev);
-        if (err)
-                goto out_no_pci;
-
         pci_set_master(pdev);
 
         err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index f45eb29c2ede..1424335163b9 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1102,6 +1102,8 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
                  * non-AGG queue.
                  */
                 iwl_clear_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
+
+                ssn = trans_pcie->txq[txq_id].q.read_ptr;
         }
 
         /* Place first TFD at index corresponding to start sequence number.
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 9d7c0e6c4fc7..37f873bb342f 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -1422,13 +1422,19 @@ static int mwifiex_deauthenticate_infra(struct mwifiex_private *priv, u8 *mac)
  */
 int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac)
 {
+        int ret = 0;
+
         if (!priv->media_connected)
                 return 0;
 
         switch (priv->bss_mode) {
         case NL80211_IFTYPE_STATION:
         case NL80211_IFTYPE_P2P_CLIENT:
-                return mwifiex_deauthenticate_infra(priv, mac);
+                ret = mwifiex_deauthenticate_infra(priv, mac);
+                if (ret)
+                        cfg80211_disconnected(priv->netdev, 0, NULL, 0,
+                                              GFP_KERNEL);
+                break;
         case NL80211_IFTYPE_ADHOC:
                 return mwifiex_send_cmd_sync(priv,
                                              HostCmd_CMD_802_11_AD_HOC_STOP,
@@ -1440,7 +1446,7 @@ int mwifiex_deauthenticate(struct mwifiex_private *priv, u8 *mac)
                 break;
         }
 
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(mwifiex_deauthenticate);
 
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index fd778337deee..c2b91f566e05 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -358,10 +358,12 @@ process_start:
                 }
         } while (true);
 
-        if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter))
+        spin_lock_irqsave(&adapter->main_proc_lock, flags);
+        if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) {
+                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
                 goto process_start;
+        }
 
-        spin_lock_irqsave(&adapter->main_proc_lock, flags);
         adapter->mwifiex_processing = false;
         spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
 
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index 8b057524b252..8c351f71f72f 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -118,7 +118,8 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv, u16 reason_code)
         dev_dbg(adapter->dev,
                 "info: successfully disconnected from %pM: reason code %d\n",
                 priv->cfg_bssid, reason_code);
-        if (priv->bss_mode == NL80211_IFTYPE_STATION) {
+        if (priv->bss_mode == NL80211_IFTYPE_STATION ||
+            priv->bss_mode == NL80211_IFTYPE_P2P_CLIENT) {
                 cfg80211_disconnected(priv->netdev, reason_code, NULL, 0,
                                       GFP_KERNEL);
         }
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 76d95deb274b..dc49e525ae5e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -105,13 +105,11 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
                 goto exit_release_regions;
         }
 
-        pci_enable_msi(pci_dev);
-
         hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
         if (!hw) {
                 rt2x00_probe_err("Failed to allocate hardware\n");
                 retval = -ENOMEM;
-                goto exit_disable_msi;
+                goto exit_release_regions;
         }
 
         pci_set_drvdata(pci_dev, hw);
@@ -152,9 +150,6 @@ exit_free_reg:
 exit_free_device:
         ieee80211_free_hw(hw);
 
-exit_disable_msi:
-        pci_disable_msi(pci_dev);
-
 exit_release_regions:
         pci_release_regions(pci_dev);
 
@@ -179,8 +174,6 @@ void rt2x00pci_remove(struct pci_dev *pci_dev)
         rt2x00pci_free_reg(rt2x00dev);
         ieee80211_free_hw(hw);
 
-        pci_disable_msi(pci_dev);
-
         /*
          * Free the PCI device data.
          */
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index 763cf1defab5..5a060e537fbe 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -343,7 +343,8 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,
                                         (bool)GET_RX_DESC_PAGGR(pdesc));
         rx_status->mactime = GET_RX_DESC_TSFL(pdesc);
         if (phystatus) {
-                p_drvinfo = (struct rx_fwinfo_92c *)(pdesc + RTL_RX_DESC_SIZE);
+                p_drvinfo = (struct rx_fwinfo_92c *)(skb->data +
+                                                     stats->rx_bufshift);
                 rtl92c_translate_rx_signal_stuff(hw, skb, stats, pdesc,
                                                  p_drvinfo);
         }
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
index b45bce20ad76..1b08d8798372 100644
--- a/drivers/net/xen-netback/xenbus.c
+++ b/drivers/net/xen-netback/xenbus.c
@@ -39,11 +39,15 @@ static int connect_rings(struct backend_info *);
 static void connect(struct backend_info *);
 static void backend_create_xenvif(struct backend_info *be);
 static void unregister_hotplug_status_watch(struct backend_info *be);
+static void set_backend_state(struct backend_info *be,
+                              enum xenbus_state state);
 
 static int netback_remove(struct xenbus_device *dev)
 {
         struct backend_info *be = dev_get_drvdata(&dev->dev);
 
+        set_backend_state(be, XenbusStateClosed);
+
         unregister_hotplug_status_watch(be);
         if (be->vif) {
                 kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE);
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..1ea75236a15f 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -552,9 +552,8 @@ static void __ref enable_slot(struct acpiphp_slot *slot)
         struct acpiphp_func *func;
         int max, pass;
         LIST_HEAD(add_list);
-        int nr_found;
 
-        nr_found = acpiphp_rescan_slot(slot);
+        acpiphp_rescan_slot(slot);
         max = acpiphp_max_busnr(bus);
         for (pass = 0; pass < 2; pass++) {
                 list_for_each_entry(dev, &bus->devices, bus_list) {
@@ -574,9 +573,6 @@ static void __ref enable_slot(struct acpiphp_slot *slot)
                 }
         }
         __pci_bus_assign_resources(bus, &add_list, NULL);
-        /* Nothing more to do here if there are no new devices on this bus. */
-        if (!nr_found && (slot->flags & SLOT_ENABLED))
-                return;
 
         acpiphp_sanitize_bus(bus);
         acpiphp_set_hpp_values(bus);
@@ -994,14 +990,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/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 96d6b2eef4f2..b51a7460cc49 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -504,6 +504,7 @@ config ASUS_WMI
         depends on BACKLIGHT_CLASS_DEVICE
         depends on RFKILL || RFKILL = n
         depends on HOTPLUG_PCI
+        depends on ACPI_VIDEO || ACPI_VIDEO = n
         select INPUT_SPARSEKMAP
         select LEDS_CLASS
         select NEW_LEDS
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index d3fd52036fd6..13ec195f0ca6 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -127,18 +127,17 @@ MODULE_PARM_DESC(minor,
                  "default is -1 (automatic)");
 #endif
 
-static int kbd_backlight = 1;
+static int kbd_backlight = -1;
 module_param(kbd_backlight, int, 0444);
 MODULE_PARM_DESC(kbd_backlight,
                  "set this to 0 to disable keyboard backlight, "
-                 "1 to enable it (default: 0)");
+                 "1 to enable it (default: no change from current value)");
 
-static int kbd_backlight_timeout;       /* = 0 */
+static int kbd_backlight_timeout = -1;
 module_param(kbd_backlight_timeout, int, 0444);
 MODULE_PARM_DESC(kbd_backlight_timeout,
-                 "set this to 0 to set the default 10 seconds timeout, "
-                 "1 for 30 seconds, 2 for 60 seconds and 3 to disable timeout "
-                 "(default: 0)");
+                 "meaningful values vary from 0 to 3 and their meaning depends "
+                 "on the model (default: no change from current value)");
 
 #ifdef CONFIG_PM_SLEEP
 static void sony_nc_kbd_backlight_resume(void);
@@ -1844,6 +1843,8 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
         if (!kbdbl_ctl)
                 return -ENOMEM;
 
+        kbdbl_ctl->mode = kbd_backlight;
+        kbdbl_ctl->timeout = kbd_backlight_timeout;
         kbdbl_ctl->handle = handle;
         if (handle == 0x0137)
                 kbdbl_ctl->base = 0x0C00;
@@ -1870,8 +1871,8 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
         if (ret)
                 goto outmode;
 
-        __sony_nc_kbd_backlight_mode_set(kbd_backlight);
-        __sony_nc_kbd_backlight_timeout_set(kbd_backlight_timeout);
+        __sony_nc_kbd_backlight_mode_set(kbdbl_ctl->mode);
+        __sony_nc_kbd_backlight_timeout_set(kbdbl_ctl->timeout);
 
         return 0;
 
@@ -1886,17 +1887,8 @@ outkzalloc:
 static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd)
 {
         if (kbdbl_ctl) {
-                int result;
-
                 device_remove_file(&pd->dev, &kbdbl_ctl->mode_attr);
                 device_remove_file(&pd->dev, &kbdbl_ctl->timeout_attr);
-
-                /* restore the default hw behaviour */
-                sony_call_snc_handle(kbdbl_ctl->handle,
-                                kbdbl_ctl->base | 0x10000, &result);
-                sony_call_snc_handle(kbdbl_ctl->handle,
-                                kbdbl_ctl->base + 0x200, &result);
-
                 kfree(kbdbl_ctl);
                 kbdbl_ctl = NULL;
         }
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 5adb2042e824..cee7e2708a1f 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -2077,6 +2077,7 @@ dasd_eckd_build_format(struct dasd_device *base,
         int intensity = 0;
         int r0_perm;
         int nr_tracks;
+        int use_prefix;
 
         startdev = dasd_alias_get_start_dev(base);
         if (!startdev)
@@ -2106,28 +2107,46 @@ dasd_eckd_build_format(struct dasd_device *base,
                 intensity = fdata->intensity;
         }
 
+        use_prefix = base_priv->features.feature[8] & 0x01;
+
         switch (intensity) {
         case 0x00:      /* Normal format */
         case 0x08:      /* Normal format, use cdl. */
                 cplength = 2 + (rpt*nr_tracks);
-                datasize = sizeof(struct PFX_eckd_data) +
-                        sizeof(struct LO_eckd_data) +
-                        rpt * nr_tracks * sizeof(struct eckd_count);
+                if (use_prefix)
+                        datasize = sizeof(struct PFX_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                rpt * nr_tracks * sizeof(struct eckd_count);
+                else
+                        datasize = sizeof(struct DE_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                rpt * nr_tracks * sizeof(struct eckd_count);
                 break;
         case 0x01:      /* Write record zero and format track. */
         case 0x09:      /* Write record zero and format track, use cdl. */
                 cplength = 2 + rpt * nr_tracks;
-                datasize = sizeof(struct PFX_eckd_data) +
-                        sizeof(struct LO_eckd_data) +
-                        sizeof(struct eckd_count) +
-                        rpt * nr_tracks * sizeof(struct eckd_count);
+                if (use_prefix)
+                        datasize = sizeof(struct PFX_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                sizeof(struct eckd_count) +
+                                rpt * nr_tracks * sizeof(struct eckd_count);
+                else
+                        datasize = sizeof(struct DE_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                sizeof(struct eckd_count) +
+                                rpt * nr_tracks * sizeof(struct eckd_count);
                 break;
         case 0x04:      /* Invalidate track. */
         case 0x0c:      /* Invalidate track, use cdl. */
                 cplength = 3;
-                datasize = sizeof(struct PFX_eckd_data) +
-                        sizeof(struct LO_eckd_data) +
-                        sizeof(struct eckd_count);
+                if (use_prefix)
+                        datasize = sizeof(struct PFX_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                sizeof(struct eckd_count);
+                else
+                        datasize = sizeof(struct DE_eckd_data) +
+                                sizeof(struct LO_eckd_data) +
+                                sizeof(struct eckd_count);
                 break;
         default:
                 dev_warn(&startdev->cdev->dev,
@@ -2147,14 +2166,25 @@ dasd_eckd_build_format(struct dasd_device *base,
 
         switch (intensity & ~0x08) {
         case 0x00: /* Normal format. */
-                prefix(ccw++, (struct PFX_eckd_data *) data,
-                       fdata->start_unit, fdata->stop_unit,
-                       DASD_ECKD_CCW_WRITE_CKD, base, startdev);
-                /* grant subsystem permission to format R0 */
-                if (r0_perm)
-                        ((struct PFX_eckd_data *)data)
-                                ->define_extent.ga_extended |= 0x04;
-                data += sizeof(struct PFX_eckd_data);
+                if (use_prefix) {
+                        prefix(ccw++, (struct PFX_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_CKD, base, startdev);
+                        /* grant subsystem permission to format R0 */
+                        if (r0_perm)
+                                ((struct PFX_eckd_data *)data)
+                                        ->define_extent.ga_extended |= 0x04;
+                        data += sizeof(struct PFX_eckd_data);
+                } else {
+                        define_extent(ccw++, (struct DE_eckd_data *) data,
+                                      fdata->start_unit, fdata->stop_unit,
+                                      DASD_ECKD_CCW_WRITE_CKD, startdev);
+                        /* grant subsystem permission to format R0 */
+                        if (r0_perm)
+                                ((struct DE_eckd_data *) data)
+                                        ->ga_extended |= 0x04;
+                        data += sizeof(struct DE_eckd_data);
+                }
                 ccw[-1].flags |= CCW_FLAG_CC;
                 locate_record(ccw++, (struct LO_eckd_data *) data,
                               fdata->start_unit, 0, rpt*nr_tracks,
@@ -2163,11 +2193,18 @@ dasd_eckd_build_format(struct dasd_device *base,
                 data += sizeof(struct LO_eckd_data);
                 break;
         case 0x01: /* Write record zero + format track. */
-                prefix(ccw++, (struct PFX_eckd_data *) data,
-                       fdata->start_unit, fdata->stop_unit,
-                       DASD_ECKD_CCW_WRITE_RECORD_ZERO,
-                       base, startdev);
-                data += sizeof(struct PFX_eckd_data);
+                if (use_prefix) {
+                        prefix(ccw++, (struct PFX_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_RECORD_ZERO,
+                               base, startdev);
+                        data += sizeof(struct PFX_eckd_data);
+                } else {
+                        define_extent(ccw++, (struct DE_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_RECORD_ZERO, startdev);
+                        data += sizeof(struct DE_eckd_data);
+                }
                 ccw[-1].flags |= CCW_FLAG_CC;
                 locate_record(ccw++, (struct LO_eckd_data *) data,
                               fdata->start_unit, 0, rpt * nr_tracks + 1,
@@ -2176,10 +2213,17 @@ dasd_eckd_build_format(struct dasd_device *base,
                 data += sizeof(struct LO_eckd_data);
                 break;
         case 0x04: /* Invalidate track. */
-                prefix(ccw++, (struct PFX_eckd_data *) data,
-                       fdata->start_unit, fdata->stop_unit,
-                       DASD_ECKD_CCW_WRITE_CKD, base, startdev);
-                data += sizeof(struct PFX_eckd_data);
+                if (use_prefix) {
+                        prefix(ccw++, (struct PFX_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_CKD, base, startdev);
+                        data += sizeof(struct PFX_eckd_data);
+                } else {
+                        define_extent(ccw++, (struct DE_eckd_data *) data,
+                               fdata->start_unit, fdata->stop_unit,
+                               DASD_ECKD_CCW_WRITE_CKD, startdev);
+                        data += sizeof(struct DE_eckd_data);
+                }
                 ccw[-1].flags |= CCW_FLAG_CC;
                 locate_record(ccw++, (struct LO_eckd_data *) data,
                               fdata->start_unit, 0, 1,
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index a3aa374799dc..1fe264379e0d 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -486,7 +486,7 @@ sclp_sync_wait(void)
         timeout = 0;
         if (timer_pending(&sclp_request_timer)) {
                 /* Get timeout TOD value */
-                timeout = get_tod_clock() +
+                timeout = get_tod_clock_fast() +
                           sclp_tod_from_jiffies(sclp_request_timer.expires -
                                                 jiffies);
         }
@@ -508,7 +508,7 @@ sclp_sync_wait(void)
         while (sclp_running_state != sclp_running_state_idle) {
                 /* Check for expired request timer */
                 if (timer_pending(&sclp_request_timer) &&
-                    get_tod_clock() > timeout &&
+                    get_tod_clock_fast() > timeout &&
                     del_timer(&sclp_request_timer))
                         sclp_request_timer.function(sclp_request_timer.data);
                 cpu_relax();
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 9b3a24e8d3a0..cf31d3321dab 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -313,7 +313,7 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp)
         int ret;
 
         dev_num = iminor(inode);
-        if (dev_num > MAXMINOR)
+        if (dev_num >= MAXMINOR)
                 return -ENODEV;
         logptr = &sys_ser[dev_num];
 
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index d7da67a31c77..88e35d85d205 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -878,9 +878,9 @@ static void css_reset(void)
                         atomic_inc(&chpid_reset_count);
         }
         /* Wait for machine check for all channel paths. */
-        timeout = get_tod_clock() + (RCHP_TIMEOUT << 12);
+        timeout = get_tod_clock_fast() + (RCHP_TIMEOUT << 12);
         while (atomic_read(&chpid_reset_count) != 0) {
-                if (get_tod_clock() > timeout)
+                if (get_tod_clock_fast() > timeout)
                         break;
                 cpu_relax();
         }
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 8ed52aa49122..bbd3e511c771 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -338,10 +338,10 @@ again:
                 retries++;
 
                 if (!start_time) {
-                        start_time = get_tod_clock();
+                        start_time = get_tod_clock_fast();
                         goto again;
                 }
-                if ((get_tod_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE)
+                if (get_tod_clock_fast() - start_time < QDIO_BUSY_BIT_PATIENCE)
                         goto again;
         }
         if (retries) {
@@ -504,7 +504,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_tod_clock();
+        q->timestamp = get_tod_clock_fast();
 
         /*
          * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
@@ -595,7 +595,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q)
          * At this point we know, that inbound first_to_check
          * has (probably) not moved (see qdio_inbound_processing).
          */
-        if (get_tod_clock() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {
+        if (get_tod_clock_fast() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {
                 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x",
                               q->first_to_check);
                 return 1;
@@ -728,7 +728,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_tod_clock();
+        q->timestamp = get_tod_clock_fast();
 
         if (need_siga_sync(q))
                 if (((queue_type(q) != QDIO_IQDIO_QFMT) &&
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index feab3a5e50b5..757eb0716d45 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -696,7 +696,7 @@ static int __init blogic_init_mm_probeinfo(struct blogic_adapter *adapter)
         while ((pci_device = pci_get_device(PCI_VENDOR_ID_BUSLOGIC,
                                         PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER,
                                         pci_device)) != NULL) {
-                struct blogic_adapter *adapter = adapter;
+                struct blogic_adapter *host_adapter = adapter;
                 struct blogic_adapter_info adapter_info;
                 enum blogic_isa_ioport mod_ioaddr_req;
                 unsigned char bus;
@@ -744,9 +744,9 @@ static int __init blogic_init_mm_probeinfo(struct blogic_adapter *adapter)
                    known and enabled, note that the particular Standard ISA I/O
                    Address should not be probed.
                  */
-                adapter->io_addr = io_addr;
-                blogic_intreset(adapter);
-                if (blogic_cmd(adapter, BLOGIC_INQ_PCI_INFO, NULL, 0,
+                host_adapter->io_addr = io_addr;
+                blogic_intreset(host_adapter);
+                if (blogic_cmd(host_adapter, BLOGIC_INQ_PCI_INFO, NULL, 0,
                                 &adapter_info, sizeof(adapter_info)) ==
                                 sizeof(adapter_info)) {
                         if (adapter_info.isa_port < 6)
@@ -762,7 +762,7 @@ static int __init blogic_init_mm_probeinfo(struct blogic_adapter *adapter)
                    I/O Address assigned at system initialization.
                  */
                 mod_ioaddr_req = BLOGIC_IO_DISABLE;
-                blogic_cmd(adapter, BLOGIC_MOD_IOADDR, &mod_ioaddr_req,
+                blogic_cmd(host_adapter, BLOGIC_MOD_IOADDR, &mod_ioaddr_req,
                                 sizeof(mod_ioaddr_req), NULL, 0);
                 /*
                    For the first MultiMaster Host Adapter enumerated,
@@ -779,12 +779,12 @@ static int __init blogic_init_mm_probeinfo(struct blogic_adapter *adapter)
 
                         fetch_localram.offset = BLOGIC_AUTOSCSI_BASE + 45;
                         fetch_localram.count = sizeof(autoscsi_byte45);
-                        blogic_cmd(adapter, BLOGIC_FETCH_LOCALRAM,
+                        blogic_cmd(host_adapter, BLOGIC_FETCH_LOCALRAM,
                                         &fetch_localram, sizeof(fetch_localram),
                                         &autoscsi_byte45,
                                         sizeof(autoscsi_byte45));
-                        blogic_cmd(adapter, BLOGIC_GET_BOARD_ID, NULL, 0, &id,
-                                        sizeof(id));
+                        blogic_cmd(host_adapter, BLOGIC_GET_BOARD_ID, NULL, 0,
+                                        &id, sizeof(id));
                         if (id.fw_ver_digit1 == '5')
                                 force_scan_order =
                                         autoscsi_byte45.force_scan_order;
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 408a42ef787a..f0d432c139d0 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -771,6 +771,8 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long
 static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
 {
         struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata;
+        if (!capable(CAP_SYS_RAWIO))
+                return -EPERM;
         return aac_compat_do_ioctl(dev, cmd, (unsigned long)arg);
 }
 
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 2ef497ebadc0..ee5c1833eb73 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -20,7 +20,7 @@
  * | Device Discovery             |       0x2095       | 0x2020-0x2022, |
  * |                              |                    | 0x2011-0x2012, |
  * |                              |                    | 0x2016         |
- * | Queue Command and IO tracing |       0x3058       | 0x3006-0x300b  |
+ * | Queue Command and IO tracing |       0x3059       | 0x3006-0x300b  |
  * |                              |                    | 0x3027-0x3028  |
  * |                              |                    | 0x303d-0x3041  |
  * |                              |                    | 0x302d,0x3033  |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index df1b30ba938c..ff9c86b1a0d8 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1957,6 +1957,15 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
         que = MSW(sts->handle);
         req = ha->req_q_map[que];
 
+        /* Check for invalid queue pointer */
+        if (req == NULL ||
+            que >= find_first_zero_bit(ha->req_qid_map, ha->max_req_queues)) {
+                ql_dbg(ql_dbg_io, vha, 0x3059,
+                    "Invalid status handle (0x%x): Bad req pointer. req=%p, "
+                    "que=%u.\n", sts->handle, req, que);
+                return;
+        }
+
         /* Validate handle. */
         if (handle < req->num_outstanding_cmds)
                 sp = req->outstanding_cmds[handle];
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e62d17d41d4e..5693f6d7eddb 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2854,6 +2854,7 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
                 gd->events |= DISK_EVENT_MEDIA_CHANGE;
         }
 
+        blk_pm_runtime_init(sdp->request_queue, dev);
         add_disk(gd);
         if (sdkp->capacity)
                 sd_dif_config_host(sdkp);
@@ -2862,7 +2863,6 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
 
         sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
                   sdp->removable ? "removable " : "");
-        blk_pm_runtime_init(sdp->request_queue, dev);
         scsi_autopm_put_device(sdp);
         put_device(&sdkp->dev);
 }
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 5cbc4bb1b395..df5e961484e1 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -105,8 +105,11 @@ static int scatter_elem_sz_prev = SG_SCATTER_SZ;
 static int sg_add(struct device *, struct class_interface *);
 static void sg_remove(struct device *, struct class_interface *);
 
+static DEFINE_SPINLOCK(sg_open_exclusive_lock);
+
 static DEFINE_IDR(sg_index_idr);
-static DEFINE_RWLOCK(sg_index_lock);
+static DEFINE_RWLOCK(sg_index_lock);    /* Also used to lock
+                                                           file descriptor list for device */
 
 static struct class_interface sg_interface = {
         .add_dev        = sg_add,
@@ -143,7 +146,8 @@ typedef struct sg_request {	/* SG_MAX_QUEUE requests outstanding per file */
 } Sg_request;
 
 typedef struct sg_fd {          /* holds the state of a file descriptor */
-        struct list_head sfd_siblings; /* protected by sfd_lock of device */
+        /* sfd_siblings is protected by sg_index_lock */
+        struct list_head sfd_siblings;
         struct sg_device *parentdp;     /* owning device */
         wait_queue_head_t read_wait;    /* queue read until command done */
         rwlock_t rq_list_lock;  /* protect access to list in req_arr */
@@ -166,12 +170,13 @@ typedef struct sg_fd {		/* holds the state of a file descriptor */
 
 typedef struct sg_device { /* holds the state of each scsi generic device */
         struct scsi_device *device;
+        wait_queue_head_t o_excl_wait;  /* queue open() when O_EXCL in use */
         int sg_tablesize;       /* adapter's max scatter-gather table size */
         u32 index;              /* device index number */
-        spinlock_t sfd_lock;    /* protect file descriptor list for device */
+        /* sfds is protected by sg_index_lock */
         struct list_head sfds;
-        struct rw_semaphore o_sem;      /* exclude open should hold this rwsem */
         volatile char detached; /* 0->attached, 1->detached pending removal */
+        /* exclude protected by sg_open_exclusive_lock */
         char exclude;           /* opened for exclusive access */
         char sgdebug;           /* 0->off, 1->sense, 9->dump dev, 10-> all devs */
         struct gendisk *disk;
@@ -220,14 +225,35 @@ static int sg_allow_access(struct file *filp, unsigned char *cmd)
         return blk_verify_command(cmd, filp->f_mode & FMODE_WRITE);
 }
 
+static int get_exclude(Sg_device *sdp)
+{
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&sg_open_exclusive_lock, flags);
+        ret = sdp->exclude;
+        spin_unlock_irqrestore(&sg_open_exclusive_lock, flags);
+        return ret;
+}
+
+static int set_exclude(Sg_device *sdp, char val)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&sg_open_exclusive_lock, flags);
+        sdp->exclude = val;
+        spin_unlock_irqrestore(&sg_open_exclusive_lock, flags);
+        return val;
+}
+
 static int sfds_list_empty(Sg_device *sdp)
 {
         unsigned long flags;
         int ret;
 
-        spin_lock_irqsave(&sdp->sfd_lock, flags);
+        read_lock_irqsave(&sg_index_lock, flags);
         ret = list_empty(&sdp->sfds);
-        spin_unlock_irqrestore(&sdp->sfd_lock, flags);
+        read_unlock_irqrestore(&sg_index_lock, flags);
         return ret;
 }
 
@@ -239,6 +265,7 @@ sg_open(struct inode *inode, struct file *filp)
         struct request_queue *q;
         Sg_device *sdp;
         Sg_fd *sfp;
+        int res;
         int retval;
 
         nonseekable_open(inode, filp);
@@ -267,52 +294,54 @@ sg_open(struct inode *inode, struct file *filp)
                 goto error_out;
         }
 
-        if ((flags & O_EXCL) && (O_RDONLY == (flags & O_ACCMODE))) {
-                retval = -EPERM; /* Can't lock it with read only access */
-                goto error_out;
-        }
-        if (flags & O_NONBLOCK) {
-                if (flags & O_EXCL) {
-                        if (!down_write_trylock(&sdp->o_sem)) {
-                                retval = -EBUSY;
-                                goto error_out;
-                        }
-                } else {
-                        if (!down_read_trylock(&sdp->o_sem)) {
-                                retval = -EBUSY;
-                                goto error_out;
-                        }
+        if (flags & O_EXCL) {
+                if (O_RDONLY == (flags & O_ACCMODE)) {
+                        retval = -EPERM; /* Can't lock it with read only access */
+                        goto error_out;
+                }
+                if (!sfds_list_empty(sdp) && (flags & O_NONBLOCK)) {
+                        retval = -EBUSY;
+                        goto error_out;
+                }
+                res = wait_event_interruptible(sdp->o_excl_wait,
+                                           ((!sfds_list_empty(sdp) || get_exclude(sdp)) ? 0 : set_exclude(sdp, 1)));
+                if (res) {
+                        retval = res;   /* -ERESTARTSYS because signal hit process */
+                        goto error_out;
+                }
+        } else if (get_exclude(sdp)) {  /* some other fd has an exclusive lock on dev */
+                if (flags & O_NONBLOCK) {
+                        retval = -EBUSY;
+                        goto error_out;
+                }
+                res = wait_event_interruptible(sdp->o_excl_wait, !get_exclude(sdp));
+                if (res) {
+                        retval = res;   /* -ERESTARTSYS because signal hit process */
+                        goto error_out;
                 }
-        } else {
-                if (flags & O_EXCL)
-                        down_write(&sdp->o_sem);
-                else
-                        down_read(&sdp->o_sem);
         }
-        /* Since write lock is held, no need to check sfd_list */
-        if (flags & O_EXCL)
-                sdp->exclude = 1;       /* used by release lock */
-
+        if (sdp->detached) {
+                retval = -ENODEV;
+                goto error_out;
+        }
         if (sfds_list_empty(sdp)) {     /* no existing opens on this device */
                 sdp->sgdebug = 0;
                 q = sdp->device->request_queue;
                 sdp->sg_tablesize = queue_max_segments(q);
         }
-        sfp = sg_add_sfp(sdp, dev);
-        if (!IS_ERR(sfp))
+        if ((sfp = sg_add_sfp(sdp, dev)))
                 filp->private_data = sfp;
-                /* retval is already provably zero at this point because of the
-                 * check after retval = scsi_autopm_get_device(sdp->device))
-                 */
         else {
-                retval = PTR_ERR(sfp);
-
                 if (flags & O_EXCL) {
-                        sdp->exclude = 0;       /* undo if error */
-                        up_write(&sdp->o_sem);
-                } else
-                        up_read(&sdp->o_sem);
+                        set_exclude(sdp, 0);    /* undo if error */
+                        wake_up_interruptible(&sdp->o_excl_wait);
+                }
+                retval = -ENOMEM;
+                goto error_out;
+        }
+        retval = 0;
 error_out:
+        if (retval) {
                 scsi_autopm_put_device(sdp->device);
 sdp_put:
                 scsi_device_put(sdp->device);
@@ -329,18 +358,13 @@ sg_release(struct inode *inode, struct file *filp)
 {
         Sg_device *sdp;
         Sg_fd *sfp;
-        int excl;
 
         if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                 return -ENXIO;
         SCSI_LOG_TIMEOUT(3, printk("sg_release: %s\n", sdp->disk->disk_name));
 
-        excl = sdp->exclude;
-        sdp->exclude = 0;
-        if (excl)
-                up_write(&sdp->o_sem);
-        else
-                up_read(&sdp->o_sem);
+        set_exclude(sdp, 0);
+        wake_up_interruptible(&sdp->o_excl_wait);
 
         scsi_autopm_put_device(sdp->device);
         kref_put(&sfp->f_ref, sg_remove_sfp);
@@ -1391,9 +1415,8 @@ static Sg_device *sg_alloc(struct gendisk *disk, struct scsi_device *scsidp)
         disk->first_minor = k;
         sdp->disk = disk;
         sdp->device = scsidp;
-        spin_lock_init(&sdp->sfd_lock);
         INIT_LIST_HEAD(&sdp->sfds);
-        init_rwsem(&sdp->o_sem);
+        init_waitqueue_head(&sdp->o_excl_wait);
         sdp->sg_tablesize = queue_max_segments(q);
         sdp->index = k;
         kref_init(&sdp->d_ref);
@@ -1526,13 +1549,11 @@ static void sg_remove(struct device *cl_dev, struct class_interface *cl_intf)
 
         /* Need a write lock to set sdp->detached. */
         write_lock_irqsave(&sg_index_lock, iflags);
-        spin_lock(&sdp->sfd_lock);
         sdp->detached = 1;
         list_for_each_entry(sfp, &sdp->sfds, sfd_siblings) {
                 wake_up_interruptible(&sfp->read_wait);
                 kill_fasync(&sfp->async_qp, SIGPOLL, POLL_HUP);
         }
-        spin_unlock(&sdp->sfd_lock);
         write_unlock_irqrestore(&sg_index_lock, iflags);
 
         sysfs_remove_link(&scsidp->sdev_gendev.kobj, "generic");
@@ -2043,7 +2064,7 @@ sg_add_sfp(Sg_device * sdp, int dev)
 
         sfp = kzalloc(sizeof(*sfp), GFP_ATOMIC | __GFP_NOWARN);
         if (!sfp)
-                return ERR_PTR(-ENOMEM);
+                return NULL;
 
         init_waitqueue_head(&sfp->read_wait);
         rwlock_init(&sfp->rq_list_lock);
@@ -2057,13 +2078,9 @@ sg_add_sfp(Sg_device * sdp, int dev)
         sfp->cmd_q = SG_DEF_COMMAND_Q;
         sfp->keep_orphan = SG_DEF_KEEP_ORPHAN;
         sfp->parentdp = sdp;
-        spin_lock_irqsave(&sdp->sfd_lock, iflags);
-        if (sdp->detached) {
-                spin_unlock_irqrestore(&sdp->sfd_lock, iflags);
-                return ERR_PTR(-ENODEV);
-        }
+        write_lock_irqsave(&sg_index_lock, iflags);
         list_add_tail(&sfp->sfd_siblings, &sdp->sfds);
-        spin_unlock_irqrestore(&sdp->sfd_lock, iflags);
+        write_unlock_irqrestore(&sg_index_lock, iflags);
         SCSI_LOG_TIMEOUT(3, printk("sg_add_sfp: sfp=0x%p\n", sfp));
         if (unlikely(sg_big_buff != def_reserved_size))
                 sg_big_buff = def_reserved_size;
@@ -2113,9 +2130,10 @@ static void sg_remove_sfp(struct kref *kref)
         struct sg_device *sdp = sfp->parentdp;
         unsigned long iflags;
 
-        spin_lock_irqsave(&sdp->sfd_lock, iflags);
+        write_lock_irqsave(&sg_index_lock, iflags);
         list_del(&sfp->sfd_siblings);
-        spin_unlock_irqrestore(&sdp->sfd_lock, iflags);
+        write_unlock_irqrestore(&sg_index_lock, iflags);
+        wake_up_interruptible(&sdp->o_excl_wait);
 
         INIT_WORK(&sfp->ew.work, sg_remove_sfp_usercontext);
         schedule_work(&sfp->ew.work);
@@ -2502,7 +2520,7 @@ static int sg_proc_seq_show_devstrs(struct seq_file *s, void *v)
         return 0;
 }
 
-/* must be called while holding sg_index_lock and sfd_lock */
+/* must be called while holding sg_index_lock */
 static void sg_proc_debug_helper(struct seq_file *s, Sg_device * sdp)
 {
         int k, m, new_interface, blen, usg;
@@ -2587,26 +2605,22 @@ static int sg_proc_seq_show_debug(struct seq_file *s, void *v)
 
         read_lock_irqsave(&sg_index_lock, iflags);
         sdp = it ? sg_lookup_dev(it->index) : NULL;
-        if (sdp) {
-                spin_lock(&sdp->sfd_lock);
-                if (!list_empty(&sdp->sfds)) {
-                        struct scsi_device *scsidp = sdp->device;
+        if (sdp && !list_empty(&sdp->sfds)) {
+                struct scsi_device *scsidp = sdp->device;
 
-                        seq_printf(s, " >>> device=%s ", sdp->disk->disk_name);
-                        if (sdp->detached)
-                                seq_printf(s, "detached pending close ");
-                        else
-                                seq_printf
-                                    (s, "scsi%d chan=%d id=%d lun=%d   em=%d",
-                                     scsidp->host->host_no,
-                                     scsidp->channel, scsidp->id,
-                                     scsidp->lun,
-                                     scsidp->host->hostt->emulated);
-                        seq_printf(s, " sg_tablesize=%d excl=%d\n",
-                                   sdp->sg_tablesize, sdp->exclude);
-                        sg_proc_debug_helper(s, sdp);
-                }
-                spin_unlock(&sdp->sfd_lock);
+                seq_printf(s, " >>> device=%s ", sdp->disk->disk_name);
+                if (sdp->detached)
+                        seq_printf(s, "detached pending close ");
+                else
+                        seq_printf
+                            (s, "scsi%d chan=%d id=%d lun=%d   em=%d",
+                             scsidp->host->host_no,
+                             scsidp->channel, scsidp->id,
+                             scsidp->lun,
+                             scsidp->host->hostt->emulated);
+                seq_printf(s, " sg_tablesize=%d excl=%d\n",
+                           sdp->sg_tablesize, get_exclude(sdp));
+                sg_proc_debug_helper(s, sdp);
         }
         read_unlock_irqrestore(&sg_index_lock, iflags);
         return 0;
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index f91bc1fdd895..639ba96adb36 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1960,6 +1960,7 @@ cntrlEnd:
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Called IOCTL_BCM_GET_DEVICE_DRIVER_INFO\n");
 
+                memset(&DevInfo, 0, sizeof(DevInfo));
                 DevInfo.MaxRDMBufferSize = BUFFER_4K;
                 DevInfo.u32DSDStartOffset = EEPROM_CALPARAM_START;
                 DevInfo.u32RxAlignmentCorrection = 0;
diff --git a/drivers/staging/media/msi3101/Kconfig b/drivers/staging/media/msi3101/Kconfig
index b94a95a597d6..76d5bbd4d93c 100644
--- a/drivers/staging/media/msi3101/Kconfig
+++ b/drivers/staging/media/msi3101/Kconfig
@@ -1,3 +1,4 @@
 config USB_MSI3101
         tristate "Mirics MSi3101 SDR Dongle"
         depends on USB && VIDEO_DEV && VIDEO_V4L2
+        select VIDEOBUF2_VMALLOC
diff --git a/drivers/staging/media/msi3101/sdr-msi3101.c b/drivers/staging/media/msi3101/sdr-msi3101.c
index 24c7b70a6cbf..4c3bf776bb20 100644
--- a/drivers/staging/media/msi3101/sdr-msi3101.c
+++ b/drivers/staging/media/msi3101/sdr-msi3101.c
@@ -1131,7 +1131,13 @@ static int msi3101_queue_setup(struct vb2_queue *vq,
         /* Absolute min and max number of buffers available for mmap() */
         *nbuffers = 32;
         *nplanes = 1;
-        sizes[0] = PAGE_ALIGN(3 * 3072); /* 3 * 768 * 4 */
+        /*
+         *   3, wMaxPacketSize 3x 1024 bytes
+         * 504, max IQ sample pairs per 1024 frame
+         *   2, two samples, I and Q
+         *   4, 32-bit float
+         */
+        sizes[0] = PAGE_ALIGN(3 * 504 * 2 * 4); /* = 12096 */
         dev_dbg(&s->udev->dev, "%s: nbuffers=%d sizes[0]=%d\n",
                         __func__, *nbuffers, sizes[0]);
         return 0;
@@ -1657,7 +1663,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
                         f->frequency * 625UL / 10UL);
 }
 
-const struct v4l2_ioctl_ops msi3101_ioctl_ops = {
+static const struct v4l2_ioctl_ops msi3101_ioctl_ops = {
         .vidioc_querycap          = msi3101_querycap,
 
         .vidioc_enum_input        = msi3101_enum_input,
diff --git a/drivers/staging/ozwpan/ozcdev.c b/drivers/staging/ozwpan/ozcdev.c
index 6ccb64fb0786..6ce0af9977d8 100644
--- a/drivers/staging/ozwpan/ozcdev.c
+++ b/drivers/staging/ozwpan/ozcdev.c
@@ -155,6 +155,9 @@ static ssize_t oz_cdev_write(struct file *filp, const char __user *buf,
         struct oz_app_hdr *app_hdr;
         struct oz_serial_ctx *ctx;
 
+        if (count > sizeof(ei->data) - sizeof(*elt) - sizeof(*app_hdr))
+                return -EINVAL;
+
         spin_lock_bh(&g_cdev.lock);
         pd = g_cdev.active_pd;
         if (pd)
diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c
index 23db32f07fd5..a10cdb17038b 100644
--- a/drivers/staging/sb105x/sb_pci_mp.c
+++ b/drivers/staging/sb105x/sb_pci_mp.c
@@ -1063,7 +1063,7 @@ static int mp_wait_modem_status(struct sb_uart_state *state, unsigned long arg)
 
 static int mp_get_count(struct sb_uart_state *state, struct serial_icounter_struct *icnt)
 {
-        struct serial_icounter_struct icount;
+        struct serial_icounter_struct icount = {};
         struct sb_uart_icount cnow;
         struct sb_uart_port *port = state->port;
 
diff --git a/drivers/staging/wlags49_h2/wl_priv.c b/drivers/staging/wlags49_h2/wl_priv.c
index c97e0e154d28..7e10dcdc3090 100644
--- a/drivers/staging/wlags49_h2/wl_priv.c
+++ b/drivers/staging/wlags49_h2/wl_priv.c
@@ -570,6 +570,7 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
         ltv_t                   *pLtv;
         bool_t                  ltvAllocated = FALSE;
         ENCSTRCT                sEncryption;
+        size_t                  len;
 
 #ifdef USE_WDS
         hcf_16                  hcfPort  = HCF_PORT_0;
@@ -686,7 +687,8 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
                                         break;
                                 case CFG_CNF_OWN_NAME:
                                         memset(lp->StationName, 0, sizeof(lp->StationName));
-                                        memcpy((void *)lp->StationName, (void *)&pLtv->u.u8[2], (size_t)pLtv->u.u16[0]);
+                                        len = min_t(size_t, pLtv->u.u16[0], sizeof(lp->StationName));
+                                        strlcpy(lp->StationName, &pLtv->u.u8[2], len);
                                         pLtv->u.u16[0] = CNV_INT_TO_LITTLE(pLtv->u.u16[0]);
                                         break;
                                 case CFG_CNF_LOAD_BALANCING:
@@ -1783,6 +1785,7 @@ int wvlan_set_station_nickname(struct net_device *dev,
 {
         struct wl_private *lp = wl_priv(dev);
         unsigned long flags;
+        size_t len;
         int         ret = 0;
         /*------------------------------------------------------------------------*/
 
@@ -1793,8 +1796,8 @@ int wvlan_set_station_nickname(struct net_device *dev,
         wl_lock(lp, &flags);
 
         memset(lp->StationName, 0, sizeof(lp->StationName));
-
-        memcpy(lp->StationName, extra, wrqu->data.length);
+        len = min_t(size_t, wrqu->data.length, sizeof(lp->StationName));
+        strlcpy(lp->StationName, extra, len);
 
         /* Commit the adapter parameters */
         wl_apply(lp);
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 551c96ca60ac..0f199f6a0738 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -134,10 +134,10 @@ static int pscsi_pmode_enable_hba(struct se_hba *hba, unsigned long mode_flag)
          * pSCSI Host ID and enable for phba mode
          */
         sh = scsi_host_lookup(phv->phv_host_id);
-        if (IS_ERR(sh)) {
+        if (!sh) {
                 pr_err("pSCSI: Unable to locate SCSI Host for"
                         " phv_host_id: %d\n", phv->phv_host_id);
-                return PTR_ERR(sh);
+                return -EINVAL;
         }
 
         phv->phv_lld_host = sh;
@@ -515,10 +515,10 @@ static int pscsi_configure_device(struct se_device *dev)
                         sh = phv->phv_lld_host;
                 } else {
                         sh = scsi_host_lookup(pdv->pdv_host_id);
-                        if (IS_ERR(sh)) {
+                        if (!sh) {
                                 pr_err("pSCSI: Unable to locate"
                                         " pdv_host_id: %d\n", pdv->pdv_host_id);
-                                return PTR_ERR(sh);
+                                return -EINVAL;
                         }
                 }
         } else {
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c
index 4714c6f8da4b..d9b92b2c524d 100644
--- a/drivers/target/target_core_sbc.c
+++ b/drivers/target/target_core_sbc.c
@@ -263,6 +263,11 @@ sbc_setup_write_same(struct se_cmd *cmd, unsigned char *flags, struct sbc_ops *o
                         sectors, cmd->se_dev->dev_attrib.max_write_same_len);
                 return TCM_INVALID_CDB_FIELD;
         }
+        /* We always have ANC_SUP == 0 so setting ANCHOR is always an error */
+        if (flags[0] & 0x10) {
+                pr_warn("WRITE SAME with ANCHOR not supported\n");
+                return TCM_INVALID_CDB_FIELD;
+        }
         /*
          * Special case for WRITE_SAME w/ UNMAP=1 that ends up getting
          * translated into block discard requests within backend code.
diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c
index 3da4fd10b9f8..474cd44fac14 100644
--- a/drivers/target/target_core_xcopy.c
+++ b/drivers/target/target_core_xcopy.c
@@ -82,6 +82,9 @@ static int target_xcopy_locate_se_dev_e4(struct se_cmd *se_cmd, struct xcopy_op
         mutex_lock(&g_device_mutex);
         list_for_each_entry(se_dev, &g_device_list, g_dev_node) {
 
+                if (!se_dev->dev_attrib.emulate_3pc)
+                        continue;
+
                 memset(&tmp_dev_wwn[0], 0, XCOPY_NAA_IEEE_REGEX_LEN);
                 target_xcopy_gen_naa_ieee(se_dev, &tmp_dev_wwn[0]);
 
@@ -357,6 +360,7 @@ struct xcopy_pt_cmd {
         struct se_cmd se_cmd;
         struct xcopy_op *xcopy_op;
         struct completion xpt_passthrough_sem;
+        unsigned char sense_buffer[TRANSPORT_SENSE_BUFFER];
 };
 
 static struct se_port xcopy_pt_port;
@@ -675,7 +679,8 @@ static int target_xcopy_issue_pt_cmd(struct xcopy_pt_cmd *xpt_cmd)
 
         pr_debug("target_xcopy_issue_pt_cmd(): SCSI status: 0x%02x\n",
                         se_cmd->scsi_status);
-        return 0;
+
+        return (se_cmd->scsi_status) ? -EINVAL : 0;
 }
 
 static int target_xcopy_read_source(
@@ -708,7 +713,7 @@ static int target_xcopy_read_source(
                 (unsigned long long)src_lba, src_sectors, length);
 
         transport_init_se_cmd(se_cmd, &xcopy_pt_tfo, NULL, length,
-                                DMA_FROM_DEVICE, 0, NULL);
+                              DMA_FROM_DEVICE, 0, &xpt_cmd->sense_buffer[0]);
         xop->src_pt_cmd = xpt_cmd;
 
         rc = target_xcopy_setup_pt_cmd(xpt_cmd, xop, src_dev, &cdb[0],
@@ -768,7 +773,7 @@ static int target_xcopy_write_destination(
                 (unsigned long long)dst_lba, dst_sectors, length);
 
         transport_init_se_cmd(se_cmd, &xcopy_pt_tfo, NULL, length,
-                                DMA_TO_DEVICE, 0, NULL);
+                              DMA_TO_DEVICE, 0, &xpt_cmd->sense_buffer[0]);
         xop->dst_pt_cmd = xpt_cmd;
 
         rc = target_xcopy_setup_pt_cmd(xpt_cmd, xop, dst_dev, &cdb[0],
@@ -884,30 +889,42 @@ out:
 
 sense_reason_t target_do_xcopy(struct se_cmd *se_cmd)
 {
+        struct se_device *dev = se_cmd->se_dev;
         struct xcopy_op *xop = NULL;
         unsigned char *p = NULL, *seg_desc;
         unsigned int list_id, list_id_usage, sdll, inline_dl, sa;
+        sense_reason_t ret = TCM_INVALID_PARAMETER_LIST;
         int rc;
         unsigned short tdll;
 
+        if (!dev->dev_attrib.emulate_3pc) {
+                pr_err("EXTENDED_COPY operation explicitly disabled\n");
+                return TCM_UNSUPPORTED_SCSI_OPCODE;
+        }
+
         sa = se_cmd->t_task_cdb[1] & 0x1f;
         if (sa != 0x00) {
                 pr_err("EXTENDED_COPY(LID4) not supported\n");
                 return TCM_UNSUPPORTED_SCSI_OPCODE;
         }
 
+        xop = kzalloc(sizeof(struct xcopy_op), GFP_KERNEL);
+        if (!xop) {
+                pr_err("Unable to allocate xcopy_op\n");
+                return TCM_OUT_OF_RESOURCES;
+        }
+        xop->xop_se_cmd = se_cmd;
+
         p = transport_kmap_data_sg(se_cmd);
         if (!p) {
                 pr_err("transport_kmap_data_sg() failed in target_do_xcopy\n");
+                kfree(xop);
                 return TCM_OUT_OF_RESOURCES;
         }
 
         list_id = p[0];
-        if (list_id != 0x00) {
-                pr_err("XCOPY with non zero list_id: 0x%02x\n", list_id);
-                goto out;
-        }
-        list_id_usage = (p[1] & 0x18);
+        list_id_usage = (p[1] & 0x18) >> 3;
+
         /*
          * Determine TARGET DESCRIPTOR LIST LENGTH + SEGMENT DESCRIPTOR LIST LENGTH
          */
@@ -920,13 +937,6 @@ sense_reason_t target_do_xcopy(struct se_cmd *se_cmd)
                 goto out;
         }
 
-        xop = kzalloc(sizeof(struct xcopy_op), GFP_KERNEL);
-        if (!xop) {
-                pr_err("Unable to allocate xcopy_op\n");
-                goto out;
-        }
-        xop->xop_se_cmd = se_cmd;
-
         pr_debug("Processing XCOPY with list_id: 0x%02x list_id_usage: 0x%02x"
                 " tdll: %hu sdll: %u inline_dl: %u\n", list_id, list_id_usage,
                 tdll, sdll, inline_dl);
@@ -935,6 +945,17 @@ sense_reason_t target_do_xcopy(struct se_cmd *se_cmd)
         if (rc <= 0)
                 goto out;
 
+        if (xop->src_dev->dev_attrib.block_size !=
+            xop->dst_dev->dev_attrib.block_size) {
+                pr_err("XCOPY: Non matching src_dev block_size: %u + dst_dev"
+                       " block_size: %u currently unsupported\n",
+                        xop->src_dev->dev_attrib.block_size,
+                        xop->dst_dev->dev_attrib.block_size);
+                xcopy_pt_undepend_remotedev(xop);
+                ret = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
+                goto out;
+        }
+
         pr_debug("XCOPY: Processed %d target descriptors, length: %u\n", rc,
                                 rc * XCOPY_TARGET_DESC_LEN);
         seg_desc = &p[16];
@@ -957,7 +978,7 @@ out:
         if (p)
                 transport_kunmap_data_sg(se_cmd);
         kfree(xop);
-        return TCM_INVALID_CDB_FIELD;
+        return ret;
 }
 
 static sense_reason_t target_rcr_operating_parameters(struct se_cmd *se_cmd)
diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c
index f10a6ad37c06..c2301da08ac7 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.c
+++ b/drivers/thermal/samsung/exynos_thermal_common.c
@@ -310,8 +310,6 @@ void exynos_report_trigger(struct thermal_sensor_conf *conf)
         }
 
         th_zone = conf->pzone_data;
-        if (th_zone->therm_dev)
-                return;
 
         if (th_zone->bind == false) {
                 for (i = 0; i < th_zone->cool_dev_size; i++) {
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index b43afda8acd1..32f38b90c4f6 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -317,6 +317,9 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
 
         con = readl(data->base + reg->tmu_ctrl);
 
+        if (pdata->test_mux)
+                con |= (pdata->test_mux << reg->test_mux_addr_shift);
+
         if (pdata->reference_voltage) {
                 con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift);
                 con |= pdata->reference_voltage << reg->buf_vref_sel_shift;
@@ -488,7 +491,7 @@ static const struct of_device_id exynos_tmu_match[] = {
         },
         {
                 .compatible = "samsung,exynos4412-tmu",
-                .data = (void *)EXYNOS5250_TMU_DRV_DATA,
+                .data = (void *)EXYNOS4412_TMU_DRV_DATA,
         },
         {
                 .compatible = "samsung,exynos5250-tmu",
@@ -629,9 +632,10 @@ static int exynos_tmu_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
-        if (pdata->type == SOC_ARCH_EXYNOS ||
-                pdata->type == SOC_ARCH_EXYNOS4210 ||
-                                pdata->type == SOC_ARCH_EXYNOS5440)
+        if (pdata->type == SOC_ARCH_EXYNOS4210 ||
+            pdata->type == SOC_ARCH_EXYNOS4412 ||
+            pdata->type == SOC_ARCH_EXYNOS5250 ||
+            pdata->type == SOC_ARCH_EXYNOS5440)
                 data->soc = pdata->type;
         else {
                 ret = -EINVAL;
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
index b364c9eee701..3fb65547e64c 100644
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -41,7 +41,8 @@ enum calibration_mode {
 
 enum soc_type {
         SOC_ARCH_EXYNOS4210 = 1,
-        SOC_ARCH_EXYNOS,
+        SOC_ARCH_EXYNOS4412,
+        SOC_ARCH_EXYNOS5250,
         SOC_ARCH_EXYNOS5440,
 };
 
@@ -84,6 +85,7 @@ enum soc_type {
  * @triminfo_reload_shift: shift of triminfo reload enable bit in triminfo_ctrl
         reg.
  * @tmu_ctrl: TMU main controller register.
+ * @test_mux_addr_shift: shift bits of test mux address.
  * @buf_vref_sel_shift: shift bits of reference voltage in tmu_ctrl register.
  * @buf_vref_sel_mask: mask bits of reference voltage in tmu_ctrl register.
  * @therm_trip_mode_shift: shift bits of tripping mode in tmu_ctrl register.
@@ -150,6 +152,7 @@ struct exynos_tmu_registers {
         u32     triminfo_reload_shift;
 
         u32     tmu_ctrl;
+        u32     test_mux_addr_shift;
         u32     buf_vref_sel_shift;
         u32     buf_vref_sel_mask;
         u32     therm_trip_mode_shift;
@@ -257,6 +260,7 @@ struct exynos_tmu_registers {
  * @first_point_trim: temp value of the first point trimming
  * @second_point_trim: temp value of the second point trimming
  * @default_temp_offset: default temperature offset in case of no trimming
+ * @test_mux; information if SoC supports test MUX
  * @cal_type: calibration type for temperature
  * @cal_mode: calibration mode for temperature
  * @freq_clip_table: Table representing frequency reduction percentage.
@@ -286,6 +290,7 @@ struct exynos_tmu_platform_data {
         u8 first_point_trim;
         u8 second_point_trim;
         u8 default_temp_offset;
+        u8 test_mux;
 
         enum calibration_type cal_type;
         enum calibration_mode cal_mode;
diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
index 9002499c1f69..073c292baa53 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.c
+++ b/drivers/thermal/samsung/exynos_tmu_data.c
@@ -90,14 +90,15 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
 };
 #endif
 
-#if defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412)
-static const struct exynos_tmu_registers exynos5250_tmu_registers = {
+#if defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250)
+static const struct exynos_tmu_registers exynos4412_tmu_registers = {
         .triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
         .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
         .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
         .triminfo_ctrl = EXYNOS_TMU_TRIMINFO_CON,
         .triminfo_reload_shift = EXYNOS_TRIMINFO_RELOAD_SHIFT,
         .tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
+        .test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
         .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
         .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
         .therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
@@ -128,7 +129,7 @@ static const struct exynos_tmu_registers exynos5250_tmu_registers = {
         .emul_time_mask = EXYNOS_EMUL_TIME_MASK,
 };
 
-#define EXYNOS5250_TMU_DATA \
+#define EXYNOS4412_TMU_DATA \
         .threshold_falling = 10, \
         .trigger_levels[0] = 85, \
         .trigger_levels[1] = 103, \
@@ -162,15 +163,32 @@ static const struct exynos_tmu_registers exynos5250_tmu_registers = {
                 .temp_level = 103, \
         }, \
         .freq_tab_count = 2, \
-        .type = SOC_ARCH_EXYNOS, \
-        .registers = &exynos5250_tmu_registers, \
+        .registers = &exynos4412_tmu_registers, \
         .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \
                         TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \
                         TMU_SUPPORT_EMUL_TIME)
+#endif
 
+#if defined(CONFIG_SOC_EXYNOS4412)
+struct exynos_tmu_init_data const exynos4412_default_tmu_data = {
+        .tmu_data = {
+                {
+                        EXYNOS4412_TMU_DATA,
+                        .type = SOC_ARCH_EXYNOS4412,
+                        .test_mux = EXYNOS4412_MUX_ADDR_VALUE,
+                },
+        },
+        .tmu_count = 1,
+};
+#endif
+
+#if defined(CONFIG_SOC_EXYNOS5250)
 struct exynos_tmu_init_data const exynos5250_default_tmu_data = {
         .tmu_data = {
-                { EXYNOS5250_TMU_DATA },
+                {
+                        EXYNOS4412_TMU_DATA,
+                        .type = SOC_ARCH_EXYNOS5250,
+                },
         },
         .tmu_count = 1,
 };
diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/thermal/samsung/exynos_tmu_data.h
index dc7feb51099b..a1ea19d9e0a6 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.h
+++ b/drivers/thermal/samsung/exynos_tmu_data.h
@@ -95,6 +95,10 @@
 
 #define EXYNOS_MAX_TRIGGER_PER_REG      4
 
+/* Exynos4412 specific */
+#define EXYNOS4412_MUX_ADDR_VALUE          6
+#define EXYNOS4412_MUX_ADDR_SHIFT          20
+
 /*exynos5440 specific registers*/
 #define EXYNOS5440_TMU_S0_7_TRIM                0x000
 #define EXYNOS5440_TMU_S0_7_CTRL                0x020
@@ -138,7 +142,14 @@ extern struct exynos_tmu_init_data const exynos4210_default_tmu_data;
 #define EXYNOS4210_TMU_DRV_DATA (NULL)
 #endif
 
-#if (defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412))
+#if defined(CONFIG_SOC_EXYNOS4412)
+extern struct exynos_tmu_init_data const exynos4412_default_tmu_data;
+#define EXYNOS4412_TMU_DRV_DATA (&exynos4412_default_tmu_data)
+#else
+#define EXYNOS4412_TMU_DRV_DATA (NULL)
+#endif
+
+#if defined(CONFIG_SOC_EXYNOS5250)
 extern struct exynos_tmu_init_data const exynos5250_default_tmu_data;
 #define EXYNOS5250_TMU_DRV_DATA (&exynos5250_default_tmu_data)
 #else
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index eeef0e2498ca..fdb07199d9c2 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -159,7 +159,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
 
         INIT_LIST_HEAD(&hwmon->tz_list);
         strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH);
-        hwmon->device = hwmon_device_register(&tz->device);
+        hwmon->device = hwmon_device_register(NULL);
         if (IS_ERR(hwmon->device)) {
                 result = PTR_ERR(hwmon->device);
                 goto free_mem;
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index 4f8b9af54a5a..5a47cc8c8f85 100644
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
@@ -110,6 +110,7 @@ static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal,
                 } else {
                         dev_err(bgp->dev,
                                 "Failed to read PCB state. Using defaults\n");
+                        ret = 0;
                 }
         }
         *temp = ti_thermal_hotspot_temperature(tmp, slope, constant);
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
index f36950e4134f..7722cb9d5a80 100644
--- a/drivers/thermal/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/x86_pkg_temp_thermal.c
@@ -316,18 +316,19 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work)
         int phy_id = topology_physical_package_id(cpu);
         struct phy_dev_entry *phdev = pkg_temp_thermal_get_phy_entry(cpu);
         bool notify = false;
+        unsigned long flags;
 
         if (!phdev)
                 return;
 
-        spin_lock(&pkg_work_lock);
+        spin_lock_irqsave(&pkg_work_lock, flags);
         ++pkg_work_cnt;
         if (unlikely(phy_id > max_phy_id)) {
-                spin_unlock(&pkg_work_lock);
+                spin_unlock_irqrestore(&pkg_work_lock, flags);
                 return;
         }
         pkg_work_scheduled[phy_id] = 0;
-        spin_unlock(&pkg_work_lock);
+        spin_unlock_irqrestore(&pkg_work_lock, flags);
 
         enable_pkg_thres_interrupt();
         rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val);
@@ -397,6 +398,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
         int thres_count;
         u32 eax, ebx, ecx, edx;
         u8 *temp;
+        unsigned long flags;
 
         cpuid(6, &eax, &ebx, &ecx, &edx);
         thres_count = ebx & 0x07;
@@ -420,19 +422,19 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
                 goto err_ret_unlock;
         }
 
-        spin_lock(&pkg_work_lock);
+        spin_lock_irqsave(&pkg_work_lock, flags);
         if (topology_physical_package_id(cpu) > max_phy_id)
                 max_phy_id = topology_physical_package_id(cpu);
         temp = krealloc(pkg_work_scheduled,
                         (max_phy_id+1) * sizeof(u8), GFP_ATOMIC);
         if (!temp) {
-                spin_unlock(&pkg_work_lock);
+                spin_unlock_irqrestore(&pkg_work_lock, flags);
                 err = -ENOMEM;
                 goto err_ret_free;
         }
         pkg_work_scheduled = temp;
         pkg_work_scheduled[topology_physical_package_id(cpu)] = 0;
-        spin_unlock(&pkg_work_lock);
+        spin_unlock_irqrestore(&pkg_work_lock, flags);
 
         phy_dev_entry->phys_proc_id = topology_physical_package_id(cpu);
         phy_dev_entry->first_cpu = cpu;
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index d067285a2d20..6b0f75eac8a2 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1499,7 +1499,7 @@ static void atmel_set_ops(struct uart_port *port)
 /*
  * Get ip name usart or uart
  */
-static int atmel_get_ip_name(struct uart_port *port)
+static void atmel_get_ip_name(struct uart_port *port)
 {
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
         int name = UART_GET_IP_NAME(port);
@@ -1518,10 +1518,7 @@ static int atmel_get_ip_name(struct uart_port *port)
                 atmel_port->is_usart = false;
         } else {
                 dev_err(port->dev, "Not supported ip name, set to uart\n");
-                return -EINVAL;
         }
-
-        return 0;
 }
 
 /*
@@ -2405,9 +2402,7 @@ static int atmel_serial_probe(struct platform_device *pdev)
         /*
          * Get port name of usart or uart
          */
-        ret = atmel_get_ip_name(&port->uart);
-        if (ret < 0)
-                goto err_add_port;
+        atmel_get_ip_name(&port->uart);
 
         return 0;
 
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/uio/uio.c b/drivers/uio/uio.c
index ba475632c5fa..0e808cf91d97 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -642,16 +642,29 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
 {
         struct uio_device *idev = vma->vm_private_data;
         int mi = uio_find_mem_index(vma);
+        struct uio_mem *mem;
         if (mi < 0)
                 return -EINVAL;
+        mem = idev->info->mem + mi;
 
-        vma->vm_ops = &uio_physical_vm_ops;
+        if (vma->vm_end - vma->vm_start > mem->size)
+                return -EINVAL;
 
+        vma->vm_ops = &uio_physical_vm_ops;
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
+        /*
+         * We cannot use the vm_iomap_memory() helper here,
+         * because vma->vm_pgoff is the map index we looked
+         * up above in uio_find_mem_index(), rather than an
+         * actual page offset into the mmap.
+         *
+         * So we just do the physical mmap without a page
+         * offset.
+         */
         return remap_pfn_range(vma,
                                vma->vm_start,
-                               idev->info->mem[mi].addr >> PAGE_SHIFT,
+                               mem->addr >> PAGE_SHIFT,
                                vma->vm_end - vma->vm_start,
                                vma->vm_page_prot);
 }
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/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index c45f9c0a1b34..b21d553c245b 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -904,6 +904,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
         /* Crucible Devices */
         { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) },
         { }                                     /* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 1b8af461b522..a7019d1e3058 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1307,3 +1307,9 @@
  * Manufacturer: Crucible Technologies
  */
 #define FTDI_CT_COMET_PID       0x8e08
+
+/*
+ * Product: Z3X Box
+ * Manufacturer: Smart GSM Team
+ */
+#define FTDI_Z3X_PID            0x0011
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/pl2303.c b/drivers/usb/serial/pl2303.c
index bedf8e47713b..1e6de4cd079d 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -4,11 +4,6 @@
  * Copyright (C) 2001-2007 Greg Kroah-Hartman (greg@kroah.com)
  * Copyright (C) 2003 IBM Corp.
  *
- * Copyright (C) 2009, 2013 Frank Schäfer <fschaefer.oss@googlemail.com>
- *  - fixes, improvements and documentation for the baud rate encoding methods
- * Copyright (C) 2013 Reinhard Max <max@suse.de>
- *  - fixes and improvements for the divisor based baud rate encoding method
- *
  * Original driver for 2.2.x by anonymous
  *
  *      This program is free software; you can redistribute it and/or
@@ -134,18 +129,10 @@ MODULE_DEVICE_TABLE(usb, id_table);
 
 
 enum pl2303_type {
-        type_0,         /* H version ? */
-        type_1,         /* H version ? */
-        HX_TA,          /* HX(A) / X(A) / TA version  */ /* TODO: improve */
-        HXD_EA_RA_SA,   /* HXD / EA / RA / SA version */ /* TODO: improve */
-        TB,             /* TB version */
-        HX_CLONE,       /* Cheap and less functional clone of the HX chip */
+        type_0,         /* don't know the difference between type 0 and */
+        type_1,         /* type 1, until someone from prolific tells us... */
+        HX,             /* HX version of the pl2303 chip */
 };
-/*
- * NOTE: don't know the difference between type 0 and type 1,
- * until someone from Prolific tells us...
- * TODO: distinguish between X/HX, TA and HXD, EA, RA, SA variants
- */
 
 struct pl2303_serial_private {
         enum pl2303_type type;
@@ -185,7 +172,6 @@ static int pl2303_startup(struct usb_serial *serial)
 {
         struct pl2303_serial_private *spriv;
         enum pl2303_type type = type_0;
-        char *type_str = "unknown (treating as type_0)";
         unsigned char *buf;
 
         spriv = kzalloc(sizeof(*spriv), GFP_KERNEL);
@@ -198,53 +184,15 @@ static int pl2303_startup(struct usb_serial *serial)
                 return -ENOMEM;
         }
 
-        if (serial->dev->descriptor.bDeviceClass == 0x02) {
+        if (serial->dev->descriptor.bDeviceClass == 0x02)
                 type = type_0;
-                type_str = "type_0";
-        } else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40) {
-                /*
-                 * NOTE: The bcdDevice version is the only difference between
-                 * the device descriptors of the X/HX, HXD, EA, RA, SA, TA, TB
-                 */
-                if (le16_to_cpu(serial->dev->descriptor.bcdDevice) == 0x300) {
-                        /* Check if the device is a clone */
-                        pl2303_vendor_read(0x9494, 0, serial, buf);
-                        /*
-                         * NOTE: Not sure if this read is really needed.
-                         * The HX returns 0x00, the clone 0x02, but the Windows
-                         * driver seems to ignore the value and continues.
-                         */
-                        pl2303_vendor_write(0x0606, 0xaa, serial);
-                        pl2303_vendor_read(0x8686, 0, serial, buf);
-                        if (buf[0] != 0xaa) {
-                                type = HX_CLONE;
-                                type_str = "X/HX clone (limited functionality)";
-                        } else {
-                                type = HX_TA;
-                                type_str = "X/HX/TA";
-                        }
-                        pl2303_vendor_write(0x0606, 0x00, serial);
-                } else if (le16_to_cpu(serial->dev->descriptor.bcdDevice)
-                                                                     == 0x400) {
-                        type = HXD_EA_RA_SA;
-                        type_str = "HXD/EA/RA/SA";
-                } else if (le16_to_cpu(serial->dev->descriptor.bcdDevice)
-                                                                     == 0x500) {
-                        type = TB;
-                        type_str = "TB";
-                } else {
-                        dev_info(&serial->interface->dev,
-                                           "unknown/unsupported device type\n");
-                        kfree(spriv);
-                        kfree(buf);
-                        return -ENODEV;
-                }
-        } else if (serial->dev->descriptor.bDeviceClass == 0x00
-                   || serial->dev->descriptor.bDeviceClass == 0xFF) {
+        else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40)
+                type = HX;
+        else if (serial->dev->descriptor.bDeviceClass == 0x00)
                 type = type_1;
-                type_str = "type_1";
-        }
-        dev_dbg(&serial->interface->dev, "device type: %s\n", type_str);
+        else if (serial->dev->descriptor.bDeviceClass == 0xFF)
+                type = type_1;
+        dev_dbg(&serial->interface->dev, "device type: %d\n", type);
 
         spriv->type = type;
         usb_set_serial_data(serial, spriv);
@@ -259,10 +207,10 @@ static int pl2303_startup(struct usb_serial *serial)
         pl2303_vendor_read(0x8383, 0, serial, buf);
         pl2303_vendor_write(0, 1, serial);
         pl2303_vendor_write(1, 0, serial);
-        if (type == type_0 || type == type_1)
-                pl2303_vendor_write(2, 0x24, serial);
-        else
+        if (type == HX)
                 pl2303_vendor_write(2, 0x44, serial);
+        else
+                pl2303_vendor_write(2, 0x24, serial);
 
         kfree(buf);
         return 0;
@@ -316,174 +264,65 @@ static int pl2303_set_control_lines(struct usb_serial_port *port, u8 value)
         return retval;
 }
 
-static int pl2303_baudrate_encode_direct(int baud, enum pl2303_type type,
-                                                                      u8 buf[4])
+static void pl2303_encode_baudrate(struct tty_struct *tty,
+                                        struct usb_serial_port *port,
+                                        u8 buf[4])
 {
-        /*
-         * NOTE: Only the values defined in baud_sup are supported !
-         * => if unsupported values are set, the PL2303 uses 9600 baud instead
-         * => HX clones just don't work at unsupported baud rates < 115200 baud,
-         *    for baud rates > 115200 they run at 115200 baud
-         */
         const int baud_sup[] = { 75, 150, 300, 600, 1200, 1800, 2400, 3600,
-                                 4800, 7200, 9600, 14400, 19200, 28800, 38400,
-                                 57600, 115200, 230400, 460800, 614400, 921600,
-                                 1228800, 2457600, 3000000, 6000000, 12000000 };
+                                 4800, 7200, 9600, 14400, 19200, 28800, 38400,
+                                 57600, 115200, 230400, 460800, 500000, 614400,
+                                 921600, 1228800, 2457600, 3000000, 6000000 };
+
+        struct usb_serial *serial = port->serial;
+        struct pl2303_serial_private *spriv = usb_get_serial_data(serial);
+        int baud;
+        int i;
+
         /*
-         * NOTE: With the exception of type_0/1 devices, the following
-         * additional baud rates are supported (tested with HX rev. 3A only):
-         * 110*, 56000*, 128000, 134400, 161280, 201600, 256000*, 268800,
-         * 403200, 806400.      (*: not HX and HX clones)
-         *
-         * Maximum values: HXD, TB: 12000000; HX, TA: 6000000;
-         *                 type_0+1: 1228800; RA: 921600; HX clones, SA: 115200
-         *
-         * As long as we are not using this encoding method for anything else
-         * than the type_0+1, HX and HX clone chips, there is no point in
-         * complicating the code to support them.
+         * NOTE: Only the values defined in baud_sup are supported!
+         *       => if unsupported values are set, the PL2303 seems to use
+         *          9600 baud (at least my PL2303X always does)
          */
-        int i;
+        baud = tty_get_baud_rate(tty);
+        dev_dbg(&port->dev, "baud requested = %d\n", baud);
+        if (!baud)
+                return;
 
         /* Set baudrate to nearest supported value */
         for (i = 0; i < ARRAY_SIZE(baud_sup); ++i) {
                 if (baud_sup[i] > baud)
                         break;
         }
+
         if (i == ARRAY_SIZE(baud_sup))
                 baud = baud_sup[i - 1];
         else if (i > 0 && (baud_sup[i] - baud) > (baud - baud_sup[i - 1]))
                 baud = baud_sup[i - 1];
         else
                 baud = baud_sup[i];
-        /* Respect the chip type specific baud rate limits */
-        /*
-         * FIXME: as long as we don't know how to distinguish between the
-         * HXD, EA, RA, and SA chip variants, allow the max. value of 12M.
-         */
-        if (type == HX_TA)
-                baud = min_t(int, baud, 6000000);
-        else if (type == type_0 || type == type_1)
-                baud = min_t(int, baud, 1228800);
-        else if (type == HX_CLONE)
-                baud = min_t(int, baud, 115200);
-        /* Direct (standard) baud rate encoding method */
-        put_unaligned_le32(baud, buf);
-
-        return baud;
-}
 
-static int pl2303_baudrate_encode_divisor(int baud, enum pl2303_type type,
-                                                                      u8 buf[4])
-{
-        /*
-         * Divisor based baud rate encoding method
-         *
-         * NOTE: HX clones do NOT support this method.
-         * It's not clear if the type_0/1 chips support it.
-         *
-         * divisor = 12MHz * 32 / baudrate = 2^A * B
-         *
-         * with
-         *
-         * A = buf[1] & 0x0e
-         * B = buf[0]  +  (buf[1] & 0x01) << 8
-         *
-         * Special cases:
-         * => 8 < B < 16: device seems to work not properly
-         * => B <= 8: device uses the max. value B = 512 instead
-         */
-        unsigned int A, B;
+        /* type_0, type_1 only support up to 1228800 baud */
+        if (spriv->type != HX)
+                baud = min_t(int, baud, 1228800);
 
-        /*
-         * NOTE: The Windows driver allows maximum baud rates of 110% of the
-         * specified maximium value.
-         * Quick tests with early (2004) HX (rev. A) chips suggest, that even
-         * higher baud rates (up to the maximum of 24M baud !) are working fine,
-         * but that should really be tested carefully in "real life" scenarios
-         * before removing the upper limit completely.
-         * Baud rates smaller than the specified 75 baud are definitely working
-         * fine.
-         */
-        if (type == type_0 || type == type_1)
-                baud = min_t(int, baud, 1228800 * 1.1);
-        else if (type == HX_TA)
-                baud = min_t(int, baud, 6000000 * 1.1);
-        else if (type == HXD_EA_RA_SA)
-                /* HXD, EA: 12Mbps; RA: 1Mbps; SA: 115200 bps */
-                /*
-                 * FIXME: as long as we don't know how to distinguish between
-                 * these chip variants, allow the max. of these values
-                 */
-                baud = min_t(int, baud, 12000000 * 1.1);
-        else if (type == TB)
-                baud = min_t(int, baud, 12000000 * 1.1);
-        /* Determine factors A and B */
-        A = 0;
-        B = 12000000 * 32 / baud;  /* 12MHz */
-        B <<= 1; /* Add one bit for rounding */
-        while (B > (512 << 1) && A <= 14) {
-                A += 2;
-                B >>= 2;
-        }
-        if (A > 14) { /* max. divisor = min. baudrate reached */
-                A = 14;
-                B = 512;
-                /* => ~45.78 baud */
+        if (baud <= 115200) {
+                put_unaligned_le32(baud, buf);
         } else {
-                B = (B + 1) >> 1; /* Round the last bit */
-        }
-        /* Handle special cases */
-        if (B == 512)
-                B = 0; /* also: 1 to 8 */
-        else if (B < 16)
                 /*
-                 * NOTE: With the current algorithm this happens
-                 * only for A=0 and means that the min. divisor
-                 * (respectively: the max. baudrate) is reached.
+                 * Apparently the formula for higher speeds is:
+                 * baudrate = 12M * 32 / (2^buf[1]) / buf[0]
                  */
-                B = 16;         /* => 24 MBaud */
-        /* Encode the baud rate */
-        buf[3] = 0x80;     /* Select divisor encoding method */
-        buf[2] = 0;
-        buf[1] = (A & 0x0e);            /* A */
-        buf[1] |= ((B & 0x100) >> 8);   /* MSB of B */
-        buf[0] = B & 0xff;              /* 8 LSBs of B */
-        /* Calculate the actual/resulting baud rate */
-        if (B <= 8)
-                B = 512;
-        baud = 12000000 * 32 / ((1 << A) * B);
-
-        return baud;
-}
-
-static void pl2303_encode_baudrate(struct tty_struct *tty,
-                                        struct usb_serial_port *port,
-                                        enum pl2303_type type,
-                                        u8 buf[4])
-{
-        int baud;
+                unsigned tmp = 12000000 * 32 / baud;
+                buf[3] = 0x80;
+                buf[2] = 0;
+                buf[1] = (tmp >= 256);
+                while (tmp >= 256) {
+                        tmp >>= 2;
+                        buf[1] <<= 1;
+                }
+                buf[0] = tmp;
+        }
 
-        baud = tty_get_baud_rate(tty);
-        dev_dbg(&port->dev, "baud requested = %d\n", baud);
-        if (!baud)
-                return;
-        /*
-         * There are two methods for setting/encoding the baud rate
-         * 1) Direct method: encodes the baud rate value directly
-         *    => supported by all chip types
-         * 2) Divisor based method: encodes a divisor to a base value (12MHz*32)
-         *    => not supported by HX clones (and likely type_0/1 chips)
-         *
-         * NOTE: Although the divisor based baud rate encoding method is much
-         * more flexible, some of the standard baud rate values can not be
-         * realized exactly. But the difference is very small (max. 0.2%) and
-         * the device likely uses the same baud rate generator for both methods
-         * so that there is likley no difference.
-         */
-        if (type == type_0 || type == type_1 || type == HX_CLONE)
-                baud = pl2303_baudrate_encode_direct(baud, type, buf);
-        else
-                baud = pl2303_baudrate_encode_divisor(baud, type, buf);
         /* Save resulting baud rate */
         tty_encode_baud_rate(tty, baud, baud);
         dev_dbg(&port->dev, "baud set = %d\n", baud);
@@ -540,8 +379,8 @@ static void pl2303_set_termios(struct tty_struct *tty,
                 dev_dbg(&port->dev, "data bits = %d\n", buf[6]);
         }
 
-        /* For reference:   buf[0]:buf[3] baud rate value */
-        pl2303_encode_baudrate(tty, port, spriv->type, buf);
+        /* For reference buf[0]:buf[3] baud rate value */
+        pl2303_encode_baudrate(tty, port, &buf[0]);
 
         /* For reference buf[4]=0 is 1 stop bits */
         /* For reference buf[4]=1 is 1.5 stop bits */
@@ -618,10 +457,10 @@ static void pl2303_set_termios(struct tty_struct *tty,
         dev_dbg(&port->dev, "0xa1:0x21:0:0  %d - %7ph\n", i, buf);
 
         if (C_CRTSCTS(tty)) {
-                if (spriv->type == type_0 || spriv->type == type_1)
-                        pl2303_vendor_write(0x0, 0x41, serial);
-                else
+                if (spriv->type == HX)
                         pl2303_vendor_write(0x0, 0x61, serial);
+                else
+                        pl2303_vendor_write(0x0, 0x41, serial);
         } else {
                 pl2303_vendor_write(0x0, 0x0, serial);
         }
@@ -658,7 +497,7 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
         struct pl2303_serial_private *spriv = usb_get_serial_data(serial);
         int result;
 
-        if (spriv->type == type_0 || spriv->type == type_1) {
+        if (spriv->type != HX) {
                 usb_clear_halt(serial->dev, port->write_urb->pipe);
                 usb_clear_halt(serial->dev, port->read_urb->pipe);
         } else {
@@ -833,7 +672,6 @@ static void pl2303_break_ctl(struct tty_struct *tty, int break_state)
         result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
                                  BREAK_REQUEST, BREAK_REQUEST_TYPE, state,
                                  0, NULL, 0, 100);
-        /* NOTE: HX clones don't support sending breaks, -EPIPE is returned */
         if (result)
                 dev_err(&port->dev, "error sending break = %d\n", result);
 }
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/vhost/scsi.c b/drivers/vhost/scsi.c
index ce5221fa393a..e663921eebb6 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1056,7 +1056,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)
                 if (data_direction != DMA_NONE) {
                         ret = vhost_scsi_map_iov_to_sgl(cmd,
                                         &vq->iov[data_first], data_num,
-                                        data_direction == DMA_TO_DEVICE);
+                                        data_direction == DMA_FROM_DEVICE);
                         if (unlikely(ret)) {
                                 vq_err(vq, "Failed to map iov to sgl\n");
                                 goto err_free;
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index a54ccdc4d661..22ad85242e5b 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -361,37 +361,13 @@ void au1100fb_fb_rotate(struct fb_info *fbi, int angle)
 int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
 {
         struct au1100fb_device *fbdev;
-        unsigned int len;
-        unsigned long start=0, off;
 
         fbdev = to_au1100fb_device(fbi);
 
-        if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) {
-                return -EINVAL;
-        }
-
-        start = fbdev->fb_phys & PAGE_MASK;
-        len = PAGE_ALIGN((start & ~PAGE_MASK) + fbdev->fb_len);
-
-        off = vma->vm_pgoff << PAGE_SHIFT;
-
-        if ((vma->vm_end - vma->vm_start + off) > len) {
-                return -EINVAL;
-        }
-
-        off += start;
-        vma->vm_pgoff = off >> PAGE_SHIFT;
-
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
         pgprot_val(vma->vm_page_prot) |= (6 << 9); //CCA=6
 
-        if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
-                                vma->vm_end - vma->vm_start,
-                                vma->vm_page_prot)) {
-                return -EAGAIN;
-        }
-
-        return 0;
+        return vm_iomap_memory(vma, fbdev->fb_phys, fbdev->fb_len);
 }
 
 static struct fb_ops au1100fb_ops =
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index 301224ecc950..1d02897d17f2 100644
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -1233,34 +1233,13 @@ static int au1200fb_fb_blank(int blank_mode, struct fb_info *fbi)
  * method mainly to allow the use of the TLB streaming flag (CCA=6)
  */
 static int au1200fb_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
-
 {
-        unsigned int len;
-        unsigned long start=0, off;
         struct au1200fb_device *fbdev = info->par;
 
-        if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) {
-                return -EINVAL;
-        }
-
-        start = fbdev->fb_phys & PAGE_MASK;
-        len = PAGE_ALIGN((start & ~PAGE_MASK) + fbdev->fb_len);
-
-        off = vma->vm_pgoff << PAGE_SHIFT;
-
-        if ((vma->vm_end - vma->vm_start + off) > len) {
-                return -EINVAL;
-        }
-
-        off += start;
-        vma->vm_pgoff = off >> PAGE_SHIFT;
-
         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
         pgprot_val(vma->vm_page_prot) |= _CACHE_MASK; /* CCA=7 */
 
-        return io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
-                                  vma->vm_end - vma->vm_start,
-                                  vma->vm_page_prot);
+        return vm_iomap_memory(vma, fbdev->fb_phys, fbdev->fb_len);
 }
 
 static void set_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata)
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/dcache.c b/fs/dcache.c
index 41000305d716..ae6ebb88ceff 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -542,7 +542,7 @@ EXPORT_SYMBOL(d_drop);
  * If ref is non-zero, then decrement the refcount too.
  * Returns dentry requiring refcount drop, or NULL if we're done.
  */
-static inline struct dentry *
+static struct dentry *
 dentry_kill(struct dentry *dentry, int unlock_on_failure)
         __releases(dentry->d_lock)
 {
@@ -630,7 +630,8 @@ repeat:
                         goto kill_it;
         }
 
-        dentry->d_flags |= DCACHE_REFERENCED;
+        if (!(dentry->d_flags & DCACHE_REFERENCED))
+                dentry->d_flags |= DCACHE_REFERENCED;
         dentry_lru_add(dentry);
 
         dentry->d_lockref.count--;
@@ -1331,14 +1332,6 @@ rename_retry:
  * list is non-empty and continue searching.
  */
 
-/**
- * have_submounts - check for mounts over a dentry
- * @parent: dentry to check.
- *
- * Return true if the parent or its subdirectories contain
- * a mount point
- */
-
 static enum d_walk_ret check_mount(void *data, struct dentry *dentry)
 {
         int *ret = data;
@@ -1349,6 +1342,13 @@ static enum d_walk_ret check_mount(void *data, struct dentry *dentry)
         return D_WALK_CONTINUE;
 }
 
+/**
+ * have_submounts - check for mounts over a dentry
+ * @parent: dentry to check.
+ *
+ * Return true if the parent or its subdirectories contain
+ * a mount point
+ */
 int have_submounts(struct dentry *parent)
 {
         int ret = 0;
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index c88e355f7635..000eae2782b6 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -408,7 +408,7 @@ static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,
                                     struct page *page)
 {
         return ecryptfs_lower_header_size(crypt_stat) +
-               (page->index << PAGE_CACHE_SHIFT);
+               ((loff_t)page->index << PAGE_CACHE_SHIFT);
 }
 
 /**
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 7d52806c2119..4725a07f003c 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -1149,7 +1149,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
         struct ecryptfs_msg_ctx *msg_ctx;
         struct ecryptfs_message *msg = NULL;
         char *auth_tok_sig;
-        char *payload;
+        char *payload = NULL;
         size_t payload_len = 0;
         int rc;
 
@@ -1203,6 +1203,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok,
         }
 out:
         kfree(msg);
+        kfree(payload);
         return rc;
 }
 
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 473e09da7d02..810c28fb8c3c 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -34,7 +34,6 @@
 #include <linux/mutex.h>
 #include <linux/anon_inodes.h>
 #include <linux/device.h>
-#include <linux/freezer.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/mman.h>
@@ -1605,8 +1604,7 @@ fetch_events:
                         }
 
                         spin_unlock_irqrestore(&ep->lock, flags);
-                        if (!freezable_schedule_hrtimeout_range(to, slack,
-                                                                HRTIMER_MODE_ABS))
+                        if (!schedule_hrtimeout_range(to, slack, HRTIMER_MODE_ABS))
                                 timed_out = 1;
 
                         spin_lock_irqsave(&ep->lock, flags);
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/file_table.c b/fs/file_table.c
index abdd15ad13c9..e900ca518635 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -297,7 +297,7 @@ void flush_delayed_fput(void)
         delayed_fput(NULL);
 }
 
-static DECLARE_WORK(delayed_fput_work, delayed_fput);
+static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
 
 void fput(struct file *file)
 {
@@ -317,7 +317,7 @@ void fput(struct file *file)
                 }
 
                 if (llist_add(&file->f_u.fu_llist, &delayed_fput_list))
-                        schedule_work(&delayed_fput_work);
+                        schedule_delayed_work(&delayed_fput_work, 1);
         }
 }
 
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index c1a3e603279c..7f464c513ba0 100644
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -95,7 +95,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
 
         if (insert_inode_locked(inode) < 0) {
                 rc = -EINVAL;
-                goto fail_unlock;
+                goto fail_put;
         }
 
         inode_init_owner(inode, parent, mode);
@@ -156,7 +156,6 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
 fail_drop:
         dquot_drop(inode);
         inode->i_flags |= S_NOQUOTA;
-fail_unlock:
         clear_nlink(inode);
         unlock_new_inode(inode);
 fail_put:
diff --git a/fs/namei.c b/fs/namei.c
index 645268f23eb6..caa28051e197 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2294,10 +2294,11 @@ out:
  * path_mountpoint - look up a path to be umounted
  * @dfd:        directory file descriptor to start walk from
  * @name:       full pathname to walk
+ * @path:       pointer to container for result
  * @flags:      lookup flags
  *
  * Look up the given name, but don't attempt to revalidate the last component.
- * Returns 0 and "path" will be valid on success; Retuns error otherwise.
+ * Returns 0 and "path" will be valid on success; Returns error otherwise.
  */
 static int
 path_mountpoint(int dfd, const char *name, struct path *path, unsigned int flags)
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/fs/select.c b/fs/select.c
index 35d4adc749d9..dfd5cb18c012 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -238,8 +238,7 @@ int poll_schedule_timeout(struct poll_wqueues *pwq, int state,
 
         set_current_state(state);
         if (!pwq->triggered)
-                rc = freezable_schedule_hrtimeout_range(expires, slack,
-                                                        HRTIMER_MODE_ABS);
+                rc = schedule_hrtimeout_range(expires, slack, HRTIMER_MODE_ABS);
         __set_current_state(TASK_RUNNING);
 
         /*
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 3135c2525c76..a290157265ef 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -328,6 +328,8 @@ loff_t seq_lseek(struct file *file, loff_t offset, int whence)
                                 m->read_pos = offset;
                                 retval = file->f_pos = offset;
                         }
+                } else {
+                        file->f_pos = offset;
                 }
         }
         file->f_version = m->version;
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/filter.h b/include/linux/filter.h
index a6ac84871d6d..ff4e40cd45b1 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -6,6 +6,7 @@
 
 #include <linux/atomic.h>
 #include <linux/compat.h>
+#include <linux/workqueue.h>
 #include <uapi/linux/filter.h>
 
 #ifdef CONFIG_COMPAT
@@ -25,15 +26,19 @@ struct sk_filter
 {
         atomic_t                refcnt;
         unsigned int            len;    /* Number of filter blocks */
+        struct rcu_head         rcu;
         unsigned int            (*bpf_func)(const struct sk_buff *skb,
                                             const struct sock_filter *filter);
-        struct rcu_head         rcu;
-        struct sock_filter      insns[0];
+        union {
+                struct sock_filter      insns[0];
+                struct work_struct      work;
+        };
 };
 
-static inline unsigned int sk_filter_len(const struct sk_filter *fp)
+static inline unsigned int sk_filter_size(unsigned int proglen)
 {
-        return fp->len * sizeof(struct sock_filter) + sizeof(*fp);
+        return max(sizeof(struct sk_filter),
+                   offsetof(struct sk_filter, insns[proglen]));
 }
 
 extern int sk_filter(struct sock *sk, struct sk_buff *skb);
@@ -67,11 +72,13 @@ static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen,
 }
 #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns)
 #else
+#include <linux/slab.h>
 static inline void bpf_jit_compile(struct sk_filter *fp)
 {
 }
 static inline void bpf_jit_free(struct sk_filter *fp)
 {
+        kfree(fp);
 }
 #define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns)
 #endif
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index 19c19a5eee29..f6c82de12541 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -34,9 +34,9 @@ struct ipc_namespace {
         int             sem_ctls[4];
         int             used_sems;
 
-        int             msg_ctlmax;
-        int             msg_ctlmnb;
-        int             msg_ctlmni;
+        unsigned int    msg_ctlmax;
+        unsigned int    msg_ctlmnb;
+        unsigned int    msg_ctlmni;
         atomic_t        msg_bytes;
         atomic_t        msg_hdrs;
         int             auto_msgmni;
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/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index 41ed59276c00..67c17b5a6f44 100644
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -41,6 +41,13 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx,
                 unsigned int mode, unsigned int channel,
                 u8 ato, bool atox, unsigned int *sample);
 
+#define MC13783_AUDIO_RX0       36
+#define MC13783_AUDIO_RX1       37
+#define MC13783_AUDIO_TX        38
+#define MC13783_SSI_NETWORK     39
+#define MC13783_AUDIO_CODEC     40
+#define MC13783_AUDIO_DAC       41
+
 #define MC13XXX_IRQ_ADCDONE     0
 #define MC13XXX_IRQ_ADCBISDONE  1
 #define MC13XXX_IRQ_TS          2
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/netdevice.h b/include/linux/netdevice.h
index 3de49aca4519..25f5d2d11e7c 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2264,11 +2264,12 @@ static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
 }
 
 #ifdef CONFIG_XPS
-extern int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask,
+extern int netif_set_xps_queue(struct net_device *dev,
+                               const struct cpumask *mask,
                                u16 index);
 #else
 static inline int netif_set_xps_queue(struct net_device *dev,
-                                      struct cpumask *mask,
+                                      const struct cpumask *mask,
                                       u16 index)
 {
         return 0;
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/percpu.h b/include/linux/percpu.h
index cc88172c7d9a..c74088ab103b 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -332,7 +332,7 @@ do {									\
 #endif
 
 #ifndef this_cpu_sub
-# define this_cpu_sub(pcp, val)         this_cpu_add((pcp), -(val))
+# define this_cpu_sub(pcp, val)         this_cpu_add((pcp), -(typeof(pcp))(val))
 #endif
 
 #ifndef this_cpu_inc
@@ -418,7 +418,7 @@ do {									\
 # define this_cpu_add_return(pcp, val)  __pcpu_size_call_return2(this_cpu_add_return_, pcp, val)
 #endif
 
-#define this_cpu_sub_return(pcp, val)   this_cpu_add_return(pcp, -(val))
+#define this_cpu_sub_return(pcp, val)   this_cpu_add_return(pcp, -(typeof(pcp))(val))
 #define this_cpu_inc_return(pcp)        this_cpu_add_return(pcp, 1)
 #define this_cpu_dec_return(pcp)        this_cpu_add_return(pcp, -1)
 
@@ -586,7 +586,7 @@ do {									\
 #endif
 
 #ifndef __this_cpu_sub
-# define __this_cpu_sub(pcp, val)       __this_cpu_add((pcp), -(val))
+# define __this_cpu_sub(pcp, val)       __this_cpu_add((pcp), -(typeof(pcp))(val))
 #endif
 
 #ifndef __this_cpu_inc
@@ -668,7 +668,7 @@ do {									\
         __pcpu_size_call_return2(__this_cpu_add_return_, pcp, val)
 #endif
 
-#define __this_cpu_sub_return(pcp, val) __this_cpu_add_return(pcp, -(val))
+#define __this_cpu_sub_return(pcp, val) __this_cpu_add_return(pcp, -(typeof(pcp))(val))
 #define __this_cpu_inc_return(pcp)      __this_cpu_add_return(pcp, 1)
 #define __this_cpu_dec_return(pcp)      __this_cpu_add_return(pcp, -1)
 
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
index 8db5ae03b6e3..689a856b86f9 100644
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -84,6 +84,8 @@ struct snd_platform_data {
         u8 version;
         u8 txnumevt;
         u8 rxnumevt;
+        int tx_dma_channel;
+        int rx_dma_channel;
 };
 
 enum {
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index a10380bfbeac..dc90b8c134a1 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -374,6 +374,7 @@ int regmap_reinit_cache(struct regmap *map,
                         const struct regmap_config *config);
 struct regmap *dev_get_regmap(struct device *dev, const char *name);
 int regmap_write(struct regmap *map, unsigned int reg, unsigned int val);
+int regmap_write_async(struct regmap *map, unsigned int reg, unsigned int val);
 int regmap_raw_write(struct regmap *map, unsigned int reg,
                      const void *val, size_t val_len);
 int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
@@ -387,9 +388,14 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
                      size_t val_count);
 int regmap_update_bits(struct regmap *map, unsigned int reg,
                        unsigned int mask, unsigned int val);
+int regmap_update_bits_async(struct regmap *map, unsigned int reg,
+                             unsigned int mask, unsigned int val);
 int regmap_update_bits_check(struct regmap *map, unsigned int reg,
                              unsigned int mask, unsigned int val,
                              bool *change);
+int regmap_update_bits_check_async(struct regmap *map, unsigned int reg,
+                                   unsigned int mask, unsigned int val,
+                                   bool *change);
 int regmap_get_val_bytes(struct regmap *map);
 int regmap_async_complete(struct regmap *map);
 bool regmap_can_raw_write(struct regmap *map);
@@ -425,11 +431,15 @@ bool regmap_reg_in_ranges(unsigned int reg,
  * @reg: Offset of the register within the regmap bank
  * @lsb: lsb of the register field.
  * @reg: msb of the register field.
+ * @id_size: port size if it has some ports
+ * @id_offset: address offset for each ports
  */
 struct reg_field {
         unsigned int reg;
         unsigned int lsb;
         unsigned int msb;
+        unsigned int id_size;
+        unsigned int id_offset;
 };
 
 #define REG_FIELD(_reg, _lsb, _msb) {           \
@@ -448,6 +458,15 @@ void devm_regmap_field_free(struct device *dev,	struct regmap_field *field);
 
 int regmap_field_read(struct regmap_field *field, unsigned int *val);
 int regmap_field_write(struct regmap_field *field, unsigned int val);
+int regmap_field_update_bits(struct regmap_field *field,
+                             unsigned int mask, unsigned int val);
+
+int regmap_fields_write(struct regmap_field *field, unsigned int id,
+                        unsigned int val);
+int regmap_fields_read(struct regmap_field *field, unsigned int id,
+                       unsigned int *val);
+int regmap_fields_update_bits(struct regmap_field *field,  unsigned int id,
+                              unsigned int mask, unsigned int val);
 
 /**
  * Description of an IRQ for the generic regmap irq_chip.
@@ -527,6 +546,13 @@ static inline int regmap_write(struct regmap *map, unsigned int reg,
         return -EINVAL;
 }
 
+static inline int regmap_write_async(struct regmap *map, unsigned int reg,
+                                     unsigned int val)
+{
+        WARN_ONCE(1, "regmap API is disabled");
+        return -EINVAL;
+}
+
 static inline int regmap_raw_write(struct regmap *map, unsigned int reg,
                                    const void *val, size_t val_len)
 {
@@ -576,6 +602,14 @@ static inline int regmap_update_bits(struct regmap *map, unsigned int reg,
         return -EINVAL;
 }
 
+static inline int regmap_update_bits_async(struct regmap *map,
+                                           unsigned int reg,
+                                           unsigned int mask, unsigned int val)
+{
+        WARN_ONCE(1, "regmap API is disabled");
+        return -EINVAL;
+}
+
 static inline int regmap_update_bits_check(struct regmap *map,
                                            unsigned int reg,
                                            unsigned int mask, unsigned int val,
@@ -585,6 +619,16 @@ static inline int regmap_update_bits_check(struct regmap *map,
         return -EINVAL;
 }
 
+static inline int regmap_update_bits_check_async(struct regmap *map,
+                                                 unsigned int reg,
+                                                 unsigned int mask,
+                                                 unsigned int val,
+                                                 bool *change)
+{
+        WARN_ONCE(1, "regmap API is disabled");
+        return -EINVAL;
+}
+
 static inline int regmap_get_val_bytes(struct regmap *map)
 {
         WARN_ONCE(1, "regmap API is disabled");
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/include/linux/yam.h b/include/linux/yam.h
index 7fe28228b274..512cdc2fb80f 100644
--- a/include/linux/yam.h
+++ b/include/linux/yam.h
@@ -77,6 +77,6 @@ struct yamdrv_ioctl_cfg {
 
 struct yamdrv_ioctl_mcs {
         int cmd;
-        int bitrate;
+        unsigned int bitrate;
         unsigned char bits[YAM_FPGA_SIZE];
 };
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index a7a683e30b64..a8c2ef6d3b93 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -290,6 +290,7 @@ static inline int cipso_v4_validate(const struct sk_buff *skb,
         unsigned char err_offset = 0;
         u8 opt_len = opt[1];
         u8 opt_iter;
+        u8 tag_len;
 
         if (opt_len < 8) {
                 err_offset = 1;
@@ -302,11 +303,12 @@ static inline int cipso_v4_validate(const struct sk_buff *skb,
         }
 
         for (opt_iter = 6; opt_iter < opt_len;) {
-                if (opt[opt_iter + 1] > (opt_len - opt_iter)) {
+                tag_len = opt[opt_iter + 1];
+                if ((tag_len == 0) || (opt[opt_iter + 1] > (opt_len - opt_iter))) {
                         err_offset = opt_iter + 1;
                         goto out;
                 }
-                opt_iter += opt[opt_iter + 1];
+                opt_iter += tag_len;
         }
 
 out:
diff --git a/include/net/dst.h b/include/net/dst.h
index 3bc4865f8267..3c4c944096c9 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -479,10 +479,22 @@ static inline struct dst_entry *xfrm_lookup(struct net *net,
 {
         return dst_orig;
 } 
+
+static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
+{
+        return NULL;
+}
+
 #else
 extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,
                                      const struct flowi *fl, struct sock *sk,
                                      int flags);
+
+/* skb attached with this dst needs transformation if dst->xfrm is valid */
+static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
+{
+        return dst->xfrm;
+}
 #endif
 
 #endif /* _NET_DST_H */
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index f525e7038cca..2b786b7e3585 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -194,11 +194,9 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
                skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb));
 }
 
-static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, struct in6_addr *dest)
+static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt)
 {
-        if (rt->rt6i_flags & RTF_GATEWAY)
-                return &rt->rt6i_gateway;
-        return dest;
+        return &rt->rt6i_gateway;
 }
 
 #endif
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index d0d11df9cba1..807d6b7a943f 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -133,7 +133,7 @@ struct ieee802154_ops {
 
 /* Basic interface to register ieee802154 device */
 struct ieee802154_dev *
-ieee802154_alloc_device(size_t priv_data_lex, struct ieee802154_ops *ops);
+ieee802154_alloc_device(size_t priv_data_len, struct ieee802154_ops *ops);
 void ieee802154_free_device(struct ieee802154_dev *dev);
 int ieee802154_register_device(struct ieee802154_dev *dev);
 void ieee802154_unregister_device(struct ieee802154_dev *dev);
diff --git a/include/net/sock.h b/include/net/sock.h
index 1d37a8086bed..808cbc2ec6c1 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1630,16 +1630,14 @@ static inline void sk_filter_release(struct sk_filter *fp)
 
 static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp)
 {
-        unsigned int size = sk_filter_len(fp);
-
-        atomic_sub(size, &sk->sk_omem_alloc);
+        atomic_sub(sk_filter_size(fp->len), &sk->sk_omem_alloc);
         sk_filter_release(fp);
 }
 
 static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp)
 {
         atomic_inc(&fp->refcnt);
-        atomic_add(sk_filter_len(fp), &sk->sk_omem_alloc);
+        atomic_add(sk_filter_size(fp->len), &sk->sk_omem_alloc);
 }
 
 /*
diff --git a/include/sound/cs42l73.h b/include/sound/cs42l73.h
new file mode 100644
index 000000000000..f354be4cdc9e
--- /dev/null
+++ b/include/sound/cs42l73.h
@@ -0,0 +1,22 @@
+/*
+ * linux/sound/cs42l73.h -- Platform data for CS42L73
+ *
+ * Copyright (c) 2012 Cirrus Logic Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __CS42L73_H
+#define __CS42L73_H
+
+struct cs42l73_platform_data {
+        /* RST GPIO */
+        unsigned int reset_gpio;
+        unsigned int chgfreq;
+        int jack_detection;
+        unsigned int mclk_freq;
+};
+
+#endif /* __CS42L73_H */
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h
index fe66533e9b7a..12afab18945d 100644
--- a/include/sound/rcar_snd.h
+++ b/include/sound/rcar_snd.h
@@ -36,7 +36,6 @@
 #define RSND_SSI_CLK_PIN_SHARE          (1 << 31)
 #define RSND_SSI_CLK_FROM_ADG           (1 << 30) /* clock parent is master */
 #define RSND_SSI_SYNC                   (1 << 29) /* SSI34_sync etc */
-#define RSND_SSI_DEPENDENT              (1 << 28) /* SSI needs SRU/SCU */
 
 #define RSND_SSI_PLAY                   (1 << 24)
 
@@ -68,6 +67,7 @@ struct rsnd_scu_platform_info {
  *
  * A : generation
  */
+#define RSND_GEN_MASK   (0xF << 0)
 #define RSND_GEN1       (1 << 0) /* fixme */
 #define RSND_GEN2       (2 << 0) /* fixme */
 
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 97943fd397cc..800c101bb096 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -105,6 +105,8 @@ int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,
 int snd_soc_dai_set_pll(struct snd_soc_dai *dai,
         int pll_id, int source, unsigned int freq_in, unsigned int freq_out);
 
+int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio);
+
 /* Digital Audio interface formatting */
 int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
 
@@ -131,6 +133,7 @@ struct snd_soc_dai_ops {
         int (*set_pll)(struct snd_soc_dai *dai, int pll_id, int source,
                 unsigned int freq_in, unsigned int freq_out);
         int (*set_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);
+        int (*set_bclk_ratio)(struct snd_soc_dai *dai, unsigned int ratio);
 
         /*
          * DAI format configuration
@@ -166,6 +169,13 @@ struct snd_soc_dai_ops {
                 struct snd_soc_dai *);
         int (*prepare)(struct snd_pcm_substream *,
                 struct snd_soc_dai *);
+        /*
+         * NOTE: Commands passed to the trigger function are not necessarily
+         * compatible with the current state of the dai. For example this
+         * sequence of commands is possible: START STOP STOP.
+         * So do not unconditionally use refcounting functions in the trigger
+         * function, e.g. clk_enable/disable.
+         */
         int (*trigger)(struct snd_pcm_substream *, int,
                 struct snd_soc_dai *);
         int (*bespoke_trigger)(struct snd_pcm_substream *, int,
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 27a72d5d4b00..2037c45adfe6 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -286,6 +286,8 @@ struct device;
         .info = snd_soc_info_volsw, \
         .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \
         .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }
+#define SOC_DAPM_SINGLE_VIRT(xname, max) \
+        SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0)
 #define SOC_DAPM_SINGLE_TLV(xname, reg, shift, max, invert, tlv_array) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_info_volsw, \
@@ -300,6 +302,8 @@ struct device;
         .tlv.p = (tlv_array), \
         .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \
         .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) }
+#define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \
+        SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array)
 #define SOC_DAPM_ENUM(xname, xenum) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_info_enum_double, \
diff --git a/include/sound/soc.h b/include/sound/soc.h
index d22cb0a06feb..1f741cb24f33 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -13,6 +13,7 @@
 #ifndef __LINUX_SND_SOC_H
 #define __LINUX_SND_SOC_H
 
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
 #include <linux/notifier.h>
@@ -330,7 +331,6 @@ struct soc_enum;
 struct snd_soc_jack;
 struct snd_soc_jack_zone;
 struct snd_soc_jack_pin;
-struct snd_soc_cache_ops;
 #include <sound/soc-dapm.h>
 #include <sound/soc-dpcm.h>
 
@@ -348,10 +348,6 @@ enum snd_soc_control_type {
         SND_SOC_REGMAP,
 };
 
-enum snd_soc_compress_type {
-        SND_SOC_FLAT_COMPRESSION = 1,
-};
-
 enum snd_soc_pcm_subclass {
         SND_SOC_PCM_CLASS_PCM   = 0,
         SND_SOC_PCM_CLASS_BE    = 1,
@@ -369,6 +365,7 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source,
 
 int snd_soc_register_card(struct snd_soc_card *card);
 int snd_soc_unregister_card(struct snd_soc_card *card);
+int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card);
 int snd_soc_suspend(struct device *dev);
 int snd_soc_resume(struct device *dev);
 int snd_soc_poweroff(struct device *dev);
@@ -386,6 +383,9 @@ void snd_soc_unregister_codec(struct device *dev);
 int snd_soc_register_component(struct device *dev,
                          const struct snd_soc_component_driver *cmpnt_drv,
                          struct snd_soc_dai_driver *dai_drv, int num_dai);
+int devm_snd_soc_register_component(struct device *dev,
+                         const struct snd_soc_component_driver *cmpnt_drv,
+                         struct snd_soc_dai_driver *dai_drv, int num_dai);
 void snd_soc_unregister_component(struct device *dev);
 int snd_soc_codec_volatile_register(struct snd_soc_codec *codec,
                                     unsigned int reg);
@@ -403,12 +403,6 @@ int snd_soc_cache_write(struct snd_soc_codec *codec,
                         unsigned int reg, unsigned int value);
 int snd_soc_cache_read(struct snd_soc_codec *codec,
                        unsigned int reg, unsigned int *value);
-int snd_soc_default_volatile_register(struct snd_soc_codec *codec,
-                                      unsigned int reg);
-int snd_soc_default_readable_register(struct snd_soc_codec *codec,
-                                      unsigned int reg);
-int snd_soc_default_writable_register(struct snd_soc_codec *codec,
-                                      unsigned int reg);
 int snd_soc_platform_read(struct snd_soc_platform *platform,
                                         unsigned int reg);
 int snd_soc_platform_write(struct snd_soc_platform *platform,
@@ -542,22 +536,6 @@ int snd_soc_put_strobe(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 
 /**
- * struct snd_soc_reg_access - Describes whether a given register is
- * readable, writable or volatile.
- *
- * @reg: the register number
- * @read: whether this register is readable
- * @write: whether this register is writable
- * @vol: whether this register is volatile
- */
-struct snd_soc_reg_access {
-        u16 reg;
-        u16 read;
-        u16 write;
-        u16 vol;
-};
-
-/**
  * struct snd_soc_jack_pin - Describes a pin to update based on jack detection
  *
  * @pin:    name of the pin to update
@@ -657,17 +635,26 @@ struct snd_soc_compr_ops {
         int (*trigger)(struct snd_compr_stream *);
 };
 
-/* SoC cache ops */
-struct snd_soc_cache_ops {
+/* component interface */
+struct snd_soc_component_driver {
+        const char *name;
+
+        /* DT */
+        int (*of_xlate_dai_name)(struct snd_soc_component *component,
+                                 struct of_phandle_args *args,
+                                 const char **dai_name);
+};
+
+struct snd_soc_component {
         const char *name;
-        enum snd_soc_compress_type id;
-        int (*init)(struct snd_soc_codec *codec);
-        int (*exit)(struct snd_soc_codec *codec);
-        int (*read)(struct snd_soc_codec *codec, unsigned int reg,
-                unsigned int *value);
-        int (*write)(struct snd_soc_codec *codec, unsigned int reg,
-                unsigned int value);
-        int (*sync)(struct snd_soc_codec *codec);
+        int id;
+        struct device *dev;
+        struct list_head list;
+
+        struct snd_soc_dai_driver *dai_drv;
+        int num_dai;
+
+        const struct snd_soc_component_driver *driver;
 };
 
 /* SoC Audio Codec device */
@@ -683,8 +670,6 @@ struct snd_soc_codec {
         struct list_head list;
         struct list_head card_list;
         int num_dai;
-        enum snd_soc_compress_type compress_type;
-        size_t reg_size;        /* reg_cache_size * reg_word_size */
         int (*volatile_register)(struct snd_soc_codec *, unsigned int);
         int (*readable_register)(struct snd_soc_codec *, unsigned int);
         int (*writable_register)(struct snd_soc_codec *, unsigned int);
@@ -708,13 +693,13 @@ struct snd_soc_codec {
         unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);
         unsigned int (*read)(struct snd_soc_codec *, unsigned int);
         int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
-        int (*bulk_write_raw)(struct snd_soc_codec *, unsigned int, const void *, size_t);
         void *reg_cache;
-        const void *reg_def_copy;
-        const struct snd_soc_cache_ops *cache_ops;
         struct mutex cache_rw_mutex;
         int val_bytes;
 
+        /* component */
+        struct snd_soc_component component;
+
         /* dapm */
         struct snd_soc_dapm_context dapm;
         unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
@@ -733,6 +718,7 @@ struct snd_soc_codec_driver {
         int (*remove)(struct snd_soc_codec *);
         int (*suspend)(struct snd_soc_codec *);
         int (*resume)(struct snd_soc_codec *);
+        struct snd_soc_component_driver component_driver;
 
         /* Default control and setup, added after probe() is run */
         const struct snd_kcontrol_new *controls;
@@ -760,9 +746,6 @@ struct snd_soc_codec_driver {
         short reg_cache_step;
         short reg_word_size;
         const void *reg_cache_default;
-        short reg_access_size;
-        const struct snd_soc_reg_access *reg_access_default;
-        enum snd_soc_compress_type compress_type;
 
         /* codec bias level */
         int (*set_bias_level)(struct snd_soc_codec *,
@@ -849,20 +832,6 @@ struct snd_soc_platform {
 #endif
 };
 
-struct snd_soc_component_driver {
-        const char *name;
-};
-
-struct snd_soc_component {
-        const char *name;
-        int id;
-        int num_dai;
-        struct device *dev;
-        struct list_head list;
-
-        const struct snd_soc_component_driver *driver;
-};
-
 struct snd_soc_dai_link {
         /* config - must be set by machine driver */
         const char *name;                       /* Codec name */
@@ -944,12 +913,6 @@ struct snd_soc_codec_conf {
          * associated per device
          */
         const char *name_prefix;
-
-        /*
-         * set this to the desired compression type if you want to
-         * override the one supplied in codec->driver->compress_type
-         */
-        enum snd_soc_compress_type compress_type;
 };
 
 struct snd_soc_aux_dev {
@@ -1088,7 +1051,8 @@ struct snd_soc_pcm_runtime {
 /* mixer control */
 struct soc_mixer_control {
         int min, max, platform_max;
-        unsigned int reg, rreg, shift, rshift;
+        int reg, rreg;
+        unsigned int shift, rshift;
         unsigned int invert:1;
         unsigned int autodisable:1;
 };
@@ -1121,8 +1085,6 @@ struct soc_enum {
 unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
 unsigned int snd_soc_write(struct snd_soc_codec *codec,
                            unsigned int reg, unsigned int val);
-unsigned int snd_soc_bulk_write_raw(struct snd_soc_codec *codec,
-                                    unsigned int reg, const void *data, size_t len);
 
 /* device driver data */
 
@@ -1201,6 +1163,8 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                                    const char *propname);
 unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                                      const char *prefix);
+int snd_soc_of_get_dai_name(struct device_node *of_node,
+                            const char **dai_name);
 
 #include <sound/soc-dai.h>
 
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index 5fc2dcdd21cd..03996b2bb04f 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -14,6 +14,7 @@ struct snd_soc_codec;
 struct snd_soc_platform;
 struct snd_soc_card;
 struct snd_soc_dapm_widget;
+struct snd_soc_dapm_path;
 
 /*
  * Log register events
diff --git a/include/trace/events/target.h b/include/trace/events/target.h
index aef8fc354025..da9cc0f05c93 100644
--- a/include/trace/events/target.h
+++ b/include/trace/events/target.h
@@ -144,7 +144,7 @@ TRACE_EVENT(target_sequencer_start,
         ),
 
         TP_fast_assign(
-                __entry->unpacked_lun   = cmd->se_lun->unpacked_lun;
+                __entry->unpacked_lun   = cmd->orig_fe_lun;
                 __entry->opcode         = cmd->t_task_cdb[0];
                 __entry->data_length    = cmd->data_length;
                 __entry->task_attribute = cmd->sam_task_attr;
@@ -182,7 +182,7 @@ TRACE_EVENT(target_cmd_complete,
         ),
 
         TP_fast_assign(
-                __entry->unpacked_lun   = cmd->se_lun->unpacked_lun;
+                __entry->unpacked_lun   = cmd->orig_fe_lun;
                 __entry->opcode         = cmd->t_task_cdb[0];
                 __entry->data_length    = cmd->data_length;
                 __entry->task_attribute = cmd->sam_task_attr;
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index 550811712f78..28acbaf4a81e 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -223,6 +223,8 @@ struct drm_mode_get_connector {
         __u32 connection;
         __u32 mm_width, mm_height; /**< HxW in millimeters */
         __u32 subpixel;
+
+        __u32 pad;
 };
 
 #define DRM_MODE_PROP_PENDING   (1<<0)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 009a655a5d35..2fc1602e23bb 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -456,13 +456,15 @@ struct perf_event_mmap_page {
         /*
          * Control data for the mmap() data buffer.
          *
-         * User-space reading the @data_head value should issue an rmb(), on
-         * SMP capable platforms, after reading this value -- see
-         * perf_event_wakeup().
+         * User-space reading the @data_head value should issue an smp_rmb(),
+         * after reading this value.
          *
          * When the mapping is PROT_WRITE the @data_tail value should be
-         * written by userspace to reflect the last read data. In this case
-         * the kernel will not over-write unread data.
+         * written by userspace to reflect the last read data, after issueing
+         * an smp_mb() to separate the data read from the ->data_tail store.
+         * In this case the kernel will not over-write unread data.
+         *
+         * See perf_output_put_handle() for the data ordering.
          */
         __u64   data_head;              /* head in the data section */
         __u64   data_tail;              /* user-space written tail */
diff --git a/include/uapi/linux/tc_act/Kbuild b/include/uapi/linux/tc_act/Kbuild
index 0623ec4e728f..56f121605c99 100644
--- a/include/uapi/linux/tc_act/Kbuild
+++ b/include/uapi/linux/tc_act/Kbuild
@@ -1,5 +1,6 @@
 # UAPI Header export list
 header-y += tc_csum.h
+header-y += tc_defact.h
 header-y += tc_gact.h
 header-y += tc_ipt.h
 header-y += tc_mirred.h
diff --git a/include/linux/tc_act/tc_defact.h b/include/uapi/linux/tc_act/tc_defact.h
index 6f65d07c7ce2..17dddb40f740 100644
--- a/include/linux/tc_act/tc_defact.h
+++ b/include/uapi/linux/tc_act/tc_defact.h
@@ -6,7 +6,7 @@
 struct tc_defact {
         tc_gen;
 };
-                                                                                
+
 enum {
         TCA_DEF_UNSPEC,
         TCA_DEF_TM,
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index 0b233c56b0e4..e3ddd86c90a6 100644
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -87,8 +87,10 @@ enum {
         IB_USER_VERBS_CMD_CLOSE_XRCD,
         IB_USER_VERBS_CMD_CREATE_XSRQ,
         IB_USER_VERBS_CMD_OPEN_QP,
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
         IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
         IB_USER_VERBS_CMD_DESTROY_FLOW
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 };
 
 /*
@@ -126,6 +128,7 @@ struct ib_uverbs_cmd_hdr {
         __u16 out_words;
 };
 
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 struct ib_uverbs_cmd_hdr_ex {
         __u32 command;
         __u16 in_words;
@@ -134,6 +137,7 @@ struct ib_uverbs_cmd_hdr_ex {
         __u16 provider_out_words;
         __u32 cmd_hdr_reserved;
 };
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 
 struct ib_uverbs_get_context {
         __u64 response;
@@ -696,6 +700,7 @@ struct ib_uverbs_detach_mcast {
         __u64 driver_data[0];
 };
 
+#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 struct ib_kern_eth_filter {
         __u8  dst_mac[6];
         __u8  src_mac[6];
@@ -780,6 +785,7 @@ struct ib_uverbs_destroy_flow  {
         __u32 comp_mask;
         __u32 flow_handle;
 };
+#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 
 struct ib_uverbs_create_srq {
         __u64 response;
diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
index 130dfece27ac..b0e99deb6d05 100644
--- a/ipc/ipc_sysctl.c
+++ b/ipc/ipc_sysctl.c
@@ -62,7 +62,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
         return err;
 }
 
-static int proc_ipc_callback_dointvec(ctl_table *table, int write,
+static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
         void __user *buffer, size_t *lenp, loff_t *ppos)
 {
         struct ctl_table ipc_table;
@@ -72,7 +72,7 @@ static int proc_ipc_callback_dointvec(ctl_table *table, int write,
         memcpy(&ipc_table, table, sizeof(ipc_table));
         ipc_table.data = get_ipc(table);
 
-        rc = proc_dointvec(&ipc_table, write, buffer, lenp, ppos);
+        rc = proc_dointvec_minmax(&ipc_table, write, buffer, lenp, ppos);
 
         if (write && !rc && lenp_bef == *lenp)
                 /*
@@ -152,15 +152,13 @@ static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
 #define proc_ipc_dointvec          NULL
 #define proc_ipc_dointvec_minmax   NULL
 #define proc_ipc_dointvec_minmax_orphans   NULL
-#define proc_ipc_callback_dointvec NULL
+#define proc_ipc_callback_dointvec_minmax  NULL
 #define proc_ipcauto_dointvec_minmax NULL
 #endif
 
 static int zero;
 static int one = 1;
-#ifdef CONFIG_CHECKPOINT_RESTORE
 static int int_max = INT_MAX;
-#endif
 
 static struct ctl_table ipc_kern_table[] = {
         {
@@ -198,21 +196,27 @@ static struct ctl_table ipc_kern_table[] = {
                 .data           = &init_ipc_ns.msg_ctlmax,
                 .maxlen         = sizeof (init_ipc_ns.msg_ctlmax),
                 .mode           = 0644,
-                .proc_handler   = proc_ipc_dointvec,
+                .proc_handler   = proc_ipc_dointvec_minmax,
+                .extra1         = &zero,
+                .extra2         = &int_max,
         },
         {
                 .procname       = "msgmni",
                 .data           = &init_ipc_ns.msg_ctlmni,
                 .maxlen         = sizeof (init_ipc_ns.msg_ctlmni),
                 .mode           = 0644,
-                .proc_handler   = proc_ipc_callback_dointvec,
+                .proc_handler   = proc_ipc_callback_dointvec_minmax,
+                .extra1         = &zero,
+                .extra2         = &int_max,
         },
         {
                 .procname       =  "msgmnb",
                 .data           = &init_ipc_ns.msg_ctlmnb,
                 .maxlen         = sizeof (init_ipc_ns.msg_ctlmnb),
                 .mode           = 0644,
-                .proc_handler   = proc_ipc_dointvec,
+                .proc_handler   = proc_ipc_dointvec_minmax,
+                .extra1         = &zero,
+                .extra2         = &int_max,
         },
         {
                 .procname       = "sem",
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/kernel/cgroup.c b/kernel/cgroup.c
index 2418b6e71a85..8bd9cfdc70d7 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2039,7 +2039,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk,
 
                 /* @tsk either already exited or can't exit until the end */
                 if (tsk->flags & PF_EXITING)
-                        continue;
+                        goto next;
 
                 /* as per above, nr_threads may decrease, but not increase. */
                 BUG_ON(i >= group_size);
@@ -2047,7 +2047,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk,
                 ent.cgrp = task_cgroup_from_root(tsk, root);
                 /* nothing to do if this task is already in the cgroup */
                 if (ent.cgrp == cgrp)
-                        continue;
+                        goto next;
                 /*
                  * saying GFP_ATOMIC has no effect here because we did prealloc
                  * earlier, but it's good form to communicate our expectations.
@@ -2055,7 +2055,7 @@ static int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk,
                 retval = flex_array_put(group, i, &ent, GFP_ATOMIC);
                 BUG_ON(retval != 0);
                 i++;
-
+        next:
                 if (!threadgroup)
                         break;
         } while_each_thread(leader, tsk);
@@ -3188,11 +3188,9 @@ css_next_descendant_post(struct cgroup_subsys_state *pos,
 
         WARN_ON_ONCE(!rcu_read_lock_held());
 
-        /* if first iteration, visit the leftmost descendant */
-        if (!pos) {
-                next = css_leftmost_descendant(root);
-                return next != root ? next : NULL;
-        }
+        /* if first iteration, visit leftmost descendant which may be @root */
+        if (!pos)
+                return css_leftmost_descendant(root);
 
         /* if we visited @root, we're done */
         if (pos == root)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index d49a9d29334c..953c14348375 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6767,6 +6767,10 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
         if (ret)
                 return -EFAULT;
 
+        /* disabled for now */
+        if (attr->mmap2)
+                return -EINVAL;
+
         if (attr->__reserved_1)
                 return -EINVAL;
 
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index cd55144270b5..9c2ddfbf4525 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -87,10 +87,31 @@ again:
                 goto out;
 
         /*
-         * Publish the known good head. Rely on the full barrier implied
-         * by atomic_dec_and_test() order the rb->head read and this
-         * write.
+         * Since the mmap() consumer (userspace) can run on a different CPU:
+         *
+         *   kernel                             user
+         *
+         *   READ ->data_tail                   READ ->data_head
+         *   smp_mb()   (A)                     smp_rmb()       (C)
+         *   WRITE $data                        READ $data
+         *   smp_wmb()  (B)                     smp_mb()        (D)
+         *   STORE ->data_head                  WRITE ->data_tail
+         *
+         * Where A pairs with D, and B pairs with C.
+         *
+         * I don't think A needs to be a full barrier because we won't in fact
+         * write data until we see the store from userspace. So we simply don't
+         * issue the data WRITE until we observe it. Be conservative for now.
+         *
+         * OTOH, D needs to be a full barrier since it separates the data READ
+         * from the tail WRITE.
+         *
+         * For B a WMB is sufficient since it separates two WRITEs, and for C
+         * an RMB is sufficient since it separates two READs.
+         *
+         * See perf_output_begin().
          */
+        smp_wmb();
         rb->user_page->data_head = head;
 
         /*
@@ -154,9 +175,11 @@ int perf_output_begin(struct perf_output_handle *handle,
                  * Userspace could choose to issue a mb() before updating the
                  * tail pointer. So that all reads will be completed before the
                  * write is issued.
+                 *
+                 * See perf_output_put_handle().
                  */
                 tail = ACCESS_ONCE(rb->user_page->data_tail);
-                smp_rmb();
+                smp_mb();
                 offset = head = local_read(&rb->head);
                 head += size;
                 if (unlikely(!perf_output_space(rb, tail, offset, head)))
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 6d647aedffea..d24105b1b794 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -410,7 +410,7 @@ ww_mutex_set_context_fastpath(struct ww_mutex *lock,
 static __always_inline int __sched
 __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
                     struct lockdep_map *nest_lock, unsigned long ip,
-                    struct ww_acquire_ctx *ww_ctx)
+                    struct ww_acquire_ctx *ww_ctx, const bool use_ww_ctx)
 {
         struct task_struct *task = current;
         struct mutex_waiter waiter;
@@ -450,7 +450,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
                 struct task_struct *owner;
                 struct mspin_node  node;
 
-                if (!__builtin_constant_p(ww_ctx == NULL) && ww_ctx->acquired > 0) {
+                if (use_ww_ctx && ww_ctx->acquired > 0) {
                         struct ww_mutex *ww;
 
                         ww = container_of(lock, struct ww_mutex, base);
@@ -480,7 +480,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
                 if ((atomic_read(&lock->count) == 1) &&
                     (atomic_cmpxchg(&lock->count, 1, 0) == 1)) {
                         lock_acquired(&lock->dep_map, ip);
-                        if (!__builtin_constant_p(ww_ctx == NULL)) {
+                        if (use_ww_ctx) {
                                 struct ww_mutex *ww;
                                 ww = container_of(lock, struct ww_mutex, base);
 
@@ -551,7 +551,7 @@ slowpath:
                         goto err;
                 }
 
-                if (!__builtin_constant_p(ww_ctx == NULL) && ww_ctx->acquired > 0) {
+                if (use_ww_ctx && ww_ctx->acquired > 0) {
                         ret = __mutex_lock_check_stamp(lock, ww_ctx);
                         if (ret)
                                 goto err;
@@ -575,7 +575,7 @@ skip_wait:
         lock_acquired(&lock->dep_map, ip);
         mutex_set_owner(lock);
 
-        if (!__builtin_constant_p(ww_ctx == NULL)) {
+        if (use_ww_ctx) {
                 struct ww_mutex *ww = container_of(lock, struct ww_mutex, base);
                 struct mutex_waiter *cur;
 
@@ -615,7 +615,7 @@ mutex_lock_nested(struct mutex *lock, unsigned int subclass)
 {
         might_sleep();
         __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE,
-                            subclass, NULL, _RET_IP_, NULL);
+                            subclass, NULL, _RET_IP_, NULL, 0);
 }
 
 EXPORT_SYMBOL_GPL(mutex_lock_nested);
@@ -625,7 +625,7 @@ _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest)
 {
         might_sleep();
         __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE,
-                            0, nest, _RET_IP_, NULL);
+                            0, nest, _RET_IP_, NULL, 0);
 }
 
 EXPORT_SYMBOL_GPL(_mutex_lock_nest_lock);
@@ -635,7 +635,7 @@ mutex_lock_killable_nested(struct mutex *lock, unsigned int subclass)
 {
         might_sleep();
         return __mutex_lock_common(lock, TASK_KILLABLE,
-                                   subclass, NULL, _RET_IP_, NULL);
+                                   subclass, NULL, _RET_IP_, NULL, 0);
 }
 EXPORT_SYMBOL_GPL(mutex_lock_killable_nested);
 
@@ -644,7 +644,7 @@ mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass)
 {
         might_sleep();
         return __mutex_lock_common(lock, TASK_INTERRUPTIBLE,
-                                   subclass, NULL, _RET_IP_, NULL);
+                                   subclass, NULL, _RET_IP_, NULL, 0);
 }
 
 EXPORT_SYMBOL_GPL(mutex_lock_interruptible_nested);
@@ -682,7 +682,7 @@ __ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
 
         might_sleep();
         ret =  __mutex_lock_common(&lock->base, TASK_UNINTERRUPTIBLE,
-                                   0, &ctx->dep_map, _RET_IP_, ctx);
+                                   0, &ctx->dep_map, _RET_IP_, ctx, 1);
         if (!ret && ctx->acquired > 1)
                 return ww_mutex_deadlock_injection(lock, ctx);
 
@@ -697,7 +697,7 @@ __ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
 
         might_sleep();
         ret = __mutex_lock_common(&lock->base, TASK_INTERRUPTIBLE,
-                                  0, &ctx->dep_map, _RET_IP_, ctx);
+                                  0, &ctx->dep_map, _RET_IP_, ctx, 1);
 
         if (!ret && ctx->acquired > 1)
                 return ww_mutex_deadlock_injection(lock, ctx);
@@ -809,28 +809,28 @@ __mutex_lock_slowpath(atomic_t *lock_count)
         struct mutex *lock = container_of(lock_count, struct mutex, count);
 
         __mutex_lock_common(lock, TASK_UNINTERRUPTIBLE, 0,
-                            NULL, _RET_IP_, NULL);
+                            NULL, _RET_IP_, NULL, 0);
 }
 
 static noinline int __sched
 __mutex_lock_killable_slowpath(struct mutex *lock)
 {
         return __mutex_lock_common(lock, TASK_KILLABLE, 0,
-                                   NULL, _RET_IP_, NULL);
+                                   NULL, _RET_IP_, NULL, 0);
 }
 
 static noinline int __sched
 __mutex_lock_interruptible_slowpath(struct mutex *lock)
 {
         return __mutex_lock_common(lock, TASK_INTERRUPTIBLE, 0,
-                                   NULL, _RET_IP_, NULL);
+                                   NULL, _RET_IP_, NULL, 0);
 }
 
 static noinline int __sched
 __ww_mutex_lock_slowpath(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
 {
         return __mutex_lock_common(&lock->base, TASK_UNINTERRUPTIBLE, 0,
-                                   NULL, _RET_IP_, ctx);
+                                   NULL, _RET_IP_, ctx, 1);
 }
 
 static noinline int __sched
@@ -838,7 +838,7 @@ __ww_mutex_lock_interruptible_slowpath(struct ww_mutex *lock,
                                             struct ww_acquire_ctx *ctx)
 {
         return __mutex_lock_common(&lock->base, TASK_INTERRUPTIBLE, 0,
-                                   NULL, _RET_IP_, ctx);
+                                   NULL, _RET_IP_, ctx, 1);
 }
 
 #endif
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index c9c759d5a15c..0121dab83f43 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -846,7 +846,7 @@ static int software_resume(void)
         goto Finish;
 }
 
-late_initcall(software_resume);
+late_initcall_sync(software_resume);
 
 
 static const char * const hibernation_modes[] = {
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 38959c866789..662c5798a685 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -33,29 +33,64 @@ struct ce_unbind {
         int res;
 };
 
-/**
- * clockevents_delta2ns - Convert a latch value (device ticks) to nanoseconds
- * @latch:      value to convert
- * @evt:        pointer to clock event device descriptor
- *
- * Math helper, returns latch value converted to nanoseconds (bound checked)
- */
-u64 clockevent_delta2ns(unsigned long latch, struct clock_event_device *evt)
+static u64 cev_delta2ns(unsigned long latch, struct clock_event_device *evt,
+                        bool ismax)
 {
         u64 clc = (u64) latch << evt->shift;
+        u64 rnd;
 
         if (unlikely(!evt->mult)) {
                 evt->mult = 1;
                 WARN_ON(1);
         }
+        rnd = (u64) evt->mult - 1;
+
+        /*
+         * Upper bound sanity check. If the backwards conversion is
+         * not equal latch, we know that the above shift overflowed.
+         */
+        if ((clc >> evt->shift) != (u64)latch)
+                clc = ~0ULL;
+
+        /*
+         * Scaled math oddities:
+         *
+         * For mult <= (1 << shift) we can safely add mult - 1 to
+         * prevent integer rounding loss. So the backwards conversion
+         * from nsec to device ticks will be correct.
+         *
+         * For mult > (1 << shift), i.e. device frequency is > 1GHz we
+         * need to be careful. Adding mult - 1 will result in a value
+         * which when converted back to device ticks can be larger
+         * than latch by up to (mult - 1) >> shift. For the min_delta
+         * calculation we still want to apply this in order to stay
+         * above the minimum device ticks limit. For the upper limit
+         * we would end up with a latch value larger than the upper
+         * limit of the device, so we omit the add to stay below the
+         * device upper boundary.
+         *
+         * Also omit the add if it would overflow the u64 boundary.
+         */
+        if ((~0ULL - clc > rnd) &&
+            (!ismax || evt->mult <= (1U << evt->shift)))
+                clc += rnd;
 
         do_div(clc, evt->mult);
-        if (clc < 1000)
-                clc = 1000;
-        if (clc > KTIME_MAX)
-                clc = KTIME_MAX;
 
-        return clc;
+        /* Deltas less than 1usec are pointless noise */
+        return clc > 1000 ? clc : 1000;
+}
+
+/**
+ * clockevents_delta2ns - Convert a latch value (device ticks) to nanoseconds
+ * @latch:      value to convert
+ * @evt:        pointer to clock event device descriptor
+ *
+ * Math helper, returns latch value converted to nanoseconds (bound checked)
+ */
+u64 clockevent_delta2ns(unsigned long latch, struct clock_event_device *evt)
+{
+        return cev_delta2ns(latch, evt, false);
 }
 EXPORT_SYMBOL_GPL(clockevent_delta2ns);
 
@@ -380,8 +415,8 @@ void clockevents_config(struct clock_event_device *dev, u32 freq)
                 sec = 600;
 
         clockevents_calc_mult_shift(dev, freq, sec);
-        dev->min_delta_ns = clockevent_delta2ns(dev->min_delta_ticks, dev);
-        dev->max_delta_ns = clockevent_delta2ns(dev->max_delta_ticks, dev);
+        dev->min_delta_ns = cev_delta2ns(dev->min_delta_ticks, dev, false);
+        dev->max_delta_ns = cev_delta2ns(dev->max_delta_ticks, dev, true);
 }
 
 /**
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 06344d986eb9..094f3152ec2b 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -983,7 +983,7 @@ config DEBUG_KOBJECT
 
 config DEBUG_KOBJECT_RELEASE
         bool "kobject release debugging"
-        depends on DEBUG_KERNEL
+        depends on DEBUG_OBJECTS_TIMERS
         help
           kobjects are reference counted objects.  This means that their
           last reference count put is not predictable, and the kobject can
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/lib/scatterlist.c b/lib/scatterlist.c
index a685c8a79578..d16fa295ae1d 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -577,7 +577,8 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
                 miter->__offset += miter->consumed;
                 miter->__remaining -= miter->consumed;
 
-                if (miter->__flags & SG_MITER_TO_SG)
+                if ((miter->__flags & SG_MITER_TO_SG) &&
+                    !PageSlab(miter->page))
                         flush_kernel_dcache_page(miter->page);
 
                 if (miter->__flags & SG_MITER_ATOMIC) {
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..cca80d96e509 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1278,64 +1278,90 @@ out:
 int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
                                 unsigned long addr, pmd_t pmd, pmd_t *pmdp)
 {
+        struct anon_vma *anon_vma = NULL;
         struct page *page;
         unsigned long haddr = addr & HPAGE_PMD_MASK;
+        int page_nid = -1, this_nid = numa_node_id();
         int target_nid;
-        int current_nid = -1;
-        bool migrated;
+        bool page_locked;
+        bool migrated = false;
 
         spin_lock(&mm->page_table_lock);
         if (unlikely(!pmd_same(pmd, *pmdp)))
                 goto out_unlock;
 
         page = pmd_page(pmd);
-        get_page(page);
-        current_nid = page_to_nid(page);
+        page_nid = page_to_nid(page);
         count_vm_numa_event(NUMA_HINT_FAULTS);
-        if (current_nid == numa_node_id())
+        if (page_nid == this_nid)
                 count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL);
 
+        /*
+         * Acquire the page lock to serialise THP migrations but avoid dropping
+         * page_table_lock if at all possible
+         */
+        page_locked = trylock_page(page);
         target_nid = mpol_misplaced(page, vma, haddr);
         if (target_nid == -1) {
-                put_page(page);
-                goto clear_pmdnuma;
+                /* If the page was locked, there are no parallel migrations */
+                if (page_locked)
+                        goto clear_pmdnuma;
+
+                /*
+                 * Otherwise wait for potential migrations and retry. We do
+                 * relock and check_same as the page may no longer be mapped.
+                 * As the fault is being retried, do not account for it.
+                 */
+                spin_unlock(&mm->page_table_lock);
+                wait_on_page_locked(page);
+                page_nid = -1;
+                goto out;
         }
 
-        /* Acquire the page lock to serialise THP migrations */
+        /* Page is misplaced, serialise migrations and parallel THP splits */
+        get_page(page);
         spin_unlock(&mm->page_table_lock);
-        lock_page(page);
+        if (!page_locked)
+                lock_page(page);
+        anon_vma = page_lock_anon_vma_read(page);
 
         /* Confirm the PTE did not while locked */
         spin_lock(&mm->page_table_lock);
         if (unlikely(!pmd_same(pmd, *pmdp))) {
                 unlock_page(page);
                 put_page(page);
+                page_nid = -1;
                 goto out_unlock;
         }
-        spin_unlock(&mm->page_table_lock);
 
-        /* Migrate the THP to the requested node */
+        /*
+         * Migrate the THP to the requested node, returns with page unlocked
+         * and pmd_numa cleared.
+         */
+        spin_unlock(&mm->page_table_lock);
         migrated = migrate_misplaced_transhuge_page(mm, vma,
                                 pmdp, pmd, addr, page, target_nid);
-        if (!migrated)
-                goto check_same;
+        if (migrated)
+                page_nid = target_nid;
 
-        task_numa_fault(target_nid, HPAGE_PMD_NR, true);
-        return 0;
-
-check_same:
-        spin_lock(&mm->page_table_lock);
-        if (unlikely(!pmd_same(pmd, *pmdp)))
-                goto out_unlock;
+        goto out;
 clear_pmdnuma:
+        BUG_ON(!PageLocked(page));
         pmd = pmd_mknonnuma(pmd);
         set_pmd_at(mm, haddr, pmdp, pmd);
         VM_BUG_ON(pmd_numa(*pmdp));
         update_mmu_cache_pmd(vma, addr, pmdp);
+        unlock_page(page);
 out_unlock:
         spin_unlock(&mm->page_table_lock);
-        if (current_nid != -1)
-                task_numa_fault(current_nid, HPAGE_PMD_NR, false);
+
+out:
+        if (anon_vma)
+                page_unlock_anon_vma_read(anon_vma);
+
+        if (page_nid != -1)
+                task_numa_fault(page_nid, HPAGE_PMD_NR, migrated);
+
         return 0;
 }
 
@@ -2697,6 +2723,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 +2746,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/list_lru.c b/mm/list_lru.c
index 72467914b856..72f9decb0104 100644
--- a/mm/list_lru.c
+++ b/mm/list_lru.c
@@ -81,8 +81,9 @@ restart:
                  * decrement nr_to_walk first so that we don't livelock if we
                  * get stuck on large numbesr of LRU_RETRY items
                  */
-                if (--(*nr_to_walk) == 0)
+                if (!*nr_to_walk)
                         break;
+                --*nr_to_walk;
 
                 ret = isolate(item, &nlru->lock, cb_arg);
                 switch (ret) {
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1c52ddbc839b..13b9d0f221b8 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -54,6 +54,7 @@
 #include <linux/page_cgroup.h>
 #include <linux/cpu.h>
 #include <linux/oom.h>
+#include <linux/lockdep.h>
 #include "internal.h"
 #include <net/sock.h>
 #include <net/ip.h>
@@ -866,6 +867,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 +875,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;
 }
 
@@ -2044,6 +2047,12 @@ static int mem_cgroup_soft_reclaim(struct mem_cgroup *root_memcg,
         return total;
 }
 
+#ifdef CONFIG_LOCKDEP
+static struct lockdep_map memcg_oom_lock_dep_map = {
+        .name = "memcg_oom_lock",
+};
+#endif
+
 static DEFINE_SPINLOCK(memcg_oom_lock);
 
 /*
@@ -2081,7 +2090,8 @@ static bool mem_cgroup_oom_trylock(struct mem_cgroup *memcg)
                         }
                         iter->oom_lock = false;
                 }
-        }
+        } else
+                mutex_acquire(&memcg_oom_lock_dep_map, 0, 1, _RET_IP_);
 
         spin_unlock(&memcg_oom_lock);
 
@@ -2093,6 +2103,7 @@ static void mem_cgroup_oom_unlock(struct mem_cgroup *memcg)
         struct mem_cgroup *iter;
 
         spin_lock(&memcg_oom_lock);
+        mutex_release(&memcg_oom_lock_dep_map, 1, _RET_IP_);
         for_each_mem_cgroup_tree(iter, memcg)
                 iter->oom_lock = false;
         spin_unlock(&memcg_oom_lock);
@@ -2159,110 +2170,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 +2231,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 +2258,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 +2674,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
@@ -2800,8 +2774,10 @@ done:
         *ptr = memcg;
         return 0;
 nomem:
-        *ptr = NULL;
-        return -ENOMEM;
+        if (!(gfp_mask & __GFP_NOFAIL)) {
+                *ptr = NULL;
+                return -ENOMEM;
+        }
 bypass:
         *ptr = root_mem_cgroup;
         return -EINTR;
@@ -3806,8 +3782,7 @@ void mem_cgroup_move_account_page_stat(struct mem_cgroup *from,
 {
         /* Update stat data for mem_cgroup */
         preempt_disable();
-        WARN_ON_ONCE(from->stat->count[idx] < nr_pages);
-        __this_cpu_add(from->stat->count[idx], -nr_pages);
+        __this_cpu_sub(from->stat->count[idx], nr_pages);
         __this_cpu_add(to->stat->count[idx], nr_pages);
         preempt_enable();
 }
@@ -4983,31 +4958,18 @@ static void mem_cgroup_reparent_charges(struct mem_cgroup *memcg)
         } while (usage > 0);
 }
 
-/*
- * This mainly exists for tests during the setting of set of use_hierarchy.
- * Since this is the very setting we are changing, the current hierarchy value
- * is meaningless
- */
-static inline bool __memcg_has_children(struct mem_cgroup *memcg)
-{
-        struct cgroup_subsys_state *pos;
-
-        /* bounce at first found */
-        css_for_each_child(pos, &memcg->css)
-                return true;
-        return false;
-}
-
-/*
- * Must be called with memcg_create_mutex held, unless the cgroup is guaranteed
- * to be already dead (as in mem_cgroup_force_empty, for instance).  This is
- * from mem_cgroup_count_children(), in the sense that we don't really care how
- * many children we have; we only need to know if we have any.  It also counts
- * any memcg without hierarchy as infertile.
- */
 static inline bool memcg_has_children(struct mem_cgroup *memcg)
 {
-        return memcg->use_hierarchy && __memcg_has_children(memcg);
+        lockdep_assert_held(&memcg_create_mutex);
+        /*
+         * The lock does not prevent addition or deletion to the list
+         * of children, but it prevents a new child from being
+         * initialized based on this parent in css_online(), so it's
+         * enough to decide whether hierarchically inherited
+         * attributes can still be changed or not.
+         */
+        return memcg->use_hierarchy &&
+                !list_empty(&memcg->css.cgroup->children);
 }
 
 /*
@@ -5087,7 +5049,7 @@ static int mem_cgroup_hierarchy_write(struct cgroup_subsys_state *css,
          */
         if ((!parent_memcg || !parent_memcg->use_hierarchy) &&
                                 (val == 1 || val == 0)) {
-                if (!__memcg_has_children(memcg))
+                if (list_empty(&memcg->css.cgroup->children))
                         memcg->use_hierarchy = val;
                 else
                         retval = -EBUSY;
diff --git a/mm/memory.c b/mm/memory.c
index ca0003947115..d176154c243f 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);
                                 }
                         }
@@ -3519,12 +3521,12 @@ static int do_nonlinear_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 }
 
 int numa_migrate_prep(struct page *page, struct vm_area_struct *vma,
-                                unsigned long addr, int current_nid)
+                                unsigned long addr, int page_nid)
 {
         get_page(page);
 
         count_vm_numa_event(NUMA_HINT_FAULTS);
-        if (current_nid == numa_node_id())
+        if (page_nid == numa_node_id())
                 count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL);
 
         return mpol_misplaced(page, vma, addr);
@@ -3535,7 +3537,7 @@ int do_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
 {
         struct page *page = NULL;
         spinlock_t *ptl;
-        int current_nid = -1;
+        int page_nid = -1;
         int target_nid;
         bool migrated = false;
 
@@ -3565,15 +3567,10 @@ int do_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 return 0;
         }
 
-        current_nid = page_to_nid(page);
-        target_nid = numa_migrate_prep(page, vma, addr, current_nid);
+        page_nid = page_to_nid(page);
+        target_nid = numa_migrate_prep(page, vma, addr, page_nid);
         pte_unmap_unlock(ptep, ptl);
         if (target_nid == -1) {
-                /*
-                 * Account for the fault against the current node if it not
-                 * being replaced regardless of where the page is located.
-                 */
-                current_nid = numa_node_id();
                 put_page(page);
                 goto out;
         }
@@ -3581,11 +3578,11 @@ int do_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         /* Migrate to the requested node */
         migrated = migrate_misplaced_page(page, target_nid);
         if (migrated)
-                current_nid = target_nid;
+                page_nid = target_nid;
 
 out:
-        if (current_nid != -1)
-                task_numa_fault(current_nid, 1, migrated);
+        if (page_nid != -1)
+                task_numa_fault(page_nid, 1, migrated);
         return 0;
 }
 
@@ -3600,7 +3597,6 @@ static int do_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         unsigned long offset;
         spinlock_t *ptl;
         bool numa = false;
-        int local_nid = numa_node_id();
 
         spin_lock(&mm->page_table_lock);
         pmd = *pmdp;
@@ -3623,9 +3619,10 @@ static int do_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         for (addr = _addr + offset; addr < _addr + PMD_SIZE; pte++, addr += PAGE_SIZE) {
                 pte_t pteval = *pte;
                 struct page *page;
-                int curr_nid = local_nid;
+                int page_nid = -1;
                 int target_nid;
-                bool migrated;
+                bool migrated = false;
+
                 if (!pte_present(pteval))
                         continue;
                 if (!pte_numa(pteval))
@@ -3647,25 +3644,19 @@ static int do_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 if (unlikely(page_mapcount(page) != 1))
                         continue;
 
-                /*
-                 * Note that the NUMA fault is later accounted to either
-                 * the node that is currently running or where the page is
-                 * migrated to.
-                 */
-                curr_nid = local_nid;
-                target_nid = numa_migrate_prep(page, vma, addr,
-                                               page_to_nid(page));
-                if (target_nid == -1) {
+                page_nid = page_to_nid(page);
+                target_nid = numa_migrate_prep(page, vma, addr, page_nid);
+                pte_unmap_unlock(pte, ptl);
+                if (target_nid != -1) {
+                        migrated = migrate_misplaced_page(page, target_nid);
+                        if (migrated)
+                                page_nid = target_nid;
+                } else {
                         put_page(page);
-                        continue;
                 }
 
-                /* Migrate to the requested node */
-                pte_unmap_unlock(pte, ptl);
-                migrated = migrate_misplaced_page(page, target_nid);
-                if (migrated)
-                        curr_nid = target_nid;
-                task_numa_fault(curr_nid, 1, migrated);
+                if (page_nid != -1)
+                        task_numa_fault(page_nid, 1, migrated);
 
                 pte = pte_offset_map_lock(mm, pmdp, addr, &ptl);
         }
@@ -3863,15 +3854,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..c04692774e88 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
@@ -1713,12 +1715,12 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
                 unlock_page(new_page);
                 put_page(new_page);             /* Free it */
 
-                unlock_page(page);
+                /* Retake the callers reference and putback on LRU */
+                get_page(page);
                 putback_lru_page(page);
-
-                count_vm_events(PGMIGRATE_FAIL, HPAGE_PMD_NR);
-                isolated = 0;
-                goto out;
+                mod_zone_page_state(page_zone(page),
+                         NR_ISOLATED_ANON + page_lru, -HPAGE_PMD_NR);
+                goto out_fail;
         }
 
         /*
@@ -1735,9 +1737,9 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
         entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma);
         entry = pmd_mkhuge(entry);
 
-        page_add_new_anon_rmap(new_page, vma, haddr);
-
+        pmdp_clear_flush(vma, haddr, pmd);
         set_pmd_at(mm, haddr, pmd, entry);
+        page_add_new_anon_rmap(new_page, vma, haddr);
         update_mmu_cache_pmd(vma, address, &entry);
         page_remove_rmap(page);
         /*
@@ -1756,7 +1758,6 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
         count_vm_events(PGMIGRATE_SUCCESS, HPAGE_PMD_NR);
         count_vm_numa_events(NUMA_PAGE_MIGRATE, HPAGE_PMD_NR);
 
-out:
         mod_zone_page_state(page_zone(page),
                         NR_ISOLATED_ANON + page_lru,
                         -HPAGE_PMD_NR);
@@ -1765,6 +1766,10 @@ out:
 out_fail:
         count_vm_events(PGMIGRATE_FAIL, HPAGE_PMD_NR);
 out_dropref:
+        entry = pmd_mknonnuma(entry);
+        set_pmd_at(mm, haddr, pmd, entry);
+        update_mmu_cache_pmd(vma, address, &entry);
+
         unlock_page(page);
         put_page(page);
         return 0;
diff --git a/mm/mprotect.c b/mm/mprotect.c
index 94722a4d6b43..412ba2b7326a 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++;
                 }
@@ -145,7 +148,7 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
                                 split_huge_page_pmd(vma, addr, pmd);
                         else if (change_huge_pmd(vma, pmd, addr, newprot,
                                                  prot_numa)) {
-                                pages += HPAGE_PMD_NR;
+                                pages++;
                                 continue;
                         }
                         /* fall through */
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/pagewalk.c b/mm/pagewalk.c
index 5da2cbcfdbb5..2beeabf502c5 100644
--- a/mm/pagewalk.c
+++ b/mm/pagewalk.c
@@ -242,7 +242,7 @@ int walk_page_range(unsigned long addr, unsigned long end,
                 if (err)
                         break;
                 pgd++;
-        } while (addr = next, addr != end);
+        } while (addr = next, addr < end);
 
         return err;
 }
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/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
index 309129732285..c7e634af8516 100644
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -171,7 +171,7 @@ static size_t vlan_get_size(const struct net_device *dev)
 
         return nla_total_size(2) +      /* IFLA_VLAN_PROTOCOL */
                nla_total_size(2) +      /* IFLA_VLAN_ID */
-               sizeof(struct ifla_vlan_flags) + /* IFLA_VLAN_FLAGS */
+               nla_total_size(sizeof(struct ifla_vlan_flags)) + /* IFLA_VLAN_FLAGS */
                vlan_qos_map_size(vlan->nr_ingress_mappings) +
                vlan_qos_map_size(vlan->nr_egress_mappings);
 }
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index c72d1bcdcf49..1356af660b5b 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -65,6 +65,7 @@ static int __init batadv_init(void)
         batadv_recv_handler_init();
 
         batadv_iv_init();
+        batadv_nc_init();
 
         batadv_event_workqueue = create_singlethread_workqueue("bat_events");
 
@@ -142,7 +143,7 @@ int batadv_mesh_init(struct net_device *soft_iface)
         if (ret < 0)
                 goto err;
 
-        ret = batadv_nc_init(bat_priv);
+        ret = batadv_nc_mesh_init(bat_priv);
         if (ret < 0)
                 goto err;
 
@@ -167,7 +168,7 @@ void batadv_mesh_free(struct net_device *soft_iface)
         batadv_vis_quit(bat_priv);
 
         batadv_gw_node_purge(bat_priv);
-        batadv_nc_free(bat_priv);
+        batadv_nc_mesh_free(bat_priv);
         batadv_dat_free(bat_priv);
         batadv_bla_free(bat_priv);
 
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index a487d46e0aec..4ecc0b6bf8ab 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -35,6 +35,20 @@ static int batadv_nc_recv_coded_packet(struct sk_buff *skb,
                                        struct batadv_hard_iface *recv_if);
 
 /**
+ * batadv_nc_init - one-time initialization for network coding
+ */
+int __init batadv_nc_init(void)
+{
+        int ret;
+
+        /* Register our packet type */
+        ret = batadv_recv_handler_register(BATADV_CODED,
+                                           batadv_nc_recv_coded_packet);
+
+        return ret;
+}
+
+/**
  * batadv_nc_start_timer - initialise the nc periodic worker
  * @bat_priv: the bat priv with all the soft interface information
  */
@@ -45,10 +59,10 @@ static void batadv_nc_start_timer(struct batadv_priv *bat_priv)
 }
 
 /**
- * batadv_nc_init - initialise coding hash table and start house keeping
+ * batadv_nc_mesh_init - initialise coding hash table and start house keeping
  * @bat_priv: the bat priv with all the soft interface information
  */
-int batadv_nc_init(struct batadv_priv *bat_priv)
+int batadv_nc_mesh_init(struct batadv_priv *bat_priv)
 {
         bat_priv->nc.timestamp_fwd_flush = jiffies;
         bat_priv->nc.timestamp_sniffed_purge = jiffies;
@@ -70,11 +84,6 @@ int batadv_nc_init(struct batadv_priv *bat_priv)
         batadv_hash_set_lock_class(bat_priv->nc.coding_hash,
                                    &batadv_nc_decoding_hash_lock_class_key);
 
-        /* Register our packet type */
-        if (batadv_recv_handler_register(BATADV_CODED,
-                                         batadv_nc_recv_coded_packet) < 0)
-                goto err;
-
         INIT_DELAYED_WORK(&bat_priv->nc.work, batadv_nc_worker);
         batadv_nc_start_timer(bat_priv);
 
@@ -1721,12 +1730,11 @@ free_nc_packet:
 }
 
 /**
- * batadv_nc_free - clean up network coding memory
+ * batadv_nc_mesh_free - clean up network coding memory
  * @bat_priv: the bat priv with all the soft interface information
  */
-void batadv_nc_free(struct batadv_priv *bat_priv)
+void batadv_nc_mesh_free(struct batadv_priv *bat_priv)
 {
-        batadv_recv_handler_unregister(BATADV_CODED);
         cancel_delayed_work_sync(&bat_priv->nc.work);
 
         batadv_nc_purge_paths(bat_priv, bat_priv->nc.coding_hash, NULL);
diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h
index 85a4ec81ad50..ddfa618e80bf 100644
--- a/net/batman-adv/network-coding.h
+++ b/net/batman-adv/network-coding.h
@@ -22,8 +22,9 @@
 
 #ifdef CONFIG_BATMAN_ADV_NC
 
-int batadv_nc_init(struct batadv_priv *bat_priv);
-void batadv_nc_free(struct batadv_priv *bat_priv);
+int batadv_nc_init(void);
+int batadv_nc_mesh_init(struct batadv_priv *bat_priv);
+void batadv_nc_mesh_free(struct batadv_priv *bat_priv);
 void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
                               struct batadv_orig_node *orig_node,
                               struct batadv_orig_node *orig_neigh_node,
@@ -46,12 +47,17 @@ int batadv_nc_init_debugfs(struct batadv_priv *bat_priv);
 
 #else /* ifdef CONFIG_BATMAN_ADV_NC */
 
-static inline int batadv_nc_init(struct batadv_priv *bat_priv)
+static inline int batadv_nc_init(void)
 {
         return 0;
 }
 
-static inline void batadv_nc_free(struct batadv_priv *bat_priv)
+static inline int batadv_nc_mesh_init(struct batadv_priv *bat_priv)
+{
+        return 0;
+}
+
+static inline void batadv_nc_mesh_free(struct batadv_priv *bat_priv)
 {
         return;
 }
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index ffd5874f2592..33e8f23acddd 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -700,7 +700,7 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
 
                 vid = nla_get_u16(tb[NDA_VLAN]);
 
-                if (vid >= VLAN_N_VID) {
+                if (!vid || vid >= VLAN_VID_MASK) {
                         pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n",
                                 vid);
                         return -EINVAL;
@@ -794,7 +794,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
 
                 vid = nla_get_u16(tb[NDA_VLAN]);
 
-                if (vid >= VLAN_N_VID) {
+                if (!vid || vid >= VLAN_VID_MASK) {
                         pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n",
                                 vid);
                         return -EINVAL;
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 85a09bb5ca51..b7b1914dfa25 100644
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -453,7 +453,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry)
                 call_rcu_bh(&p->rcu, br_multicast_free_pg);
                 err = 0;
 
-                if (!mp->ports && !mp->mglist && mp->timer_armed &&
+                if (!mp->ports && !mp->mglist &&
                     netif_running(br->dev))
                         mod_timer(&mp->timer, jiffies);
                 break;
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index d1c578630678..8b0b610ca2c9 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -272,7 +272,7 @@ static void br_multicast_del_pg(struct net_bridge *br,
                 del_timer(&p->timer);
                 call_rcu_bh(&p->rcu, br_multicast_free_pg);
 
-                if (!mp->ports && !mp->mglist && mp->timer_armed &&
+                if (!mp->ports && !mp->mglist &&
                     netif_running(br->dev))
                         mod_timer(&mp->timer, jiffies);
 
@@ -620,7 +620,6 @@ rehash:
 
         mp->br = br;
         mp->addr = *group;
-
         setup_timer(&mp->timer, br_multicast_group_expired,
                     (unsigned long)mp);
 
@@ -660,6 +659,7 @@ static int br_multicast_add_group(struct net_bridge *br,
         struct net_bridge_mdb_entry *mp;
         struct net_bridge_port_group *p;
         struct net_bridge_port_group __rcu **pp;
+        unsigned long now = jiffies;
         int err;
 
         spin_lock(&br->multicast_lock);
@@ -674,6 +674,7 @@ static int br_multicast_add_group(struct net_bridge *br,
 
         if (!port) {
                 mp->mglist = true;
+                mod_timer(&mp->timer, now + br->multicast_membership_interval);
                 goto out;
         }
 
@@ -681,7 +682,7 @@ static int br_multicast_add_group(struct net_bridge *br,
              (p = mlock_dereference(*pp, br)) != NULL;
              pp = &p->next) {
                 if (p->port == port)
-                        goto out;
+                        goto found;
                 if ((unsigned long)p->port < (unsigned long)port)
                         break;
         }
@@ -692,6 +693,8 @@ static int br_multicast_add_group(struct net_bridge *br,
         rcu_assign_pointer(*pp, p);
         br_mdb_notify(br->dev, port, group, RTM_NEWMDB);
 
+found:
+        mod_timer(&p->timer, now + br->multicast_membership_interval);
 out:
         err = 0;
 
@@ -1191,9 +1194,6 @@ static int br_ip4_multicast_query(struct net_bridge *br,
         if (!mp)
                 goto out;
 
-        mod_timer(&mp->timer, now + br->multicast_membership_interval);
-        mp->timer_armed = true;
-
         max_delay *= br->multicast_last_member_count;
 
         if (mp->mglist &&
@@ -1270,9 +1270,6 @@ static int br_ip6_multicast_query(struct net_bridge *br,
         if (!mp)
                 goto out;
 
-        mod_timer(&mp->timer, now + br->multicast_membership_interval);
-        mp->timer_armed = true;
-
         max_delay *= br->multicast_last_member_count;
         if (mp->mglist &&
             (timer_pending(&mp->timer) ?
@@ -1358,7 +1355,7 @@ static void br_multicast_leave_group(struct net_bridge *br,
                         call_rcu_bh(&p->rcu, br_multicast_free_pg);
                         br_mdb_notify(br->dev, port, group, RTM_DELMDB);
 
-                        if (!mp->ports && !mp->mglist && mp->timer_armed &&
+                        if (!mp->ports && !mp->mglist &&
                             netif_running(br->dev))
                                 mod_timer(&mp->timer, jiffies);
                 }
@@ -1370,12 +1367,30 @@ static void br_multicast_leave_group(struct net_bridge *br,
                      br->multicast_last_member_interval;
 
         if (!port) {
-                if (mp->mglist && mp->timer_armed &&
+                if (mp->mglist &&
                     (timer_pending(&mp->timer) ?
                      time_after(mp->timer.expires, time) :
                      try_to_del_timer_sync(&mp->timer) >= 0)) {
                         mod_timer(&mp->timer, time);
                 }
+
+                goto out;
+        }
+
+        for (p = mlock_dereference(mp->ports, br);
+             p != NULL;
+             p = mlock_dereference(p->next, br)) {
+                if (p->port != port)
+                        continue;
+
+                if (!hlist_unhashed(&p->mglist) &&
+                    (timer_pending(&p->timer) ?
+                     time_after(p->timer.expires, time) :
+                     try_to_del_timer_sync(&p->timer) >= 0)) {
+                        mod_timer(&p->timer, time);
+                }
+
+                break;
         }
 out:
         spin_unlock(&br->multicast_lock);
@@ -1798,7 +1813,6 @@ void br_multicast_stop(struct net_bridge *br)
                 hlist_for_each_entry_safe(mp, n, &mdb->mhash[i],
                                           hlist[ver]) {
                         del_timer(&mp->timer);
-                        mp->timer_armed = false;
                         call_rcu_bh(&mp->rcu, br_multicast_free_group);
                 }
         }
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index e74ddc1c29a8..f75d92e4f96b 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -243,7 +243,7 @@ static int br_afspec(struct net_bridge *br,
 
                 vinfo = nla_data(tb[IFLA_BRIDGE_VLAN_INFO]);
 
-                if (vinfo->vid >= VLAN_N_VID)
+                if (!vinfo->vid || vinfo->vid >= VLAN_VID_MASK)
                         return -EINVAL;
 
                 switch (cmd) {
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index efb57d911569..e14c33b42f75 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -126,7 +126,6 @@ struct net_bridge_mdb_entry
         struct timer_list               timer;
         struct br_ip                    addr;
         bool                            mglist;
-        bool                            timer_armed;
 };
 
 struct net_bridge_mdb_htable
@@ -643,9 +642,7 @@ static inline u16 br_get_pvid(const struct net_port_vlans *v)
          * vid wasn't set
          */
         smp_rmb();
-        return (v->pvid & VLAN_TAG_PRESENT) ?
-                        (v->pvid & ~VLAN_TAG_PRESENT) :
-                        VLAN_N_VID;
+        return v->pvid ?: VLAN_N_VID;
 }
 
 #else
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 108084a04671..656a6f3e40de 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -134,7 +134,7 @@ static void br_stp_start(struct net_bridge *br)
 
         if (br->bridge_forward_delay < BR_MIN_FORWARD_DELAY)
                 __br_set_forward_delay(br, BR_MIN_FORWARD_DELAY);
-        else if (br->bridge_forward_delay < BR_MAX_FORWARD_DELAY)
+        else if (br->bridge_forward_delay > BR_MAX_FORWARD_DELAY)
                 __br_set_forward_delay(br, BR_MAX_FORWARD_DELAY);
 
         if (r == 0) {
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 9a9ffe7e4019..53f0990eab58 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -45,37 +45,34 @@ static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
                 return 0;
         }
 
-        if (vid) {
-                if (v->port_idx) {
-                        p = v->parent.port;
-                        br = p->br;
-                        dev = p->dev;
-                } else {
-                        br = v->parent.br;
-                        dev = br->dev;
-                }
-                ops = dev->netdev_ops;
-
-                if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) {
-                        /* Add VLAN to the device filter if it is supported.
-                         * Stricly speaking, this is not necessary now, since
-                         * devices are made promiscuous by the bridge, but if
-                         * that ever changes this code will allow tagged
-                         * traffic to enter the bridge.
-                         */
-                        err = ops->ndo_vlan_rx_add_vid(dev, htons(ETH_P_8021Q),
-                                                       vid);
-                        if (err)
-                                return err;
-                }
-
-                err = br_fdb_insert(br, p, dev->dev_addr, vid);
-                if (err) {
-                        br_err(br, "failed insert local address into bridge "
-                               "forwarding table\n");
-                        goto out_filt;
-                }
+        if (v->port_idx) {
+                p = v->parent.port;
+                br = p->br;
+                dev = p->dev;
+        } else {
+                br = v->parent.br;
+                dev = br->dev;
+        }
+        ops = dev->netdev_ops;
+
+        if (p && (dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) {
+                /* Add VLAN to the device filter if it is supported.
+                 * Stricly speaking, this is not necessary now, since
+                 * devices are made promiscuous by the bridge, but if
+                 * that ever changes this code will allow tagged
+                 * traffic to enter the bridge.
+                 */
+                err = ops->ndo_vlan_rx_add_vid(dev, htons(ETH_P_8021Q),
+                                               vid);
+                if (err)
+                        return err;
+        }
 
+        err = br_fdb_insert(br, p, dev->dev_addr, vid);
+        if (err) {
+                br_err(br, "failed insert local address into bridge "
+                       "forwarding table\n");
+                goto out_filt;
         }
 
         set_bit(vid, v->vlan_bitmap);
@@ -98,7 +95,7 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid)
         __vlan_delete_pvid(v, vid);
         clear_bit(vid, v->untagged_bitmap);
 
-        if (v->port_idx && vid) {
+        if (v->port_idx) {
                 struct net_device *dev = v->parent.port->dev;
                 const struct net_device_ops *ops = dev->netdev_ops;
 
@@ -192,6 +189,8 @@ out:
 bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
                         struct sk_buff *skb, u16 *vid)
 {
+        int err;
+
         /* If VLAN filtering is disabled on the bridge, all packets are
          * permitted.
          */
@@ -204,20 +203,32 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
         if (!v)
                 return false;
 
-        if (br_vlan_get_tag(skb, vid)) {
+        err = br_vlan_get_tag(skb, vid);
+        if (!*vid) {
                 u16 pvid = br_get_pvid(v);
 
-                /* Frame did not have a tag.  See if pvid is set
-                 * on this port.  That tells us which vlan untagged
-                 * traffic belongs to.
+                /* Frame had a tag with VID 0 or did not have a tag.
+                 * See if pvid is set on this port.  That tells us which
+                 * vlan untagged or priority-tagged traffic belongs to.
                  */
                 if (pvid == VLAN_N_VID)
                         return false;
 
-                /* PVID is set on this port.  Any untagged ingress
-                 * frame is considered to belong to this vlan.
+                /* PVID is set on this port.  Any untagged or priority-tagged
+                 * ingress frame is considered to belong to this vlan.
                  */
-                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid);
+                *vid = pvid;
+                if (likely(err))
+                        /* Untagged Frame. */
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid);
+                else
+                        /* Priority-tagged Frame.
+                         * At this point, We know that skb->vlan_tci had
+                         * VLAN_TAG_PRESENT bit and its VID field was 0x000.
+                         * We update only VID field and preserve PCP field.
+                         */
+                        skb->vlan_tci |= pvid;
+
                 return true;
         }
 
@@ -248,7 +259,9 @@ bool br_allowed_egress(struct net_bridge *br,
         return false;
 }
 
-/* Must be protected by RTNL */
+/* Must be protected by RTNL.
+ * Must be called with vid in range from 1 to 4094 inclusive.
+ */
 int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags)
 {
         struct net_port_vlans *pv = NULL;
@@ -278,7 +291,9 @@ out:
         return err;
 }
 
-/* Must be protected by RTNL */
+/* Must be protected by RTNL.
+ * Must be called with vid in range from 1 to 4094 inclusive.
+ */
 int br_vlan_delete(struct net_bridge *br, u16 vid)
 {
         struct net_port_vlans *pv;
@@ -289,14 +304,9 @@ int br_vlan_delete(struct net_bridge *br, u16 vid)
         if (!pv)
                 return -EINVAL;
 
-        if (vid) {
-                /* If the VID !=0 remove fdb for this vid. VID 0 is special
-                 * in that it's the default and is always there in the fdb.
-                 */
-                spin_lock_bh(&br->hash_lock);
-                fdb_delete_by_addr(br, br->dev->dev_addr, vid);
-                spin_unlock_bh(&br->hash_lock);
-        }
+        spin_lock_bh(&br->hash_lock);
+        fdb_delete_by_addr(br, br->dev->dev_addr, vid);
+        spin_unlock_bh(&br->hash_lock);
 
         __vlan_del(pv, vid);
         return 0;
@@ -329,7 +339,9 @@ unlock:
         return 0;
 }
 
-/* Must be protected by RTNL */
+/* Must be protected by RTNL.
+ * Must be called with vid in range from 1 to 4094 inclusive.
+ */
 int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags)
 {
         struct net_port_vlans *pv = NULL;
@@ -363,7 +375,9 @@ clean_up:
         return err;
 }
 
-/* Must be protected by RTNL */
+/* Must be protected by RTNL.
+ * Must be called with vid in range from 1 to 4094 inclusive.
+ */
 int nbp_vlan_delete(struct net_bridge_port *port, u16 vid)
 {
         struct net_port_vlans *pv;
@@ -374,14 +388,9 @@ int nbp_vlan_delete(struct net_bridge_port *port, u16 vid)
         if (!pv)
                 return -EINVAL;
 
-        if (vid) {
-                /* If the VID !=0 remove fdb for this vid. VID 0 is special
-                 * in that it's the default and is always there in the fdb.
-                 */
-                spin_lock_bh(&port->br->hash_lock);
-                fdb_delete_by_addr(port->br, port->dev->dev_addr, vid);
-                spin_unlock_bh(&port->br->hash_lock);
-        }
+        spin_lock_bh(&port->br->hash_lock);
+        fdb_delete_by_addr(port->br, port->dev->dev_addr, vid);
+        spin_unlock_bh(&port->br->hash_lock);
 
         return __vlan_del(pv, vid);
 }
diff --git a/net/compat.c b/net/compat.c
index f0a1ba6c8086..89032580bd1d 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -71,6 +71,8 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
             __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
             __get_user(kmsg->msg_flags, &umsg->msg_flags))
                 return -EFAULT;
+        if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
+                return -EINVAL;
         kmsg->msg_name = compat_ptr(tmp1);
         kmsg->msg_iov = compat_ptr(tmp2);
         kmsg->msg_control = compat_ptr(tmp3);
diff --git a/net/core/dev.c b/net/core/dev.c
index 65f829cfd928..3430b1ed12e5 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1917,7 +1917,8 @@ static struct xps_map *expand_xps_map(struct xps_map *map,
         return new_map;
 }
 
-int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, u16 index)
+int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask,
+                        u16 index)
 {
         struct xps_dev_maps *dev_maps, *new_dev_maps = NULL;
         struct xps_map *map, *new_map;
diff --git a/net/core/filter.c b/net/core/filter.c
index 6438f29ff266..01b780856db2 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -644,7 +644,6 @@ void sk_filter_release_rcu(struct rcu_head *rcu)
         struct sk_filter *fp = container_of(rcu, struct sk_filter, rcu);
 
         bpf_jit_free(fp);
-        kfree(fp);
 }
 EXPORT_SYMBOL(sk_filter_release_rcu);
 
@@ -683,7 +682,7 @@ int sk_unattached_filter_create(struct sk_filter **pfp,
         if (fprog->filter == NULL)
                 return -EINVAL;
 
-        fp = kmalloc(fsize + sizeof(*fp), GFP_KERNEL);
+        fp = kmalloc(sk_filter_size(fprog->len), GFP_KERNEL);
         if (!fp)
                 return -ENOMEM;
         memcpy(fp->insns, fprog->filter, fsize);
@@ -723,6 +722,7 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
 {
         struct sk_filter *fp, *old_fp;
         unsigned int fsize = sizeof(struct sock_filter) * fprog->len;
+        unsigned int sk_fsize = sk_filter_size(fprog->len);
         int err;
 
         if (sock_flag(sk, SOCK_FILTER_LOCKED))
@@ -732,11 +732,11 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
         if (fprog->filter == NULL)
                 return -EINVAL;
 
-        fp = sock_kmalloc(sk, fsize+sizeof(*fp), GFP_KERNEL);
+        fp = sock_kmalloc(sk, sk_fsize, GFP_KERNEL);
         if (!fp)
                 return -ENOMEM;
         if (copy_from_user(fp->insns, fprog->filter, fsize)) {
-                sock_kfree_s(sk, fp, fsize+sizeof(*fp));
+                sock_kfree_s(sk, fp, sk_fsize);
                 return -EFAULT;
         }
 
diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c
index 3f1ec1586ae1..8d9d05edd2eb 100644
--- a/net/core/secure_seq.c
+++ b/net/core/secure_seq.c
@@ -10,6 +10,7 @@
 
 #include <net/secure_seq.h>
 
+#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_INET)
 #define NET_SECRET_SIZE (MD5_MESSAGE_BYTES / 4)
 
 static u32 net_secret[NET_SECRET_SIZE] ____cacheline_aligned;
@@ -29,6 +30,7 @@ static void net_secret_init(void)
                 cmpxchg(&net_secret[--i], 0, tmp);
         }
 }
+#endif
 
 #ifdef CONFIG_INET
 static u32 seq_scale(u32 seq)
diff --git a/net/core/sock.c b/net/core/sock.c
index 5b6beba494a3..0b39e7ae4383 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2319,6 +2319,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
         sk->sk_ll_usec          =       sysctl_net_busy_read;
 #endif
 
+        sk->sk_pacing_rate = ~0U;
         /*
          * Before updating sk_refcnt, we must commit prior changes to memory
          * (Documentation/RCU/rculist_nulls.txt for details)
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index c85e71e0c7ff..ff41b4d60d30 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -1372,6 +1372,8 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev,
         real_dev = dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));
         if (!real_dev)
                 return -ENODEV;
+        if (real_dev->type != ARPHRD_IEEE802154)
+                return -EINVAL;
 
         lowpan_dev_info(dev)->real_dev = real_dev;
         lowpan_dev_info(dev)->fragment_tag = 0;
@@ -1386,6 +1388,9 @@ static int lowpan_newlink(struct net *src_net, struct net_device *dev,
 
         entry->ldev = dev;
 
+        /* Set the lowpan harware address to the wpan hardware address. */
+        memcpy(dev->dev_addr, real_dev->dev_addr, IEEE802154_ADDR_LEN);
+
         mutex_lock(&lowpan_dev_info(dev)->dev_list_mtx);
         INIT_LIST_HEAD(&entry->list);
         list_add_tail(&entry->list, &lowpan_devices);
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 7bd8983dbfcf..96da9c77deca 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -287,7 +287,7 @@ begintw:
                         if (unlikely(!INET_TW_MATCH(sk, net, acookie,
                                                     saddr, daddr, ports,
                                                     dif))) {
-                                sock_put(sk);
+                                inet_twsk_put(inet_twsk(sk));
                                 goto begintw;
                         }
                         goto out;
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index a04d872c54f9..3982eabf61e1 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -772,15 +772,20 @@ static inline int ip_ufo_append_data(struct sock *sk,
                 /* initialize protocol header pointer */
                 skb->transport_header = skb->network_header + fragheaderlen;
 
-                skb->ip_summed = CHECKSUM_PARTIAL;
                 skb->csum = 0;
 
-                /* specify the length of each IP datagram fragment */
-                skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen;
-                skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
+
                 __skb_queue_tail(queue, skb);
+        } else if (skb_is_gso(skb)) {
+                goto append;
         }
 
+        skb->ip_summed = CHECKSUM_PARTIAL;
+        /* specify the length of each IP datagram fragment */
+        skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen;
+        skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
+
+append:
         return skb_append_datato_frags(sk, skb, getfrag, from,
                                        (length - transhdrlen));
 }
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index e805e7b3030e..6e87f853d033 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -125,8 +125,17 @@ static int vti_rcv(struct sk_buff *skb)
                                   iph->saddr, iph->daddr, 0);
         if (tunnel != NULL) {
                 struct pcpu_tstats *tstats;
+                u32 oldmark = skb->mark;
+                int ret;
 
-                if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
+
+                /* temporarily mark the skb with the tunnel o_key, to
+                 * only match policies with this mark.
+                 */
+                skb->mark = be32_to_cpu(tunnel->parms.o_key);
+                ret = xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb);
+                skb->mark = oldmark;
+                if (!ret)
                         return -1;
 
                 tstats = this_cpu_ptr(tunnel->dev->tstats);
@@ -135,7 +144,6 @@ static int vti_rcv(struct sk_buff *skb)
                 tstats->rx_bytes += skb->len;
                 u64_stats_update_end(&tstats->syncp);
 
-                skb->mark = 0;
                 secpath_reset(skb);
                 skb->dev = tunnel->dev;
                 return 1;
@@ -167,7 +175,7 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 
         memset(&fl4, 0, sizeof(fl4));
         flowi4_init_output(&fl4, tunnel->parms.link,
-                           be32_to_cpu(tunnel->parms.i_key), RT_TOS(tos),
+                           be32_to_cpu(tunnel->parms.o_key), RT_TOS(tos),
                            RT_SCOPE_UNIVERSE,
                            IPPROTO_IPIP, 0,
                            dst, tiph->saddr, 0, 0);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 727f4365bcdf..6011615e810d 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2072,7 +2072,7 @@ struct rtable *__ip_route_output_key(struct net *net, struct flowi4 *fl4)
                                                               RT_SCOPE_LINK);
                         goto make_route;
                 }
-                if (fl4->saddr) {
+                if (!fl4->saddr) {
                         if (ipv4_is_multicast(fl4->daddr))
                                 fl4->saddr = inet_select_addr(dev_out, 0,
                                                               fl4->flowi4_scope);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 25a89eaa669d..a16b01b537ba 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1284,7 +1284,10 @@ static bool tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
                 tp->lost_cnt_hint -= tcp_skb_pcount(prev);
         }
 
-        TCP_SKB_CB(skb)->tcp_flags |= TCP_SKB_CB(prev)->tcp_flags;
+        TCP_SKB_CB(prev)->tcp_flags |= TCP_SKB_CB(skb)->tcp_flags;
+        if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
+                TCP_SKB_CB(prev)->end_seq++;
+
         if (skb == tcp_highest_sack(sk))
                 tcp_advance_highest_sack(sk, skb);
 
@@ -3288,7 +3291,7 @@ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag)
                         tcp_init_cwnd_reduction(sk, true);
                         tcp_set_ca_state(sk, TCP_CA_CWR);
                         tcp_end_cwnd_reduction(sk);
-                        tcp_set_ca_state(sk, TCP_CA_Open);
+                        tcp_try_keep_open(sk);
                         NET_INC_STATS_BH(sock_net(sk),
                                          LINUX_MIB_TCPLOSSPROBERECOVERY);
                 }
@@ -5709,6 +5712,8 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
                 } else
                         tcp_init_metrics(sk);
 
+                tcp_update_pacing_rate(sk);
+
                 /* Prevent spurious tcp_cwnd_restart() on first data packet */
                 tp->lsndtime = tcp_time_stamp;
 
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index e6bb8256e59f..d46f2143305c 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -637,6 +637,8 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb
         unsigned int size = 0;
         unsigned int eff_sacks;
 
+        opts->options = 0;
+
 #ifdef CONFIG_TCP_MD5SIG
         *md5 = tp->af_specific->md5_lookup(sk, sk);
         if (unlikely(*md5)) {
@@ -984,8 +986,10 @@ static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb)
 static void tcp_set_skb_tso_segs(const struct sock *sk, struct sk_buff *skb,
                                  unsigned int mss_now)
 {
-        if (skb->len <= mss_now || !sk_can_gso(sk) ||
-            skb->ip_summed == CHECKSUM_NONE) {
+        /* Make sure we own this skb before messing gso_size/gso_segs */
+        WARN_ON_ONCE(skb_cloned(skb));
+
+        if (skb->len <= mss_now || skb->ip_summed == CHECKSUM_NONE) {
                 /* Avoid the costly divide in the normal
                  * non-TSO case.
                  */
@@ -1065,9 +1069,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
         if (nsize < 0)
                 nsize = 0;
 
-        if (skb_cloned(skb) &&
-            skb_is_nonlinear(skb) &&
-            pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
+        if (skb_unclone(skb, GFP_ATOMIC))
                 return -ENOMEM;
 
         /* Get a new skb... force flag on. */
@@ -2342,6 +2344,8 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
                 int oldpcount = tcp_skb_pcount(skb);
 
                 if (unlikely(oldpcount > 1)) {
+                        if (skb_unclone(skb, GFP_ATOMIC))
+                                return -ENOMEM;
                         tcp_init_tso_segs(sk, skb, cur_mss);
                         tcp_adjust_pcount(sk, skb, oldpcount - tcp_skb_pcount(skb));
                 }
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 9a459be24af7..ccde54248c8c 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -107,6 +107,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
 
         memset(fl4, 0, sizeof(struct flowi4));
         fl4->flowi4_mark = skb->mark;
+        fl4->flowi4_oif = skb_dst(skb)->dev->ifindex;
 
         if (!ip_is_fragment(iph)) {
                 switch (iph->protocol) {
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 73784c3d4642..82e1da3a40b9 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -618,8 +618,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         struct ip_auth_hdr *ah = (struct ip_auth_hdr*)(skb->data+offset);
         struct xfrm_state *x;
 
-        if (type != ICMPV6_DEST_UNREACH &&
-            type != ICMPV6_PKT_TOOBIG &&
+        if (type != ICMPV6_PKT_TOOBIG &&
             type != NDISC_REDIRECT)
                 return;
 
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index d3618a78fcac..e67e63f9858d 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -436,8 +436,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data + offset);
         struct xfrm_state *x;
 
-        if (type != ICMPV6_DEST_UNREACH &&
-            type != ICMPV6_PKT_TOOBIG &&
+        if (type != ICMPV6_PKT_TOOBIG &&
             type != NDISC_REDIRECT)
                 return;
 
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index 32b4a1675d82..066640e0ba8e 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -116,7 +116,7 @@ begintw:
                         }
                         if (unlikely(!INET6_TW_MATCH(sk, net, saddr, daddr,
                                                      ports, dif))) {
-                                sock_put(sk);
+                                inet_twsk_put(inet_twsk(sk));
                                 goto begintw;
                         }
                         goto out;
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 7bb5446b9d73..bf4a9a084de5 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -976,6 +976,7 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu)
                 if (t->parms.o_flags&GRE_SEQ)
                         addend += 4;
         }
+        t->hlen = addend;
 
         if (p->flags & IP6_TNL_F_CAP_XMIT) {
                 int strict = (ipv6_addr_type(&p->raddr) &
@@ -1002,8 +1003,6 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu)
                 }
                 ip6_rt_put(rt);
         }
-
-        t->hlen = addend;
 }
 
 static int ip6gre_tnl_change(struct ip6_tnl *t,
@@ -1173,9 +1172,8 @@ done:
 
 static int ip6gre_tunnel_change_mtu(struct net_device *dev, int new_mtu)
 {
-        struct ip6_tnl *tunnel = netdev_priv(dev);
         if (new_mtu < 68 ||
-            new_mtu > 0xFFF8 - dev->hard_header_len - tunnel->hlen)
+            new_mtu > 0xFFF8 - dev->hard_header_len)
                 return -EINVAL;
         dev->mtu = new_mtu;
         return 0;
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index a54c45ce4a48..91fb4e8212f5 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -105,7 +105,7 @@ static int ip6_finish_output2(struct sk_buff *skb)
         }
 
         rcu_read_lock_bh();
-        nexthop = rt6_nexthop((struct rt6_info *)dst, &ipv6_hdr(skb)->daddr);
+        nexthop = rt6_nexthop((struct rt6_info *)dst);
         neigh = __ipv6_neigh_lookup_noref(dst->dev, nexthop);
         if (unlikely(!neigh))
                 neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false);
@@ -874,7 +874,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
          */
         rt = (struct rt6_info *) *dst;
         rcu_read_lock_bh();
-        n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt, &fl6->daddr));
+        n = __ipv6_neigh_lookup_noref(rt->dst.dev, rt6_nexthop(rt));
         err = n && !(n->nud_state & NUD_VALID) ? -EINVAL : 0;
         rcu_read_unlock_bh();
 
@@ -1008,6 +1008,7 @@ static inline int ip6_ufo_append_data(struct sock *sk,
 
 {
         struct sk_buff *skb;
+        struct frag_hdr fhdr;
         int err;
 
         /* There is support for UDP large send offload by network
@@ -1015,8 +1016,6 @@ static inline int ip6_ufo_append_data(struct sock *sk,
          * udp datagram
          */
         if ((skb = skb_peek_tail(&sk->sk_write_queue)) == NULL) {
-                struct frag_hdr fhdr;
-
                 skb = sock_alloc_send_skb(sk,
                         hh_len + fragheaderlen + transhdrlen + 20,
                         (flags & MSG_DONTWAIT), &err);
@@ -1036,20 +1035,24 @@ static inline int ip6_ufo_append_data(struct sock *sk,
                 skb->transport_header = skb->network_header + fragheaderlen;
 
                 skb->protocol = htons(ETH_P_IPV6);
-                skb->ip_summed = CHECKSUM_PARTIAL;
                 skb->csum = 0;
 
-                /* Specify the length of each IPv6 datagram fragment.
-                 * It has to be a multiple of 8.
-                 */
-                skb_shinfo(skb)->gso_size = (mtu - fragheaderlen -
-                                             sizeof(struct frag_hdr)) & ~7;
-                skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
-                ipv6_select_ident(&fhdr, rt);
-                skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
                 __skb_queue_tail(&sk->sk_write_queue, skb);
+        } else if (skb_is_gso(skb)) {
+                goto append;
         }
 
+        skb->ip_summed = CHECKSUM_PARTIAL;
+        /* Specify the length of each IPv6 datagram fragment.
+         * It has to be a multiple of 8.
+         */
+        skb_shinfo(skb)->gso_size = (mtu - fragheaderlen -
+                                     sizeof(struct frag_hdr)) & ~7;
+        skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
+        ipv6_select_ident(&fhdr, rt);
+        skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
+
+append:
         return skb_append_datato_frags(sk, skb, getfrag, from,
                                        (length - transhdrlen));
 }
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index a791552e0422..583b77e2f69b 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1430,9 +1430,17 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 static int
 ip6_tnl_change_mtu(struct net_device *dev, int new_mtu)
 {
-        if (new_mtu < IPV6_MIN_MTU) {
-                return -EINVAL;
+        struct ip6_tnl *tnl = netdev_priv(dev);
+
+        if (tnl->parms.proto == IPPROTO_IPIP) {
+                if (new_mtu < 68)
+                        return -EINVAL;
+        } else {
+                if (new_mtu < IPV6_MIN_MTU)
+                        return -EINVAL;
         }
+        if (new_mtu > 0xFFF8 - dev->hard_header_len)
+                return -EINVAL;
         dev->mtu = new_mtu;
         return 0;
 }
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 5636a912074a..ce507d9e1c90 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -64,8 +64,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                 (struct ip_comp_hdr *)(skb->data + offset);
         struct xfrm_state *x;
 
-        if (type != ICMPV6_DEST_UNREACH &&
-            type != ICMPV6_PKT_TOOBIG &&
+        if (type != ICMPV6_PKT_TOOBIG &&
             type != NDISC_REDIRECT)
                 return;
 
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index c979dd96d82a..f54e3a101098 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -476,6 +476,24 @@ out:
 }
 
 #ifdef CONFIG_IPV6_ROUTER_PREF
+struct __rt6_probe_work {
+        struct work_struct work;
+        struct in6_addr target;
+        struct net_device *dev;
+};
+
+static void rt6_probe_deferred(struct work_struct *w)
+{
+        struct in6_addr mcaddr;
+        struct __rt6_probe_work *work =
+                container_of(w, struct __rt6_probe_work, work);
+
+        addrconf_addr_solict_mult(&work->target, &mcaddr);
+        ndisc_send_ns(work->dev, NULL, &work->target, &mcaddr, NULL);
+        dev_put(work->dev);
+        kfree(w);
+}
+
 static void rt6_probe(struct rt6_info *rt)
 {
         struct neighbour *neigh;
@@ -499,17 +517,23 @@ static void rt6_probe(struct rt6_info *rt)
 
         if (!neigh ||
             time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) {
-                struct in6_addr mcaddr;
-                struct in6_addr *target;
+                struct __rt6_probe_work *work;
 
-                if (neigh) {
+                work = kmalloc(sizeof(*work), GFP_ATOMIC);
+
+                if (neigh && work)
                         neigh->updated = jiffies;
+
+                if (neigh)
                         write_unlock(&neigh->lock);
-                }
 
-                target = (struct in6_addr *)&rt->rt6i_gateway;
-                addrconf_addr_solict_mult(target, &mcaddr);
-                ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL);
+                if (work) {
+                        INIT_WORK(&work->work, rt6_probe_deferred);
+                        work->target = rt->rt6i_gateway;
+                        dev_hold(rt->dst.dev);
+                        work->dev = rt->dst.dev;
+                        schedule_work(&work->work);
+                }
         } else {
 out:
                 write_unlock(&neigh->lock);
@@ -851,7 +875,6 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort,
                         if (ort->rt6i_dst.plen != 128 &&
                             ipv6_addr_equal(&ort->rt6i_dst.addr, daddr))
                                 rt->rt6i_flags |= RTF_ANYCAST;
-                        rt->rt6i_gateway = *daddr;
                 }
 
                 rt->rt6i_flags |= RTF_CACHE;
@@ -1338,6 +1361,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
         rt->dst.flags |= DST_HOST;
         rt->dst.output  = ip6_output;
         atomic_set(&rt->dst.__refcnt, 1);
+        rt->rt6i_gateway  = fl6->daddr;
         rt->rt6i_dst.addr = fl6->daddr;
         rt->rt6i_dst.plen = 128;
         rt->rt6i_idev     = idev;
@@ -1873,7 +1897,10 @@ static struct rt6_info *ip6_rt_copy(struct rt6_info *ort,
                         in6_dev_hold(rt->rt6i_idev);
                 rt->dst.lastuse = jiffies;
 
-                rt->rt6i_gateway = ort->rt6i_gateway;
+                if (ort->rt6i_flags & RTF_GATEWAY)
+                        rt->rt6i_gateway = ort->rt6i_gateway;
+                else
+                        rt->rt6i_gateway = *dest;
                 rt->rt6i_flags = ort->rt6i_flags;
                 if ((ort->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF)) ==
                     (RTF_DEFAULT | RTF_ADDRCONF))
@@ -2160,6 +2187,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
         else
                 rt->rt6i_flags |= RTF_LOCAL;
 
+        rt->rt6i_gateway  = *addr;
         rt->rt6i_dst.addr = *addr;
         rt->rt6i_dst.plen = 128;
         rt->rt6i_table = fib6_get_table(net, RT6_TABLE_LOCAL);
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 72b7eaaf3ca0..18786098fd41 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1225,9 +1225,6 @@ do_udp_sendmsg:
         if (tclass < 0)
                 tclass = np->tclass;
 
-        if (dontfrag < 0)
-                dontfrag = np->dontfrag;
-
         if (msg->msg_flags&MSG_CONFIRM)
                 goto do_confirm;
 back_from_confirm:
@@ -1246,6 +1243,8 @@ back_from_confirm:
         up->pending = AF_INET6;
 
 do_append_data:
+        if (dontfrag < 0)
+                dontfrag = np->dontfrag;
         up->len += ulen;
         getfrag  =  is_udplite ?  udplite_getfrag : ip_generic_getfrag;
         err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen,
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 23ed03d786c8..08ed2772b7aa 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -138,6 +138,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
 
         memset(fl6, 0, sizeof(struct flowi6));
         fl6->flowi6_mark = skb->mark;
+        fl6->flowi6_oif = skb_dst(skb)->dev->ifindex;
 
         fl6->daddr = reverse ? hdr->saddr : hdr->daddr;
         fl6->saddr = reverse ? hdr->daddr : hdr->saddr;
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 9d585370c5b4..911ef03bf8fb 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1098,7 +1098,8 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
 
         x->id.proto = proto;
         x->id.spi = sa->sadb_sa_spi;
-        x->props.replay_window = sa->sadb_sa_replay;
+        x->props.replay_window = min_t(unsigned int, sa->sadb_sa_replay,
+                                        (sizeof(x->replay.bitmap) * 8));
         if (sa->sadb_sa_flags & SADB_SAFLAGS_NOECN)
                 x->props.flags |= XFRM_STATE_NOECN;
         if (sa->sadb_sa_flags & SADB_SAFLAGS_DECAP_DSCP)
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index feae495a0a30..b076e8309bc2 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -115,6 +115,11 @@ struct l2tp_net {
 static void l2tp_session_set_header_len(struct l2tp_session *session, int version);
 static void l2tp_tunnel_free(struct l2tp_tunnel *tunnel);
 
+static inline struct l2tp_tunnel *l2tp_tunnel(struct sock *sk)
+{
+        return sk->sk_user_data;
+}
+
 static inline struct l2tp_net *l2tp_pernet(struct net *net)
 {
         BUG_ON(!net);
@@ -504,7 +509,7 @@ static inline int l2tp_verify_udp_checksum(struct sock *sk,
                 return 0;
 
 #if IS_ENABLED(CONFIG_IPV6)
-        if (sk->sk_family == PF_INET6) {
+        if (sk->sk_family == PF_INET6 && !l2tp_tunnel(sk)->v4mapped) {
                 if (!uh->check) {
                         LIMIT_NETDEBUG(KERN_INFO "L2TP: IPv6: checksum is 0\n");
                         return 1;
@@ -1128,7 +1133,7 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
         /* Queue the packet to IP for output */
         skb->local_df = 1;
 #if IS_ENABLED(CONFIG_IPV6)
-        if (skb->sk->sk_family == PF_INET6)
+        if (skb->sk->sk_family == PF_INET6 && !tunnel->v4mapped)
                 error = inet6_csk_xmit(skb, NULL);
         else
 #endif
@@ -1255,7 +1260,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
 
                 /* Calculate UDP checksum if configured to do so */
 #if IS_ENABLED(CONFIG_IPV6)
-                if (sk->sk_family == PF_INET6)
+                if (sk->sk_family == PF_INET6 && !tunnel->v4mapped)
                         l2tp_xmit_ipv6_csum(sk, skb, udp_len);
                 else
 #endif
@@ -1304,10 +1309,9 @@ EXPORT_SYMBOL_GPL(l2tp_xmit_skb);
  */
 static void l2tp_tunnel_destruct(struct sock *sk)
 {
-        struct l2tp_tunnel *tunnel;
+        struct l2tp_tunnel *tunnel = l2tp_tunnel(sk);
         struct l2tp_net *pn;
 
-        tunnel = sk->sk_user_data;
         if (tunnel == NULL)
                 goto end;
 
@@ -1675,7 +1679,7 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32
         }
 
         /* Check if this socket has already been prepped */
-        tunnel = (struct l2tp_tunnel *)sk->sk_user_data;
+        tunnel = l2tp_tunnel(sk);
         if (tunnel != NULL) {
                 /* This socket has already been prepped */
                 err = -EBUSY;
@@ -1704,6 +1708,24 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32
         if (cfg != NULL)
                 tunnel->debug = cfg->debug;
 
+#if IS_ENABLED(CONFIG_IPV6)
+        if (sk->sk_family == PF_INET6) {
+                struct ipv6_pinfo *np = inet6_sk(sk);
+
+                if (ipv6_addr_v4mapped(&np->saddr) &&
+                    ipv6_addr_v4mapped(&np->daddr)) {
+                        struct inet_sock *inet = inet_sk(sk);
+
+                        tunnel->v4mapped = true;
+                        inet->inet_saddr = np->saddr.s6_addr32[3];
+                        inet->inet_rcv_saddr = np->rcv_saddr.s6_addr32[3];
+                        inet->inet_daddr = np->daddr.s6_addr32[3];
+                } else {
+                        tunnel->v4mapped = false;
+                }
+        }
+#endif
+
         /* Mark socket as an encapsulation socket. See net/ipv4/udp.c */
         tunnel->encap = encap;
         if (encap == L2TP_ENCAPTYPE_UDP) {
@@ -1712,7 +1734,7 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32
                 udp_sk(sk)->encap_rcv = l2tp_udp_encap_recv;
                 udp_sk(sk)->encap_destroy = l2tp_udp_encap_destroy;
 #if IS_ENABLED(CONFIG_IPV6)
-                if (sk->sk_family == PF_INET6)
+                if (sk->sk_family == PF_INET6 && !tunnel->v4mapped)
                         udpv6_encap_enable();
                 else
 #endif
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
index 66a559b104b6..6f251cbc2ed7 100644
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
@@ -194,6 +194,9 @@ struct l2tp_tunnel {
         struct sock             *sock;          /* Parent socket */
         int                     fd;             /* Parent fd, if tunnel socket
                                                  * was created by userspace */
+#if IS_ENABLED(CONFIG_IPV6)
+        bool                    v4mapped;
+#endif
 
         struct work_struct      del_work;
 
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 5ebee2ded9e9..8c46b271064a 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -353,7 +353,9 @@ static int pppol2tp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msgh
                 goto error_put_sess_tun;
         }
 
+        local_bh_disable();
         l2tp_xmit_skb(session, skb, session->hdr_len);
+        local_bh_enable();
 
         sock_put(ps->tunnel_sock);
         sock_put(sk);
@@ -422,7 +424,9 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
         skb->data[0] = ppph[0];
         skb->data[1] = ppph[1];
 
+        local_bh_disable();
         l2tp_xmit_skb(session, skb, session->hdr_len);
+        local_bh_enable();
 
         sock_put(sk_tun);
         sock_put(sk);
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 2e7855a1b10d..629dee7ec9bf 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3518,7 +3518,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
                 return -EINVAL;
         }
         band = chanctx_conf->def.chan->band;
-        sta = sta_info_get(sdata, peer);
+        sta = sta_info_get_bss(sdata, peer);
         if (sta) {
                 qos = test_sta_flag(sta, WLAN_STA_WME);
         } else {
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index b6186517ec56..611abfcfb5eb 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -893,6 +893,8 @@ struct tpt_led_trigger {
  *      that the scan completed.
  * @SCAN_ABORTED: Set for our scan work function when the driver reported
  *      a scan complete for an aborted scan.
+ * @SCAN_HW_CANCELLED: Set for our scan work function when the scan is being
+ *      cancelled.
  */
 enum {
         SCAN_SW_SCANNING,
@@ -900,6 +902,7 @@ enum {
         SCAN_ONCHANNEL_SCANNING,
         SCAN_COMPLETED,
         SCAN_ABORTED,
+        SCAN_HW_CANCELLED,
 };
 
 /**
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index acd1f71adc03..0c2a29484c07 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -394,6 +394,8 @@ void ieee80211_sw_roc_work(struct work_struct *work)
 
                 if (started)
                         ieee80211_start_next_roc(local);
+                else if (list_empty(&local->roc_list))
+                        ieee80211_run_deferred_scan(local);
         }
 
  out_unlock:
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 54395d7583ba..674eac1f996c 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3056,6 +3056,9 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx,
         case NL80211_IFTYPE_ADHOC:
                 if (!bssid)
                         return 0;
+                if (ether_addr_equal(sdata->vif.addr, hdr->addr2) ||
+                    ether_addr_equal(sdata->u.ibss.bssid, hdr->addr2))
+                        return 0;
                 if (ieee80211_is_beacon(hdr->frame_control)) {
                         return 1;
                 } else if (!ieee80211_bssid_match(bssid, sdata->u.ibss.bssid)) {
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 08afe74b98f4..d2d17a449224 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -238,6 +238,9 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local)
         enum ieee80211_band band;
         int i, ielen, n_chans;
 
+        if (test_bit(SCAN_HW_CANCELLED, &local->scanning))
+                return false;
+
         do {
                 if (local->hw_scan_band == IEEE80211_NUM_BANDS)
                         return false;
@@ -940,7 +943,23 @@ void ieee80211_scan_cancel(struct ieee80211_local *local)
         if (!local->scan_req)
                 goto out;
 
+        /*
+         * We have a scan running and the driver already reported completion,
+         * but the worker hasn't run yet or is stuck on the mutex - mark it as
+         * cancelled.
+         */
+        if (test_bit(SCAN_HW_SCANNING, &local->scanning) &&
+            test_bit(SCAN_COMPLETED, &local->scanning)) {
+                set_bit(SCAN_HW_CANCELLED, &local->scanning);
+                goto out;
+        }
+
         if (test_bit(SCAN_HW_SCANNING, &local->scanning)) {
+                /*
+                 * Make sure that __ieee80211_scan_completed doesn't trigger a
+                 * scan on another band.
+                 */
+                set_bit(SCAN_HW_CANCELLED, &local->scanning);
                 if (local->ops->cancel_hw_scan)
                         drv_cancel_hw_scan(local,
                                 rcu_dereference_protected(local->scan_sdata,
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 368837fe3b80..78dc2e99027e 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -180,6 +180,9 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb)
         struct ieee80211_local *local = sta->local;
         struct ieee80211_sub_if_data *sdata = sta->sdata;
 
+        if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
+                sta->last_rx = jiffies;
+
         if (ieee80211_is_data_qos(mgmt->frame_control)) {
                 struct ieee80211_hdr *hdr = (void *) skb->data;
                 u8 *qc = ieee80211_get_qos_ctl(hdr);
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 3456c0486b48..70b5a05c0a4e 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1120,7 +1120,8 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
                 tx->sta = rcu_dereference(sdata->u.vlan.sta);
                 if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
                         return TX_DROP;
-        } else if (info->flags & IEEE80211_TX_CTL_INJECTED ||
+        } else if (info->flags & (IEEE80211_TX_CTL_INJECTED |
+                                  IEEE80211_TX_INTFL_NL80211_FRAME_TX) ||
                    tx->sdata->control_port_protocol == tx->skb->protocol) {
                 tx->sta = sta_info_get_bss(sdata, hdr->addr1);
         }
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index e1b34a18b243..69e4ef5348a0 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -2103,7 +2103,7 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata,
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_supported_band *sband;
-        int rate, skip, shift;
+        int rate, shift;
         u8 i, exrates, *pos;
         u32 basic_rates = sdata->vif.bss_conf.basic_rates;
         u32 rate_flags;
@@ -2131,14 +2131,11 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata,
                 pos = skb_put(skb, exrates + 2);
                 *pos++ = WLAN_EID_EXT_SUPP_RATES;
                 *pos++ = exrates;
-                skip = 0;
                 for (i = 8; i < sband->n_bitrates; i++) {
                         u8 basic = 0;
                         if ((rate_flags & sband->bitrates[i].flags)
                             != rate_flags)
                                 continue;
-                        if (skip++ < 8)
-                                continue;
                         if (need_basic && basic_rates & BIT(i))
                                 basic = 0x80;
                         rate = DIV_ROUND_UP(sband->bitrates[i].bitrate,
@@ -2241,6 +2238,10 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
         }
 
         rate = cfg80211_calculate_bitrate(&ri);
+        if (WARN_ONCE(!rate,
+                      "Invalid bitrate: flags=0x%x, idx=%d, vht_nss=%d\n",
+                      status->flag, status->rate_idx, status->vht_nss))
+                return 0;
 
         /* rewind from end of MPDU */
         if (status->flag & RX_FLAG_MACTIME_END)
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index bdebd03bc8cd..70866d192efc 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -778,8 +778,8 @@ static int callforward_do_filter(const union nf_inet_addr *src,
                                    flowi6_to_flowi(&fl1), false)) {
                         if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,
                                            flowi6_to_flowi(&fl2), false)) {
-                                if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway,
-                                            sizeof(rt1->rt6i_gateway)) &&
+                                if (ipv6_addr_equal(rt6_nexthop(rt1),
+                                                    rt6_nexthop(rt2)) &&
                                     rt1->dst.dev == rt2->dst.dev)
                                         ret = 1;
                                 dst_release(&rt2->dst);
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index a2fef8b10b96..a9dfdda9ed1d 100644
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -472,20 +472,16 @@ begin:
         if (f->credit > 0 || !q->rate_enable)
                 goto out;
 
-        if (skb->sk && skb->sk->sk_state != TCP_TIME_WAIT) {
-                rate = skb->sk->sk_pacing_rate ?: q->flow_default_rate;
+        rate = q->flow_max_rate;
+        if (skb->sk && skb->sk->sk_state != TCP_TIME_WAIT)
+                rate = min(skb->sk->sk_pacing_rate, rate);
 
-                rate = min(rate, q->flow_max_rate);
-        } else {
-                rate = q->flow_max_rate;
-                if (rate == ~0U)
-                        goto out;
-        }
-        if (rate) {
+        if (rate != ~0U) {
                 u32 plen = max(qdisc_pkt_len(skb), q->quantum);
                 u64 len = (u64)plen * NSEC_PER_SEC;
 
-                do_div(len, rate);
+                if (likely(rate))
+                        do_div(len, rate);
                 /* Since socket rate can change later,
                  * clamp the delay to 125 ms.
                  * TODO: maybe segment the too big skb, as in commit
@@ -656,7 +652,7 @@ static int fq_change(struct Qdisc *sch, struct nlattr *opt)
                 q->quantum = nla_get_u32(tb[TCA_FQ_QUANTUM]);
 
         if (tb[TCA_FQ_INITIAL_QUANTUM])
-                q->quantum = nla_get_u32(tb[TCA_FQ_INITIAL_QUANTUM]);
+                q->initial_quantum = nla_get_u32(tb[TCA_FQ_INITIAL_QUANTUM]);
 
         if (tb[TCA_FQ_FLOW_DEFAULT_RATE])
                 q->flow_default_rate = nla_get_u32(tb[TCA_FQ_FLOW_DEFAULT_RATE]);
@@ -735,12 +731,14 @@ static int fq_dump(struct Qdisc *sch, struct sk_buff *skb)
         if (opts == NULL)
                 goto nla_put_failure;
 
+        /* TCA_FQ_FLOW_DEFAULT_RATE is not used anymore,
+         * do not bother giving its value
+         */
         if (nla_put_u32(skb, TCA_FQ_PLIMIT, sch->limit) ||
             nla_put_u32(skb, TCA_FQ_FLOW_PLIMIT, q->flow_plimit) ||
             nla_put_u32(skb, TCA_FQ_QUANTUM, q->quantum) ||
             nla_put_u32(skb, TCA_FQ_INITIAL_QUANTUM, q->initial_quantum) ||
             nla_put_u32(skb, TCA_FQ_RATE_ENABLE, q->rate_enable) ||
-            nla_put_u32(skb, TCA_FQ_FLOW_DEFAULT_RATE, q->flow_default_rate) ||
             nla_put_u32(skb, TCA_FQ_FLOW_MAX_RATE, q->flow_max_rate) ||
             nla_put_u32(skb, TCA_FQ_BUCKETS_LOG, q->fq_trees_log))
                 goto nla_put_failure;
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index a6d788d45216..b87e83d07478 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -358,6 +358,21 @@ static psched_time_t packet_len_2_sched_time(unsigned int len, struct netem_sche
         return PSCHED_NS2TICKS(ticks);
 }
 
+static void tfifo_reset(struct Qdisc *sch)
+{
+        struct netem_sched_data *q = qdisc_priv(sch);
+        struct rb_node *p;
+
+        while ((p = rb_first(&q->t_root))) {
+                struct sk_buff *skb = netem_rb_to_skb(p);
+
+                rb_erase(p, &q->t_root);
+                skb->next = NULL;
+                skb->prev = NULL;
+                kfree_skb(skb);
+        }
+}
+
 static void tfifo_enqueue(struct sk_buff *nskb, struct Qdisc *sch)
 {
         struct netem_sched_data *q = qdisc_priv(sch);
@@ -520,6 +535,7 @@ static unsigned int netem_drop(struct Qdisc *sch)
                         skb->next = NULL;
                         skb->prev = NULL;
                         len = qdisc_pkt_len(skb);
+                        sch->qstats.backlog -= len;
                         kfree_skb(skb);
                 }
         }
@@ -609,6 +625,7 @@ static void netem_reset(struct Qdisc *sch)
         struct netem_sched_data *q = qdisc_priv(sch);
 
         qdisc_reset_queue(sch);
+        tfifo_reset(sch);
         if (q->qdisc)
                 qdisc_reset(q->qdisc);
         qdisc_watchdog_cancel(&q->watchdog);
diff --git a/net/sctp/output.c b/net/sctp/output.c
index 0ac3a65daccb..319137340d15 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -536,7 +536,8 @@ int sctp_packet_transmit(struct sctp_packet *packet)
          * by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>.
          */
         if (!sctp_checksum_disable) {
-                if (!(dst->dev->features & NETIF_F_SCTP_CSUM)) {
+                if (!(dst->dev->features & NETIF_F_SCTP_CSUM) ||
+                    (dst_xfrm(dst) != NULL) || packet->ipfragok) {
                         __u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);
 
                         /* 3) Put the resultant value into the checksum field in the
diff --git a/net/socket.c b/net/socket.c
index ebed4b68f768..c226aceee65b 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1964,6 +1964,16 @@ struct used_address {
         unsigned int name_len;
 };
 
+static int copy_msghdr_from_user(struct msghdr *kmsg,
+                                 struct msghdr __user *umsg)
+{
+        if (copy_from_user(kmsg, umsg, sizeof(struct msghdr)))
+                return -EFAULT;
+        if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
+                return -EINVAL;
+        return 0;
+}
+
 static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
                          struct msghdr *msg_sys, unsigned int flags,
                          struct used_address *used_address)
@@ -1982,8 +1992,11 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
         if (MSG_CMSG_COMPAT & flags) {
                 if (get_compat_msghdr(msg_sys, msg_compat))
                         return -EFAULT;
-        } else if (copy_from_user(msg_sys, msg, sizeof(struct msghdr)))
-                return -EFAULT;
+        } else {
+                err = copy_msghdr_from_user(msg_sys, msg);
+                if (err)
+                        return err;
+        }
 
         if (msg_sys->msg_iovlen > UIO_FASTIOV) {
                 err = -EMSGSIZE;
@@ -2191,8 +2204,11 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
         if (MSG_CMSG_COMPAT & flags) {
                 if (get_compat_msghdr(msg_sys, msg_compat))
                         return -EFAULT;
-        } else if (copy_from_user(msg_sys, msg, sizeof(struct msghdr)))
-                return -EFAULT;
+        } else {
+                err = copy_msghdr_from_user(msg_sys, msg);
+                if (err)
+                        return err;
+        }
 
         if (msg_sys->msg_iovlen > UIO_FASTIOV) {
                 err = -EMSGSIZE;
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 86de99ad2976..c1f403bed683 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1246,6 +1246,15 @@ static int unix_socketpair(struct socket *socka, struct socket *sockb)
         return 0;
 }
 
+static void unix_sock_inherit_flags(const struct socket *old,
+                                    struct socket *new)
+{
+        if (test_bit(SOCK_PASSCRED, &old->flags))
+                set_bit(SOCK_PASSCRED, &new->flags);
+        if (test_bit(SOCK_PASSSEC, &old->flags))
+                set_bit(SOCK_PASSSEC, &new->flags);
+}
+
 static int unix_accept(struct socket *sock, struct socket *newsock, int flags)
 {
         struct sock *sk = sock->sk;
@@ -1280,6 +1289,7 @@ static int unix_accept(struct socket *sock, struct socket *newsock, int flags)
         /* attach accepted sock to socket */
         unix_state_lock(tsk);
         newsock->state = SS_CONNECTED;
+        unix_sock_inherit_flags(sock, newsock);
         sock_graft(tsk, newsock);
         unix_state_unlock(tsk);
         return 0;
diff --git a/net/unix/diag.c b/net/unix/diag.c
index d591091603bf..86fa0f3b2caf 100644
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -124,6 +124,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r
         rep->udiag_family = AF_UNIX;
         rep->udiag_type = sk->sk_type;
         rep->udiag_state = sk->sk_state;
+        rep->pad = 0;
         rep->udiag_ino = sk_ino;
         sock_diag_save_cookie(sk, rep->udiag_cookie);
 
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 67153964aad2..aff959e5a1b3 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -566,18 +566,13 @@ int wiphy_register(struct wiphy *wiphy)
         /* check and set up bitrates */
         ieee80211_set_bitrate_flags(wiphy);
 
-
+        rtnl_lock();
         res = device_add(&rdev->wiphy.dev);
-        if (res)
-                return res;
-
-        res = rfkill_register(rdev->rfkill);
         if (res) {
-                device_del(&rdev->wiphy.dev);
+                rtnl_unlock();
                 return res;
         }
 
-        rtnl_lock();
         /* set up regulatory info */
         wiphy_regulatory_register(wiphy);
 
@@ -606,6 +601,15 @@ int wiphy_register(struct wiphy *wiphy)
 
         rdev->wiphy.registered = true;
         rtnl_unlock();
+
+        res = rfkill_register(rdev->rfkill);
+        if (res) {
+                rfkill_destroy(rdev->rfkill);
+                rdev->rfkill = NULL;
+                wiphy_unregister(&rdev->wiphy);
+                return res;
+        }
+
         return 0;
 }
 EXPORT_SYMBOL(wiphy_register);
@@ -640,7 +644,8 @@ void wiphy_unregister(struct wiphy *wiphy)
                 rtnl_unlock();
                 __count == 0; }));
 
-        rfkill_unregister(rdev->rfkill);
+        if (rdev->rfkill)
+                rfkill_unregister(rdev->rfkill);
 
         rtnl_lock();
         rdev->wiphy.registered = false;
@@ -953,8 +958,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
         case NETDEV_PRE_UP:
                 if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype)))
                         return notifier_from_errno(-EOPNOTSUPP);
-                if (rfkill_blocked(rdev->rfkill))
-                        return notifier_from_errno(-ERFKILL);
                 ret = cfg80211_can_add_interface(rdev, wdev->iftype);
                 if (ret)
                         return notifier_from_errno(ret);
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 9ad43c619c54..3159e9c284c5 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -411,6 +411,9 @@ static inline int
 cfg80211_can_add_interface(struct cfg80211_registered_device *rdev,
                            enum nl80211_iftype iftype)
 {
+        if (rfkill_blocked(rdev->rfkill))
+                return -ERFKILL;
+
         return cfg80211_can_change_interface(rdev, NULL, iftype);
 }
 
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 39bff7d36768..403fe29c024d 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -263,6 +263,8 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
                                 if (chan->flags & IEEE80211_CHAN_DISABLED)
                                         continue;
                                 wdev->wext.ibss.chandef.chan = chan;
+                                wdev->wext.ibss.chandef.center_freq1 =
+                                        chan->center_freq;
                                 break;
                         }
 
@@ -347,6 +349,7 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
         if (chan) {
                 wdev->wext.ibss.chandef.chan = chan;
                 wdev->wext.ibss.chandef.width = NL80211_CHAN_WIDTH_20_NOHT;
+                wdev->wext.ibss.chandef.center_freq1 = freq;
                 wdev->wext.ibss.channel_fixed = true;
         } else {
                 /* cfg80211_ibss_wext_join will pick one if needed */
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index af8d84a4a5b2..626dc3b5fd8d 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2421,7 +2421,7 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
                 change = true;
         }
 
-        if (flags && (*flags & NL80211_MNTR_FLAG_ACTIVE) &&
+        if (flags && (*flags & MONITOR_FLAG_ACTIVE) &&
             !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))
                 return -EOPNOTSUPP;
 
@@ -2483,7 +2483,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
                                   info->attrs[NL80211_ATTR_MNTR_FLAGS] : NULL,
                                   &flags);
 
-        if (!err && (flags & NL80211_MNTR_FLAG_ACTIVE) &&
+        if (!err && (flags & MONITOR_FLAG_ACTIVE) &&
             !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))
                 return -EOPNOTSUPP;
 
diff --git a/net/wireless/radiotap.c b/net/wireless/radiotap.c
index 7d604c06c3dc..a271c27fac77 100644
--- a/net/wireless/radiotap.c
+++ b/net/wireless/radiotap.c
@@ -97,6 +97,10 @@ int ieee80211_radiotap_iterator_init(
         struct ieee80211_radiotap_header *radiotap_header,
         int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns)
 {
+        /* check the radiotap header can actually be present */
+        if (max_length < sizeof(struct ieee80211_radiotap_header))
+                return -EINVAL;
+
         /* Linux only supports version 0 radiotap format */
         if (radiotap_header->it_version)
                 return -EINVAL;
@@ -131,7 +135,8 @@ int ieee80211_radiotap_iterator_init(
                          */
 
                         if ((unsigned long)iterator->_arg -
-                            (unsigned long)iterator->_rtheader >
+                            (unsigned long)iterator->_rtheader +
+                            sizeof(uint32_t) >
                             (unsigned long)iterator->_max_length)
                                 return -EINVAL;
                 }
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index ed38d5d81f9e..76e1873811d4 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -334,7 +334,8 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
 
         atomic_inc(&policy->genid);
 
-        del_timer(&policy->polq.hold_timer);
+        if (del_timer(&policy->polq.hold_timer))
+                xfrm_pol_put(policy);
         xfrm_queue_purge(&policy->polq.hold_queue);
 
         if (del_timer(&policy->timer))
@@ -589,7 +590,8 @@ static void xfrm_policy_requeue(struct xfrm_policy *old,
 
         spin_lock_bh(&pq->hold_queue.lock);
         skb_queue_splice_init(&pq->hold_queue, &list);
-        del_timer(&pq->hold_timer);
+        if (del_timer(&pq->hold_timer))
+                xfrm_pol_put(old);
         spin_unlock_bh(&pq->hold_queue.lock);
 
         if (skb_queue_empty(&list))
@@ -600,7 +602,8 @@ static void xfrm_policy_requeue(struct xfrm_policy *old,
         spin_lock_bh(&pq->hold_queue.lock);
         skb_queue_splice(&list, &pq->hold_queue);
         pq->timeout = XFRM_QUEUE_TMO_MIN;
-        mod_timer(&pq->hold_timer, jiffies);
+        if (!mod_timer(&pq->hold_timer, jiffies))
+                xfrm_pol_hold(new);
         spin_unlock_bh(&pq->hold_queue.lock);
 }
 
@@ -1769,6 +1772,10 @@ static void xfrm_policy_queue_process(unsigned long arg)
 
         spin_lock(&pq->hold_queue.lock);
         skb = skb_peek(&pq->hold_queue);
+        if (!skb) {
+                spin_unlock(&pq->hold_queue.lock);
+                goto out;
+        }
         dst = skb_dst(skb);
         sk = skb->sk;
         xfrm_decode_session(skb, &fl, dst->ops->family);
@@ -1787,8 +1794,9 @@ static void xfrm_policy_queue_process(unsigned long arg)
                         goto purge_queue;
 
                 pq->timeout = pq->timeout << 1;
-                mod_timer(&pq->hold_timer, jiffies + pq->timeout);
-                return;
+                if (!mod_timer(&pq->hold_timer, jiffies + pq->timeout))
+                        xfrm_pol_hold(pol);
+        goto out;
         }
 
         dst_release(dst);
@@ -1819,11 +1827,14 @@ static void xfrm_policy_queue_process(unsigned long arg)
                 err = dst_output(skb);
         }
 
+out:
+        xfrm_pol_put(pol);
         return;
 
 purge_queue:
         pq->timeout = 0;
         xfrm_queue_purge(&pq->hold_queue);
+        xfrm_pol_put(pol);
 }
 
 static int xdst_queue_output(struct sk_buff *skb)
@@ -1831,7 +1842,8 @@ static int xdst_queue_output(struct sk_buff *skb)
         unsigned long sched_next;
         struct dst_entry *dst = skb_dst(skb);
         struct xfrm_dst *xdst = (struct xfrm_dst *) dst;
-        struct xfrm_policy_queue *pq = &xdst->pols[0]->polq;
+        struct xfrm_policy *pol = xdst->pols[0];
+        struct xfrm_policy_queue *pq = &pol->polq;
 
         if (pq->hold_queue.qlen > XFRM_MAX_QUEUE_LEN) {
                 kfree_skb(skb);
@@ -1850,10 +1862,12 @@ static int xdst_queue_output(struct sk_buff *skb)
         if (del_timer(&pq->hold_timer)) {
                 if (time_before(pq->hold_timer.expires, sched_next))
                         sched_next = pq->hold_timer.expires;
+                xfrm_pol_put(pol);
         }
 
         __skb_queue_tail(&pq->hold_queue, skb);
-        mod_timer(&pq->hold_timer, sched_next);
+        if (!mod_timer(&pq->hold_timer, sched_next))
+                xfrm_pol_hold(pol);
 
         spin_unlock_bh(&pq->hold_queue.lock);
 
diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
index 8dafe6d3c6e4..dab57daae408 100644
--- a/net/xfrm/xfrm_replay.c
+++ b/net/xfrm/xfrm_replay.c
@@ -61,9 +61,9 @@ static void xfrm_replay_notify(struct xfrm_state *x, int event)
 
         switch (event) {
         case XFRM_REPLAY_UPDATE:
-                if (x->replay_maxdiff &&
-                    (x->replay.seq - x->preplay.seq < x->replay_maxdiff) &&
-                    (x->replay.oseq - x->preplay.oseq < x->replay_maxdiff)) {
+                if (!x->replay_maxdiff ||
+                    ((x->replay.seq - x->preplay.seq < x->replay_maxdiff) &&
+                    (x->replay.oseq - x->preplay.oseq < x->replay_maxdiff))) {
                         if (x->xflags & XFRM_TIME_DEFER)
                                 event = XFRM_REPLAY_TIMEOUT;
                         else
@@ -129,8 +129,7 @@ static int xfrm_replay_check(struct xfrm_state *x,
                 return 0;
 
         diff = x->replay.seq - seq;
-        if (diff >= min_t(unsigned int, x->props.replay_window,
-                          sizeof(x->replay.bitmap) * 8)) {
+        if (diff >= x->props.replay_window) {
                 x->stats.replay_window++;
                 goto err;
         }
@@ -302,9 +301,10 @@ static void xfrm_replay_notify_bmp(struct xfrm_state *x, int event)
 
         switch (event) {
         case XFRM_REPLAY_UPDATE:
-                if (x->replay_maxdiff &&
-                    (replay_esn->seq - preplay_esn->seq < x->replay_maxdiff) &&
-                    (replay_esn->oseq - preplay_esn->oseq < x->replay_maxdiff)) {
+                if (!x->replay_maxdiff ||
+                    ((replay_esn->seq - preplay_esn->seq < x->replay_maxdiff) &&
+                    (replay_esn->oseq - preplay_esn->oseq
+                     < x->replay_maxdiff))) {
                         if (x->xflags & XFRM_TIME_DEFER)
                                 event = XFRM_REPLAY_TIMEOUT;
                         else
@@ -353,28 +353,30 @@ static void xfrm_replay_notify_esn(struct xfrm_state *x, int event)
 
         switch (event) {
         case XFRM_REPLAY_UPDATE:
-                if (!x->replay_maxdiff)
-                        break;
-
-                if (replay_esn->seq_hi == preplay_esn->seq_hi)
-                        seq_diff = replay_esn->seq - preplay_esn->seq;
-                else
-                        seq_diff = ~preplay_esn->seq + replay_esn->seq + 1;
-
-                if (replay_esn->oseq_hi == preplay_esn->oseq_hi)
-                        oseq_diff = replay_esn->oseq - preplay_esn->oseq;
-                else
-                        oseq_diff = ~preplay_esn->oseq + replay_esn->oseq + 1;
-
-                if (seq_diff < x->replay_maxdiff &&
-                    oseq_diff < x->replay_maxdiff) {
+                if (x->replay_maxdiff) {
+                        if (replay_esn->seq_hi == preplay_esn->seq_hi)
+                                seq_diff = replay_esn->seq - preplay_esn->seq;
+                        else
+                                seq_diff = ~preplay_esn->seq + replay_esn->seq
+                                           + 1;
 
-                        if (x->xflags & XFRM_TIME_DEFER)
-                                event = XFRM_REPLAY_TIMEOUT;
+                        if (replay_esn->oseq_hi == preplay_esn->oseq_hi)
+                                oseq_diff = replay_esn->oseq
+                                            - preplay_esn->oseq;
                         else
-                                return;
+                                oseq_diff = ~preplay_esn->oseq
+                                            + replay_esn->oseq + 1;
+
+                        if (seq_diff >= x->replay_maxdiff ||
+                            oseq_diff >= x->replay_maxdiff)
+                                break;
                 }
 
+                if (x->xflags & XFRM_TIME_DEFER)
+                        event = XFRM_REPLAY_TIMEOUT;
+                else
+                        return;
+
                 break;
 
         case XFRM_REPLAY_TIMEOUT:
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 3f565e495ac6..f964d4c00ffb 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -446,7 +446,8 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
         memcpy(&x->sel, &p->sel, sizeof(x->sel));
         memcpy(&x->lft, &p->lft, sizeof(x->lft));
         x->props.mode = p->mode;
-        x->props.replay_window = p->replay_window;
+        x->props.replay_window = min_t(unsigned int, p->replay_window,
+                                        sizeof(x->replay.bitmap) * 8);
         x->props.reqid = p->reqid;
         x->props.family = p->family;
         memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
@@ -1856,7 +1857,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
         if (x->km.state != XFRM_STATE_VALID)
                 goto out;
 
-        err = xfrm_replay_verify_len(x->replay_esn, rp);
+        err = xfrm_replay_verify_len(x->replay_esn, re);
         if (err)
                 goto out;
 
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 487ac6f37ca2..9a11f9f799f4 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -55,6 +55,7 @@ static struct sym_entry *table;
 static unsigned int table_size, table_cnt;
 static int all_symbols = 0;
 static char symbol_prefix_char = '\0';
+static unsigned long long kernel_start_addr = 0;
 
 int token_profit[0x10000];
 
@@ -65,7 +66,10 @@ unsigned char best_table_len[256];
 
 static void usage(void)
 {
-        fprintf(stderr, "Usage: kallsyms [--all-symbols] [--symbol-prefix=<prefix char>] < in.map > out.S\n");
+        fprintf(stderr, "Usage: kallsyms [--all-symbols] "
+                        "[--symbol-prefix=<prefix char>] "
+                        "[--page-offset=<CONFIG_PAGE_OFFSET>] "
+                        "< in.map > out.S\n");
         exit(1);
 }
 
@@ -194,6 +198,9 @@ static int symbol_valid(struct sym_entry *s)
         int i;
         int offset = 1;
 
+        if (s->addr < kernel_start_addr)
+                return 0;
+
         /* skip prefix char */
         if (symbol_prefix_char && *(s->sym + 1) == symbol_prefix_char)
                 offset++;
@@ -646,6 +653,9 @@ int main(int argc, char **argv)
                                 if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\''))
                                         p++;
                                 symbol_prefix_char = *p;
+                        } else if (strncmp(argv[i], "--page-offset=", 14) == 0) {
+                                const char *p = &argv[i][14];
+                                kernel_start_addr = strtoull(p, NULL, 16);
                         } else
                                 usage();
                 }
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 014994936b1c..32b10f53d0b4 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -82,6 +82,8 @@ kallsyms()
                 kallsymopt="${kallsymopt} --all-symbols"
         fi
 
+        kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
+
         local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
                       ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
 
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/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index e6f4633b8dd5..99a466822a7d 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -117,8 +117,7 @@ static inline void pxa_ac97_warm_pxa25x(void)
 {
         gsr_bits = 0;
 
-        GCR |= GCR_WARM_RST | GCR_PRIRDY_IEN | GCR_SECRDY_IEN;
-        wait_event_timeout(gsr_wq, gsr_bits & (GSR_PCR | GSR_SCR), 1);
+        GCR |= GCR_WARM_RST;
 }
 
 static inline void pxa_ac97_cold_pxa25x(void)
@@ -129,8 +128,6 @@ static inline void pxa_ac97_cold_pxa25x(void)
         gsr_bits = 0;
 
         GCR = GCR_COLD_RST;
-        GCR |= GCR_CDONE_IE|GCR_SDONE_IE;
-        wait_event_timeout(gsr_wq, gsr_bits & (GSR_PCR | GSR_SCR), 1);
 }
 #endif
 
@@ -149,8 +146,6 @@ static inline void pxa_ac97_warm_pxa27x(void)
 
 static inline void pxa_ac97_cold_pxa27x(void)
 {
-        unsigned int timeout;
-
         GCR &=  GCR_COLD_RST;  /* clear everything but nCRST */
         GCR &= ~GCR_COLD_RST;  /* then assert nCRST */
 
@@ -161,29 +156,20 @@ static inline void pxa_ac97_cold_pxa27x(void)
         udelay(5);
         clk_disable(ac97conf_clk);
         GCR = GCR_COLD_RST | GCR_WARM_RST;
-        timeout = 100;     /* wait for the codec-ready bit to be set */
-        while (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)) && timeout--)
-                mdelay(1);
 }
 #endif
 
 #ifdef CONFIG_PXA3xx
 static inline void pxa_ac97_warm_pxa3xx(void)
 {
-        int timeout = 100;
-
         gsr_bits = 0;
 
         /* Can't use interrupts */
         GCR |= GCR_WARM_RST;
-        while (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)) && timeout--)
-                mdelay(1);
 }
 
 static inline void pxa_ac97_cold_pxa3xx(void)
 {
-        int timeout = 1000;
-
         /* Hold CLKBPB for 100us */
         GCR = 0;
         GCR = GCR_CLKBPB;
@@ -199,14 +185,13 @@ static inline void pxa_ac97_cold_pxa3xx(void)
         GCR &= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN);
 
         GCR = GCR_WARM_RST | GCR_COLD_RST;
-        while (!(GSR & (GSR_PCR | GSR_SCR)) && timeout--)
-                mdelay(10);
 }
 #endif
 
 bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)
 {
         unsigned long gsr;
+        unsigned int timeout = 100;
 
 #ifdef CONFIG_PXA25x
         if (cpu_is_pxa25x())
@@ -224,6 +209,10 @@ bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)
         else
 #endif
                 BUG();
+
+        while (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)) && timeout--)
+                mdelay(1);
+
         gsr = GSR | gsr_bits;
         if (!(gsr & (GSR_PCR | GSR_SCR))) {
                 printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n",
@@ -239,6 +228,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_try_warm_reset);
 bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)
 {
         unsigned long gsr;
+        unsigned int timeout = 1000;
 
 #ifdef CONFIG_PXA25x
         if (cpu_is_pxa25x())
@@ -257,6 +247,9 @@ bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)
 #endif
                 BUG();
 
+        while (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)) && timeout--)
+                mdelay(1);
+
         gsr = GSR | gsr_bits;
         if (!(gsr & (GSR_PCR | GSR_SCR))) {
                 printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n",
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 17f45e8aa89c..e1e9e0c999fe 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -49,6 +49,8 @@ static struct snd_pcm *snd_pcm_get(struct snd_card *card, int device)
         struct snd_pcm *pcm;
 
         list_for_each_entry(pcm, &snd_pcm_devices, list) {
+                if (pcm->internal)
+                        continue;
                 if (pcm->card == card && pcm->device == device)
                         return pcm;
         }
@@ -60,6 +62,8 @@ static int snd_pcm_next(struct snd_card *card, int device)
         struct snd_pcm *pcm;
 
         list_for_each_entry(pcm, &snd_pcm_devices, list) {
+                if (pcm->internal)
+                        continue;
                 if (pcm->card == card && pcm->device > device)
                         return pcm->device;
                 else if (pcm->card->number > card->number)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 5b6c4e3c92ca..748c6a941963 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4864,8 +4864,8 @@ static void hda_power_work(struct work_struct *work)
         spin_unlock(&codec->power_lock);
 
         state = hda_call_codec_suspend(codec, true);
-        codec->pm_down_notified = 0;
-        if (!bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) {
+        if (!codec->pm_down_notified &&
+            !bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) {
                 codec->pm_down_notified = 1;
                 hda_call_pm_notify(bus, false);
         }
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index ac41e9cdc976..b7c89dff7066 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);
@@ -4475,9 +4475,11 @@ int snd_hda_gen_build_controls(struct hda_codec *codec)
                                             true, &spec->vmaster_mute.sw_kctl);
                 if (err < 0)
                         return err;
-                if (spec->vmaster_mute.hook)
+                if (spec->vmaster_mute.hook) {
                         snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute,
                                                  spec->vmaster_mute_enum);
+                        snd_hda_sync_vmaster_hook(&spec->vmaster_mute);
+                }
         }
 
         free_kctls(spec); /* no longer needed */
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 0cbdd87dde6d..2aa2f579b4d6 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -968,6 +968,15 @@ static void ad1884_fixup_hp_eapd(struct hda_codec *codec,
         }
 }
 
+static void ad1884_fixup_thinkpad(struct hda_codec *codec,
+                                  const struct hda_fixup *fix, int action)
+{
+        struct ad198x_spec *spec = codec->spec;
+
+        if (action == HDA_FIXUP_ACT_PRE_PROBE)
+                spec->gen.keep_eapd_on = 1;
+}
+
 /* set magic COEFs for dmic */
 static const struct hda_verb ad1884_dmic_init_verbs[] = {
         {0x01, AC_VERB_SET_COEF_INDEX, 0x13f7},
@@ -979,6 +988,7 @@ enum {
         AD1884_FIXUP_AMP_OVERRIDE,
         AD1884_FIXUP_HP_EAPD,
         AD1884_FIXUP_DMIC_COEF,
+        AD1884_FIXUP_THINKPAD,
         AD1884_FIXUP_HP_TOUCHSMART,
 };
 
@@ -997,6 +1007,12 @@ static const struct hda_fixup ad1884_fixups[] = {
                 .type = HDA_FIXUP_VERBS,
                 .v.verbs = ad1884_dmic_init_verbs,
         },
+        [AD1884_FIXUP_THINKPAD] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = ad1884_fixup_thinkpad,
+                .chained = true,
+                .chain_id = AD1884_FIXUP_DMIC_COEF,
+        },
         [AD1884_FIXUP_HP_TOUCHSMART] = {
                 .type = HDA_FIXUP_VERBS,
                 .v.verbs = ad1884_dmic_init_verbs,
@@ -1008,7 +1024,7 @@ static const struct hda_fixup ad1884_fixups[] = {
 static const struct snd_pci_quirk ad1884_fixup_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x2a82, "HP Touchsmart", AD1884_FIXUP_HP_TOUCHSMART),
         SND_PCI_QUIRK_VENDOR(0x103c, "HP", AD1884_FIXUP_HP_EAPD),
-        SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1884_FIXUP_DMIC_COEF),
+        SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1884_FIXUP_THINKPAD),
         {}
 };
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index bf313bea7085..8ad554312b69 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4623,6 +4623,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
         SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_ASUS_MODE4),
+        SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_ASUS_MODE4),
         SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
         SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),
         SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
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/soc/Makefile b/sound/soc/Makefile
index 61a64d281905..8b9e70105dd2 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,5 +1,5 @@
 snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
-snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o
+snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o
 
 ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)
 snd-soc-core-objs += soc-generic-dmaengine-pcm.o
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
index 3109db7b9017..612e5801003f 100644
--- a/sound/soc/atmel/atmel-pcm.c
+++ b/sound/soc/atmel/atmel-pcm.c
@@ -50,7 +50,7 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm,
         buf->area = dma_alloc_coherent(pcm->card->dev, size,
                         &buf->addr, GFP_KERNEL);
         pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu\n",
-                        (void *)buf->area, (void *)buf->addr, size);
+                        (void *)buf->area, (void *)(long)buf->addr, size);
 
         if (!buf->area)
                 return -ENOMEM;
diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c
index 7222380131ea..b4e36901a40b 100644
--- a/sound/soc/atmel/atmel_wm8904.c
+++ b/sound/soc/atmel/atmel_wm8904.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
 
 #include <sound/soc.h>
 
@@ -155,15 +154,8 @@ static int atmel_asoc_wm8904_probe(struct platform_device *pdev)
         struct snd_soc_card *card = &atmel_asoc_wm8904_card;
         struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink;
         struct clk *clk_src;
-        struct pinctrl *pinctrl;
         int id, ret;
 
-        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-        if (IS_ERR(pinctrl)) {
-                dev_err(&pdev->dev, "failed to request pinctrl\n");
-                return PTR_ERR(pinctrl);
-        }
-
         card->dev = &pdev->dev;
         ret = atmel_asoc_wm8904_dt_init(pdev);
         if (ret) {
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 802717eccbd0..f15bff1548f8 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -37,6 +37,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
+#include <linux/of.h>
 
 #include <linux/atmel-ssc.h>
 
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index 9a174fc47d39..39d774839b3e 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -121,6 +121,7 @@ static int bf5xx_i2s_hw_params(struct snd_pcm_substream *substream,
                 bf5xx_i2s->tcr2 |= 7;
                 bf5xx_i2s->rcr2 |= 7;
                 sport_handle->wdsize = 1;
+                break;
         case SNDRV_PCM_FORMAT_S16_LE:
                 bf5xx_i2s->tcr2 |= 15;
                 bf5xx_i2s->rcr2 |= 15;
diff --git a/sound/soc/cirrus/Kconfig b/sound/soc/cirrus/Kconfig
index 2c20f01e1f7e..06f938deda15 100644
--- a/sound/soc/cirrus/Kconfig
+++ b/sound/soc/cirrus/Kconfig
@@ -1,6 +1,6 @@
 config SND_EP93XX_SOC
         tristate "SoC Audio support for the Cirrus Logic EP93xx series"
-        depends on ARCH_EP93XX && SND_SOC
+        depends on (ARCH_EP93XX || COMPILE_TEST) && SND_SOC
         select SND_SOC_GENERIC_DMAENGINE_PCM
         help
           Say Y or M if you want to add support for codecs attached to
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index 259d1ac4492f..75d0ad5d2dcb 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -16,6 +16,7 @@
 #include <linux/mfd/88pm860x.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/regmap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -140,6 +141,7 @@ struct pm860x_priv {
         unsigned int            filter;
         struct snd_soc_codec    *codec;
         struct i2c_client       *i2c;
+        struct regmap           *regmap;
         struct pm860x_chip      *chip;
         struct pm860x_det       det;
 
@@ -269,48 +271,6 @@ static struct st_gain st_table[] = {
         {   -86, 29,  0}, {   -56, 30,  0}, {   -28, 31,  0}, {     0,  0,  0},
 };
 
-static int pm860x_volatile(unsigned int reg)
-{
-        BUG_ON(reg >= REG_CACHE_SIZE);
-
-        switch (reg) {
-        case PM860X_AUDIO_SUPPLIES_2:
-                return 1;
-        }
-
-        return 0;
-}
-
-static unsigned int pm860x_read_reg_cache(struct snd_soc_codec *codec,
-                                          unsigned int reg)
-{
-        unsigned char *cache = codec->reg_cache;
-
-        BUG_ON(reg >= REG_CACHE_SIZE);
-
-        if (pm860x_volatile(reg))
-                return cache[reg];
-
-        reg += REG_CACHE_BASE;
-
-        return pm860x_reg_read(codec->control_data, reg);
-}
-
-static int pm860x_write_reg_cache(struct snd_soc_codec *codec,
-                                  unsigned int reg, unsigned int value)
-{
-        unsigned char *cache = codec->reg_cache;
-
-        BUG_ON(reg >= REG_CACHE_SIZE);
-
-        if (!pm860x_volatile(reg))
-                cache[reg] = (unsigned char)value;
-
-        reg += REG_CACHE_BASE;
-
-        return pm860x_reg_write(codec->control_data, reg, value);
-}
-
 static int snd_soc_get_volsw_2r_st(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
@@ -1169,6 +1129,7 @@ static int pm860x_i2s_set_dai_fmt(struct snd_soc_dai *codec_dai,
 static int pm860x_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
+        struct pm860x_priv *pm860x = snd_soc_codec_get_drvdata(codec);
         int data;
 
         switch (level) {
@@ -1182,17 +1143,17 @@ static int pm860x_set_bias_level(struct snd_soc_codec *codec,
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Enable Audio PLL & Audio section */
                         data = AUDIO_PLL | AUDIO_SECTION_ON;
-                        pm860x_reg_write(codec->control_data, REG_MISC2, data);
+                        pm860x_reg_write(pm860x->i2c, REG_MISC2, data);
                         udelay(300);
                         data = AUDIO_PLL | AUDIO_SECTION_RESET
                                 | AUDIO_SECTION_ON;
-                        pm860x_reg_write(codec->control_data, REG_MISC2, data);
+                        pm860x_reg_write(pm860x->i2c, REG_MISC2, data);
                 }
                 break;
 
         case SND_SOC_BIAS_OFF:
                 data = AUDIO_PLL | AUDIO_SECTION_RESET | AUDIO_SECTION_ON;
-                pm860x_set_bits(codec->control_data, REG_MISC2, data, 0);
+                pm860x_set_bits(pm860x->i2c, REG_MISC2, data, 0);
                 break;
         }
         codec->dapm.bias_level = level;
@@ -1322,17 +1283,17 @@ int pm860x_hs_jack_detect(struct snd_soc_codec *codec,
         pm860x->det.lo_shrt = lo_shrt;
 
         if (det & SND_JACK_HEADPHONE)
-                pm860x_set_bits(codec->control_data, REG_HS_DET,
+                pm860x_set_bits(pm860x->i2c, REG_HS_DET,
                                 EN_HS_DET, EN_HS_DET);
         /* headset short detect */
         if (hs_shrt) {
                 data = CLR_SHORT_HS2 | CLR_SHORT_HS1;
-                pm860x_set_bits(codec->control_data, REG_SHORTS, data, data);
+                pm860x_set_bits(pm860x->i2c, REG_SHORTS, data, data);
         }
         /* Lineout short detect */
         if (lo_shrt) {
                 data = CLR_SHORT_LO2 | CLR_SHORT_LO1;
-                pm860x_set_bits(codec->control_data, REG_SHORTS, data, data);
+                pm860x_set_bits(pm860x->i2c, REG_SHORTS, data, data);
         }
 
         /* sync status */
@@ -1350,7 +1311,7 @@ int pm860x_mic_jack_detect(struct snd_soc_codec *codec,
         pm860x->det.mic_det = det;
 
         if (det & SND_JACK_MICROPHONE)
-                pm860x_set_bits(codec->control_data, REG_MIC_DET,
+                pm860x_set_bits(pm860x->i2c, REG_MIC_DET,
                                 MICDET_MASK, MICDET_MASK);
 
         /* sync status */
@@ -1366,7 +1327,7 @@ static int pm860x_probe(struct snd_soc_codec *codec)
 
         pm860x->codec = codec;
 
-        codec->control_data = pm860x->i2c;
+        codec->control_data = pm860x->regmap;
 
         for (i = 0; i < 4; i++) {
                 ret = request_threaded_irq(pm860x->irq[i], NULL,
@@ -1380,14 +1341,6 @@ static int pm860x_probe(struct snd_soc_codec *codec)
 
         pm860x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        ret = pm860x_bulk_read(codec->control_data, REG_CACHE_BASE,
-                               REG_CACHE_SIZE, codec->reg_cache);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to fill register cache: %d\n",
-                        ret);
-                goto out;
-        }
-
         return 0;
 
 out:
@@ -1410,10 +1363,6 @@ static int pm860x_remove(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver soc_codec_dev_pm860x = {
         .probe          = pm860x_probe,
         .remove         = pm860x_remove,
-        .read           = pm860x_read_reg_cache,
-        .write          = pm860x_write_reg_cache,
-        .reg_cache_size = REG_CACHE_SIZE,
-        .reg_word_size  = sizeof(u8),
         .set_bias_level = pm860x_set_bias_level,
 
         .controls = pm860x_snd_controls,
@@ -1439,6 +1388,8 @@ static int pm860x_codec_probe(struct platform_device *pdev)
         pm860x->chip = chip;
         pm860x->i2c = (chip->id == CHIP_PM8607) ? chip->client
                         : chip->companion;
+        pm860x->regmap = (chip->id == CHIP_PM8607) ? chip->regmap
+                        : chip->regmap_companion;
         platform_set_drvdata(pdev, pm860x);
 
         for (i = 0; i < 4; i++) {
diff --git a/sound/soc/codecs/88pm860x-codec.h b/sound/soc/codecs/88pm860x-codec.h
index 3364ba4a3607..f7282f4f4a79 100644
--- a/sound/soc/codecs/88pm860x-codec.h
+++ b/sound/soc/codecs/88pm860x-codec.h
@@ -12,67 +12,66 @@
 #ifndef __88PM860X_H
 #define __88PM860X_H
 
-/* The offset of these registers are 0xb0 */
-#define PM860X_PCM_IFACE_1              0x00
-#define PM860X_PCM_IFACE_2              0x01
-#define PM860X_PCM_IFACE_3              0x02
-#define PM860X_PCM_RATE                 0x03
-#define PM860X_EC_PATH                  0x04
-#define PM860X_SIDETONE_L_GAIN          0x05
-#define PM860X_SIDETONE_R_GAIN          0x06
-#define PM860X_SIDETONE_SHIFT           0x07
-#define PM860X_ADC_OFFSET_1             0x08
-#define PM860X_ADC_OFFSET_2             0x09
-#define PM860X_DMIC_DELAY               0x0a
+#define PM860X_PCM_IFACE_1              0xb0
+#define PM860X_PCM_IFACE_2              0xb1
+#define PM860X_PCM_IFACE_3              0xb2
+#define PM860X_PCM_RATE                 0xb3
+#define PM860X_EC_PATH                  0xb4
+#define PM860X_SIDETONE_L_GAIN          0xb5
+#define PM860X_SIDETONE_R_GAIN          0xb6
+#define PM860X_SIDETONE_SHIFT           0xb7
+#define PM860X_ADC_OFFSET_1             0xb8
+#define PM860X_ADC_OFFSET_2             0xb9
+#define PM860X_DMIC_DELAY               0xba
 
-#define PM860X_I2S_IFACE_1              0x0b
-#define PM860X_I2S_IFACE_2              0x0c
-#define PM860X_I2S_IFACE_3              0x0d
-#define PM860X_I2S_IFACE_4              0x0e
-#define PM860X_EQUALIZER_N0_1           0x0f
-#define PM860X_EQUALIZER_N0_2           0x10
-#define PM860X_EQUALIZER_N1_1           0x11
-#define PM860X_EQUALIZER_N1_2           0x12
-#define PM860X_EQUALIZER_D1_1           0x13
-#define PM860X_EQUALIZER_D1_2           0x14
-#define PM860X_LOFI_GAIN_LEFT           0x15
-#define PM860X_LOFI_GAIN_RIGHT          0x16
-#define PM860X_HIFIL_GAIN_LEFT          0x17
-#define PM860X_HIFIL_GAIN_RIGHT         0x18
-#define PM860X_HIFIR_GAIN_LEFT          0x19
-#define PM860X_HIFIR_GAIN_RIGHT         0x1a
-#define PM860X_DAC_OFFSET               0x1b
-#define PM860X_OFFSET_LEFT_1            0x1c
-#define PM860X_OFFSET_LEFT_2            0x1d
-#define PM860X_OFFSET_RIGHT_1           0x1e
-#define PM860X_OFFSET_RIGHT_2           0x1f
-#define PM860X_ADC_ANA_1                0x20
-#define PM860X_ADC_ANA_2                0x21
-#define PM860X_ADC_ANA_3                0x22
-#define PM860X_ADC_ANA_4                0x23
-#define PM860X_ANA_TO_ANA               0x24
-#define PM860X_HS1_CTRL                 0x25
-#define PM860X_HS2_CTRL                 0x26
-#define PM860X_LO1_CTRL                 0x27
-#define PM860X_LO2_CTRL                 0x28
-#define PM860X_EAR_CTRL_1               0x29
-#define PM860X_EAR_CTRL_2               0x2a
-#define PM860X_AUDIO_SUPPLIES_1         0x2b
-#define PM860X_AUDIO_SUPPLIES_2         0x2c
-#define PM860X_ADC_EN_1                 0x2d
-#define PM860X_ADC_EN_2                 0x2e
-#define PM860X_DAC_EN_1                 0x2f
-#define PM860X_DAC_EN_2                 0x31
-#define PM860X_AUDIO_CAL_1              0x32
-#define PM860X_AUDIO_CAL_2              0x33
-#define PM860X_AUDIO_CAL_3              0x34
-#define PM860X_AUDIO_CAL_4              0x35
-#define PM860X_AUDIO_CAL_5              0x36
-#define PM860X_ANA_INPUT_SEL_1          0x37
-#define PM860X_ANA_INPUT_SEL_2          0x38
+#define PM860X_I2S_IFACE_1              0xbb
+#define PM860X_I2S_IFACE_2              0xbc
+#define PM860X_I2S_IFACE_3              0xbd
+#define PM860X_I2S_IFACE_4              0xbe
+#define PM860X_EQUALIZER_N0_1           0xbf
+#define PM860X_EQUALIZER_N0_2           0xc0
+#define PM860X_EQUALIZER_N1_1           0xc1
+#define PM860X_EQUALIZER_N1_2           0xc2
+#define PM860X_EQUALIZER_D1_1           0xc3
+#define PM860X_EQUALIZER_D1_2           0xc4
+#define PM860X_LOFI_GAIN_LEFT           0xc5
+#define PM860X_LOFI_GAIN_RIGHT          0xc6
+#define PM860X_HIFIL_GAIN_LEFT          0xc7
+#define PM860X_HIFIL_GAIN_RIGHT         0xc8
+#define PM860X_HIFIR_GAIN_LEFT          0xc9
+#define PM860X_HIFIR_GAIN_RIGHT         0xca
+#define PM860X_DAC_OFFSET               0xcb
+#define PM860X_OFFSET_LEFT_1            0xcc
+#define PM860X_OFFSET_LEFT_2            0xcd
+#define PM860X_OFFSET_RIGHT_1           0xce
+#define PM860X_OFFSET_RIGHT_2           0xcf
+#define PM860X_ADC_ANA_1                0xd0
+#define PM860X_ADC_ANA_2                0xd1
+#define PM860X_ADC_ANA_3                0xd2
+#define PM860X_ADC_ANA_4                0xd3
+#define PM860X_ANA_TO_ANA               0xd4
+#define PM860X_HS1_CTRL                 0xd5
+#define PM860X_HS2_CTRL                 0xd6
+#define PM860X_LO1_CTRL                 0xd7
+#define PM860X_LO2_CTRL                 0xd8
+#define PM860X_EAR_CTRL_1               0xd9
+#define PM860X_EAR_CTRL_2               0xda
+#define PM860X_AUDIO_SUPPLIES_1         0xdb
+#define PM860X_AUDIO_SUPPLIES_2         0xdc
+#define PM860X_ADC_EN_1                 0xdd
+#define PM860X_ADC_EN_2                 0xde
+#define PM860X_DAC_EN_1                 0xdf
+#define PM860X_DAC_EN_2                 0xe1
+#define PM860X_AUDIO_CAL_1              0xe2
+#define PM860X_AUDIO_CAL_2              0xe3
+#define PM860X_AUDIO_CAL_3              0xe4
+#define PM860X_AUDIO_CAL_4              0xe5
+#define PM860X_AUDIO_CAL_5              0xe6
+#define PM860X_ANA_INPUT_SEL_1          0xe7
+#define PM860X_ANA_INPUT_SEL_2          0xe8
 
-#define PM860X_PCM_IFACE_4              0x39
-#define PM860X_I2S_IFACE_5              0x3a
+#define PM860X_PCM_IFACE_4              0xe9
+#define PM860X_I2S_IFACE_5              0xea
 
 #define PM860X_SHORTS                   0x3b
 #define PM860X_PLL_ADJ_1                0x3c
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 80555d7551e6..a0394a8f2257 100644
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -126,6 +126,8 @@ struct ab8500_codec_drvdata_dbg {
 
 /* Private data for AB8500 device-driver */
 struct ab8500_codec_drvdata {
+        struct regmap *regmap;
+
         /* Sidetone */
         long *sid_fir_values;
         enum sid_state sid_status;
@@ -166,49 +168,35 @@ static inline const char *amic_type_str(enum amic_type type)
  */
 
 /* Read a register from the audio-bank of AB8500 */
-static unsigned int ab8500_codec_read_reg(struct snd_soc_codec *codec,
-                                        unsigned int reg)
+static int ab8500_codec_read_reg(void *context, unsigned int reg,
+                                 unsigned int *value)
 {
+        struct device *dev = context;
         int status;
-        unsigned int value = 0;
 
         u8 value8;
-        status = abx500_get_register_interruptible(codec->dev, AB8500_AUDIO,
-                                                reg, &value8);
-        if (status < 0) {
-                dev_err(codec->dev,
-                        "%s: ERROR: Register (0x%02x:0x%02x) read failed (%d).\n",
-                        __func__, (u8)AB8500_AUDIO, (u8)reg, status);
-        } else {
-                dev_dbg(codec->dev,
-                        "%s: Read 0x%02x from register 0x%02x:0x%02x\n",
-                        __func__, value8, (u8)AB8500_AUDIO, (u8)reg);
-                value = (unsigned int)value8;
-        }
+        status = abx500_get_register_interruptible(dev, AB8500_AUDIO,
+                                                   reg, &value8);
+        *value = (unsigned int)value8;
 
-        return value;
+        return status;
 }
 
 /* Write to a register in the audio-bank of AB8500 */
-static int ab8500_codec_write_reg(struct snd_soc_codec *codec,
-                                unsigned int reg, unsigned int value)
+static int ab8500_codec_write_reg(void *context, unsigned int reg,
+                                  unsigned int value)
 {
-        int status;
-
-        status = abx500_set_register_interruptible(codec->dev, AB8500_AUDIO,
-                                                reg, value);
-        if (status < 0)
-                dev_err(codec->dev,
-                        "%s: ERROR: Register (%02x:%02x) write failed (%d).\n",
-                        __func__, (u8)AB8500_AUDIO, (u8)reg, status);
-        else
-                dev_dbg(codec->dev,
-                        "%s: Wrote 0x%02x into register %02x:%02x\n",
-                        __func__, (u8)value, (u8)AB8500_AUDIO, (u8)reg);
+        struct device *dev = context;
 
-        return status;
+        return abx500_set_register_interruptible(dev, AB8500_AUDIO,
+                                                 reg, value);
 }
 
+static const struct regmap_config ab8500_codec_regmap = {
+        .reg_read = ab8500_codec_read_reg,
+        .reg_write = ab8500_codec_write_reg,
+};
+
 /*
  * Controls - DAPM
  */
@@ -2485,9 +2473,13 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
 
         dev_dbg(dev, "%s: Enter.\n", __func__);
 
+        snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
+
         /* Setup AB8500 according to board-settings */
         pdata = dev_get_platdata(dev->parent);
 
+        codec->control_data = drvdata->regmap;
+
         if (np) {
                 if (!pdata)
                         pdata = devm_kzalloc(dev,
@@ -2532,12 +2524,10 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
         }
 
         /* Override HW-defaults */
-        ab8500_codec_write_reg(codec,
-                                AB8500_ANACONF5,
-                                BIT(AB8500_ANACONF5_HSAUTOEN));
-        ab8500_codec_write_reg(codec,
-                                AB8500_SHORTCIRCONF,
-                                BIT(AB8500_SHORTCIRCONF_HSZCDDIS));
+        snd_soc_write(codec, AB8500_ANACONF5,
+                      BIT(AB8500_ANACONF5_HSAUTOEN));
+        snd_soc_write(codec, AB8500_SHORTCIRCONF,
+                      BIT(AB8500_SHORTCIRCONF_HSZCDDIS));
 
         /* Add filter controls */
         status = snd_soc_add_codec_controls(codec, ab8500_filter_controls,
@@ -2567,9 +2557,6 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver ab8500_codec_driver = {
         .probe =                ab8500_codec_probe,
-        .read =                 ab8500_codec_read_reg,
-        .write =                ab8500_codec_write_reg,
-        .reg_word_size =        sizeof(u8),
         .controls =             ab8500_ctrls,
         .num_controls =         ARRAY_SIZE(ab8500_ctrls),
         .dapm_widgets =         ab8500_dapm_widgets,
@@ -2592,6 +2579,15 @@ static int ab8500_codec_driver_probe(struct platform_device *pdev)
         drvdata->anc_status = ANC_UNCONFIGURED;
         dev_set_drvdata(&pdev->dev, drvdata);
 
+        drvdata->regmap = devm_regmap_init(&pdev->dev, NULL, &pdev->dev,
+                                           &ab8500_codec_regmap);
+        if (IS_ERR(drvdata->regmap)) {
+                status = PTR_ERR(drvdata->regmap);
+                dev_err(&pdev->dev, "%s: Failed to allocate regmap: %d\n",
+                        __func__, status);
+                return status;
+        }
+
         dev_dbg(&pdev->dev, "%s: Register codec.\n", __func__);
         status = snd_soc_register_codec(&pdev->dev, &ab8500_codec_driver,
                                 ab8500_codec_dai,
@@ -2606,7 +2602,7 @@ static int ab8500_codec_driver_probe(struct platform_device *pdev)
 
 static int ab8500_codec_driver_remove(struct platform_device *pdev)
 {
-        dev_info(&pdev->dev, "%s Enter.\n", __func__);
+        dev_dbg(&pdev->dev, "%s Enter.\n", __func__);
 
         snd_soc_unregister_codec(&pdev->dev);
 
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c
index 1aa10ddf3a61..59654b1e7f3f 100644
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
@@ -32,6 +32,7 @@ struct adau1373_dai {
 };
 
 struct adau1373 {
+        struct regmap *regmap;
         struct adau1373_dai dais[3];
 };
 
@@ -73,7 +74,6 @@ struct adau1373 {
 #define ADAU1373_PLL_CTRL4(x)   (0x2c + (x) * 7)
 #define ADAU1373_PLL_CTRL5(x)   (0x2d + (x) * 7)
 #define ADAU1373_PLL_CTRL6(x)   (0x2e + (x) * 7)
-#define ADAU1373_PLL_CTRL7(x)   (0x2f + (x) * 7)
 #define ADAU1373_HEADDECT       0x36
 #define ADAU1373_ADC_DAC_STATUS 0x37
 #define ADAU1373_ADC_CTRL       0x3c
@@ -152,37 +152,172 @@ struct adau1373 {
 #define ADAU1373_EP_CTRL_MICBIAS1_OFFSET 4
 #define ADAU1373_EP_CTRL_MICBIAS2_OFFSET 2
 
-static const uint8_t adau1373_default_regs[] = {
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x30 */
-        0x00, 0x00, 0x00, 0x80, 0x00, 0x01, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x0a, 0x0a, 0x0a, 0x00, /* 0x40 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, /* 0x50 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x78, 0x18, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, /* 0x80 */
-        0x00, 0xc0, 0x88, 0x7a, 0xdf, 0x20, 0x00, 0x00,
-        0x78, 0x18, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, /* 0x90 */
-        0x00, 0xc0, 0x88, 0x7a, 0xdf, 0x20, 0x00, 0x00,
-        0x78, 0x18, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, /* 0xa0 */
-        0x00, 0xc0, 0x88, 0x7a, 0xdf, 0x20, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0xb0 */
-        0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc0 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd0 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, /* 0xe0 */
-        0x00, 0x1f, 0x0f, 0x00, 0x00,
+static const struct reg_default adau1373_reg_defaults[] = {
+        { ADAU1373_INPUT_MODE,          0x00 },
+        { ADAU1373_AINL_CTRL(0),        0x00 },
+        { ADAU1373_AINR_CTRL(0),        0x00 },
+        { ADAU1373_AINL_CTRL(1),        0x00 },
+        { ADAU1373_AINR_CTRL(1),        0x00 },
+        { ADAU1373_AINL_CTRL(2),        0x00 },
+        { ADAU1373_AINR_CTRL(2),        0x00 },
+        { ADAU1373_AINL_CTRL(3),        0x00 },
+        { ADAU1373_AINR_CTRL(3),        0x00 },
+        { ADAU1373_LLINE_OUT(0),        0x00 },
+        { ADAU1373_RLINE_OUT(0),        0x00 },
+        { ADAU1373_LLINE_OUT(1),        0x00 },
+        { ADAU1373_RLINE_OUT(1),        0x00 },
+        { ADAU1373_LSPK_OUT,            0x00 },
+        { ADAU1373_RSPK_OUT,            0x00 },
+        { ADAU1373_LHP_OUT,             0x00 },
+        { ADAU1373_RHP_OUT,             0x00 },
+        { ADAU1373_ADC_GAIN,            0x00 },
+        { ADAU1373_LADC_MIXER,          0x00 },
+        { ADAU1373_RADC_MIXER,          0x00 },
+        { ADAU1373_LLINE1_MIX,          0x00 },
+        { ADAU1373_RLINE1_MIX,          0x00 },
+        { ADAU1373_LLINE2_MIX,          0x00 },
+        { ADAU1373_RLINE2_MIX,          0x00 },
+        { ADAU1373_LSPK_MIX,            0x00 },
+        { ADAU1373_RSPK_MIX,            0x00 },
+        { ADAU1373_LHP_MIX,             0x00 },
+        { ADAU1373_RHP_MIX,             0x00 },
+        { ADAU1373_EP_MIX,              0x00 },
+        { ADAU1373_HP_CTRL,             0x00 },
+        { ADAU1373_HP_CTRL2,            0x00 },
+        { ADAU1373_LS_CTRL,             0x00 },
+        { ADAU1373_EP_CTRL,             0x00 },
+        { ADAU1373_MICBIAS_CTRL1,       0x00 },
+        { ADAU1373_MICBIAS_CTRL2,       0x00 },
+        { ADAU1373_OUTPUT_CTRL,         0x00 },
+        { ADAU1373_PWDN_CTRL1,          0x00 },
+        { ADAU1373_PWDN_CTRL2,          0x00 },
+        { ADAU1373_PWDN_CTRL3,          0x00 },
+        { ADAU1373_DPLL_CTRL(0),        0x00 },
+        { ADAU1373_PLL_CTRL1(0),        0x00 },
+        { ADAU1373_PLL_CTRL2(0),        0x00 },
+        { ADAU1373_PLL_CTRL3(0),        0x00 },
+        { ADAU1373_PLL_CTRL4(0),        0x00 },
+        { ADAU1373_PLL_CTRL5(0),        0x00 },
+        { ADAU1373_PLL_CTRL6(0),        0x02 },
+        { ADAU1373_DPLL_CTRL(1),        0x00 },
+        { ADAU1373_PLL_CTRL1(1),        0x00 },
+        { ADAU1373_PLL_CTRL2(1),        0x00 },
+        { ADAU1373_PLL_CTRL3(1),        0x00 },
+        { ADAU1373_PLL_CTRL4(1),        0x00 },
+        { ADAU1373_PLL_CTRL5(1),        0x00 },
+        { ADAU1373_PLL_CTRL6(1),        0x02 },
+        { ADAU1373_HEADDECT,            0x00 },
+        { ADAU1373_ADC_CTRL,            0x00 },
+        { ADAU1373_CLK_SRC_DIV(0),      0x00 },
+        { ADAU1373_CLK_SRC_DIV(1),      0x00 },
+        { ADAU1373_DAI(0),              0x0a },
+        { ADAU1373_DAI(1),              0x0a },
+        { ADAU1373_DAI(2),              0x0a },
+        { ADAU1373_BCLKDIV(0),          0x00 },
+        { ADAU1373_BCLKDIV(1),          0x00 },
+        { ADAU1373_BCLKDIV(2),          0x00 },
+        { ADAU1373_SRC_RATIOA(0),       0x00 },
+        { ADAU1373_SRC_RATIOB(0),       0x00 },
+        { ADAU1373_SRC_RATIOA(1),       0x00 },
+        { ADAU1373_SRC_RATIOB(1),       0x00 },
+        { ADAU1373_SRC_RATIOA(2),       0x00 },
+        { ADAU1373_SRC_RATIOB(2),       0x00 },
+        { ADAU1373_DEEMP_CTRL,          0x00 },
+        { ADAU1373_SRC_DAI_CTRL(0),     0x08 },
+        { ADAU1373_SRC_DAI_CTRL(1),     0x08 },
+        { ADAU1373_SRC_DAI_CTRL(2),     0x08 },
+        { ADAU1373_DIN_MIX_CTRL(0),     0x00 },
+        { ADAU1373_DIN_MIX_CTRL(1),     0x00 },
+        { ADAU1373_DIN_MIX_CTRL(2),     0x00 },
+        { ADAU1373_DIN_MIX_CTRL(3),     0x00 },
+        { ADAU1373_DIN_MIX_CTRL(4),     0x00 },
+        { ADAU1373_DOUT_MIX_CTRL(0),    0x00 },
+        { ADAU1373_DOUT_MIX_CTRL(1),    0x00 },
+        { ADAU1373_DOUT_MIX_CTRL(2),    0x00 },
+        { ADAU1373_DOUT_MIX_CTRL(3),    0x00 },
+        { ADAU1373_DOUT_MIX_CTRL(4),    0x00 },
+        { ADAU1373_DAI_PBL_VOL(0),      0x00 },
+        { ADAU1373_DAI_PBR_VOL(0),      0x00 },
+        { ADAU1373_DAI_PBL_VOL(1),      0x00 },
+        { ADAU1373_DAI_PBR_VOL(1),      0x00 },
+        { ADAU1373_DAI_PBL_VOL(2),      0x00 },
+        { ADAU1373_DAI_PBR_VOL(2),      0x00 },
+        { ADAU1373_DAI_RECL_VOL(0),     0x00 },
+        { ADAU1373_DAI_RECR_VOL(0),     0x00 },
+        { ADAU1373_DAI_RECL_VOL(1),     0x00 },
+        { ADAU1373_DAI_RECR_VOL(1),     0x00 },
+        { ADAU1373_DAI_RECL_VOL(2),     0x00 },
+        { ADAU1373_DAI_RECR_VOL(2),     0x00 },
+        { ADAU1373_DAC1_PBL_VOL,        0x00 },
+        { ADAU1373_DAC1_PBR_VOL,        0x00 },
+        { ADAU1373_DAC2_PBL_VOL,        0x00 },
+        { ADAU1373_DAC2_PBR_VOL,        0x00 },
+        { ADAU1373_ADC_RECL_VOL,        0x00 },
+        { ADAU1373_ADC_RECR_VOL,        0x00 },
+        { ADAU1373_DMIC_RECL_VOL,       0x00 },
+        { ADAU1373_DMIC_RECR_VOL,       0x00 },
+        { ADAU1373_VOL_GAIN1,           0x00 },
+        { ADAU1373_VOL_GAIN2,           0x00 },
+        { ADAU1373_VOL_GAIN3,           0x00 },
+        { ADAU1373_HPF_CTRL,            0x00 },
+        { ADAU1373_BASS1,               0x00 },
+        { ADAU1373_BASS2,               0x00 },
+        { ADAU1373_DRC(0) + 0x0,        0x78 },
+        { ADAU1373_DRC(0) + 0x1,        0x18 },
+        { ADAU1373_DRC(0) + 0x2,        0x00 },
+        { ADAU1373_DRC(0) + 0x3,        0x00 },
+        { ADAU1373_DRC(0) + 0x4,        0x00 },
+        { ADAU1373_DRC(0) + 0x5,        0xc0 },
+        { ADAU1373_DRC(0) + 0x6,        0x00 },
+        { ADAU1373_DRC(0) + 0x7,        0x00 },
+        { ADAU1373_DRC(0) + 0x8,        0x00 },
+        { ADAU1373_DRC(0) + 0x9,        0xc0 },
+        { ADAU1373_DRC(0) + 0xa,        0x88 },
+        { ADAU1373_DRC(0) + 0xb,        0x7a },
+        { ADAU1373_DRC(0) + 0xc,        0xdf },
+        { ADAU1373_DRC(0) + 0xd,        0x20 },
+        { ADAU1373_DRC(0) + 0xe,        0x00 },
+        { ADAU1373_DRC(0) + 0xf,        0x00 },
+        { ADAU1373_DRC(1) + 0x0,        0x78 },
+        { ADAU1373_DRC(1) + 0x1,        0x18 },
+        { ADAU1373_DRC(1) + 0x2,        0x00 },
+        { ADAU1373_DRC(1) + 0x3,        0x00 },
+        { ADAU1373_DRC(1) + 0x4,        0x00 },
+        { ADAU1373_DRC(1) + 0x5,        0xc0 },
+        { ADAU1373_DRC(1) + 0x6,        0x00 },
+        { ADAU1373_DRC(1) + 0x7,        0x00 },
+        { ADAU1373_DRC(1) + 0x8,        0x00 },
+        { ADAU1373_DRC(1) + 0x9,        0xc0 },
+        { ADAU1373_DRC(1) + 0xa,        0x88 },
+        { ADAU1373_DRC(1) + 0xb,        0x7a },
+        { ADAU1373_DRC(1) + 0xc,        0xdf },
+        { ADAU1373_DRC(1) + 0xd,        0x20 },
+        { ADAU1373_DRC(1) + 0xe,        0x00 },
+        { ADAU1373_DRC(1) + 0xf,        0x00 },
+        { ADAU1373_DRC(2) + 0x0,        0x78 },
+        { ADAU1373_DRC(2) + 0x1,        0x18 },
+        { ADAU1373_DRC(2) + 0x2,        0x00 },
+        { ADAU1373_DRC(2) + 0x3,        0x00 },
+        { ADAU1373_DRC(2) + 0x4,        0x00 },
+        { ADAU1373_DRC(2) + 0x5,        0xc0 },
+        { ADAU1373_DRC(2) + 0x6,        0x00 },
+        { ADAU1373_DRC(2) + 0x7,        0x00 },
+        { ADAU1373_DRC(2) + 0x8,        0x00 },
+        { ADAU1373_DRC(2) + 0x9,        0xc0 },
+        { ADAU1373_DRC(2) + 0xa,        0x88 },
+        { ADAU1373_DRC(2) + 0xb,        0x7a },
+        { ADAU1373_DRC(2) + 0xc,        0xdf },
+        { ADAU1373_DRC(2) + 0xd,        0x20 },
+        { ADAU1373_DRC(2) + 0xe,        0x00 },
+        { ADAU1373_DRC(2) + 0xf,        0x00 },
+        { ADAU1373_3D_CTRL1,            0x00 },
+        { ADAU1373_3D_CTRL2,            0x00 },
+        { ADAU1373_FDSP_SEL1,           0x00 },
+        { ADAU1373_FDSP_SEL2,           0x00 },
+        { ADAU1373_FDSP_SEL2,           0x00 },
+        { ADAU1373_FDSP_SEL4,           0x00 },
+        { ADAU1373_DIGMICCTRL,          0x00 },
+        { ADAU1373_DIGEN,               0x00 },
 };
 
 static const unsigned int adau1373_out_tlv[] = {
@@ -418,6 +553,7 @@ static int adau1373_pll_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
         struct snd_soc_codec *codec = w->codec;
+        struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);
         unsigned int pll_id = w->name[3] - '1';
         unsigned int val;
 
@@ -426,7 +562,7 @@ static int adau1373_pll_event(struct snd_soc_dapm_widget *w,
         else
                 val = 0;
 
-        snd_soc_update_bits(codec, ADAU1373_PLL_CTRL6(pll_id),
+        regmap_update_bits(adau1373->regmap, ADAU1373_PLL_CTRL6(pll_id),
                 ADAU1373_PLL_CTRL6_PLL_EN, val);
 
         if (SND_SOC_DAPM_EVENT_ON(event))
@@ -938,7 +1074,7 @@ static int adau1373_hw_params(struct snd_pcm_substream *substream,
 
         adau1373_dai->enable_src = (div != 0);
 
-        snd_soc_update_bits(codec, ADAU1373_BCLKDIV(dai->id),
+        regmap_update_bits(adau1373->regmap, ADAU1373_BCLKDIV(dai->id),
                 ADAU1373_BCLKDIV_SR_MASK | ADAU1373_BCLKDIV_BCLK_MASK,
                 (div << 2) | ADAU1373_BCLKDIV_64);
 
@@ -959,7 +1095,7 @@ static int adau1373_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        return snd_soc_update_bits(codec, ADAU1373_DAI(dai->id),
+        return regmap_update_bits(adau1373->regmap, ADAU1373_DAI(dai->id),
                         ADAU1373_DAI_WLEN_MASK, ctrl);
 }
 
@@ -1016,7 +1152,7 @@ static int adau1373_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                 return -EINVAL;
         }
 
-        snd_soc_update_bits(codec, ADAU1373_DAI(dai->id),
+        regmap_update_bits(adau1373->regmap, ADAU1373_DAI(dai->id),
                 ~ADAU1373_DAI_WLEN_MASK, ctrl);
 
         return 0;
@@ -1039,7 +1175,7 @@ static int adau1373_set_dai_sysclk(struct snd_soc_dai *dai,
         adau1373_dai->sysclk = freq;
         adau1373_dai->clk_src = clk_id;
 
-        snd_soc_update_bits(dai->codec, ADAU1373_BCLKDIV(dai->id),
+        regmap_update_bits(adau1373->regmap, ADAU1373_BCLKDIV(dai->id),
                 ADAU1373_BCLKDIV_SOURCE, clk_id << 5);
 
         return 0;
@@ -1120,6 +1256,7 @@ static struct snd_soc_dai_driver adau1373_dai_driver[] = {
 static int adau1373_set_pll(struct snd_soc_codec *codec, int pll_id,
         int source, unsigned int freq_in, unsigned int freq_out)
 {
+        struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);
         unsigned int dpll_div = 0;
         unsigned int x, r, n, m, i, j, mode;
 
@@ -1187,36 +1324,36 @@ static int adau1373_set_pll(struct snd_soc_codec *codec, int pll_id,
 
         if (dpll_div) {
                 dpll_div = 11 - dpll_div;
-                snd_soc_update_bits(codec, ADAU1373_PLL_CTRL6(pll_id),
+                regmap_update_bits(adau1373->regmap, ADAU1373_PLL_CTRL6(pll_id),
                         ADAU1373_PLL_CTRL6_DPLL_BYPASS, 0);
         } else {
-                snd_soc_update_bits(codec, ADAU1373_PLL_CTRL6(pll_id),
+                regmap_update_bits(adau1373->regmap, ADAU1373_PLL_CTRL6(pll_id),
                         ADAU1373_PLL_CTRL6_DPLL_BYPASS,
                         ADAU1373_PLL_CTRL6_DPLL_BYPASS);
         }
 
-        snd_soc_write(codec, ADAU1373_DPLL_CTRL(pll_id),
+        regmap_write(adau1373->regmap, ADAU1373_DPLL_CTRL(pll_id),
                 (source << 4) | dpll_div);
-        snd_soc_write(codec, ADAU1373_PLL_CTRL1(pll_id), (m >> 8) & 0xff);
-        snd_soc_write(codec, ADAU1373_PLL_CTRL2(pll_id), m & 0xff);
-        snd_soc_write(codec, ADAU1373_PLL_CTRL3(pll_id), (n >> 8) & 0xff);
-        snd_soc_write(codec, ADAU1373_PLL_CTRL4(pll_id), n & 0xff);
-        snd_soc_write(codec, ADAU1373_PLL_CTRL5(pll_id),
+        regmap_write(adau1373->regmap, ADAU1373_PLL_CTRL1(pll_id), (m >> 8) & 0xff);
+        regmap_write(adau1373->regmap, ADAU1373_PLL_CTRL2(pll_id), m & 0xff);
+        regmap_write(adau1373->regmap, ADAU1373_PLL_CTRL3(pll_id), (n >> 8) & 0xff);
+        regmap_write(adau1373->regmap, ADAU1373_PLL_CTRL4(pll_id), n & 0xff);
+        regmap_write(adau1373->regmap, ADAU1373_PLL_CTRL5(pll_id),
                 (r << 3) | (x << 1) | mode);
 
         /* Set sysclk to pll_rate / 4 */
-        snd_soc_update_bits(codec, ADAU1373_CLK_SRC_DIV(pll_id), 0x3f, 0x09);
+        regmap_update_bits(adau1373->regmap, ADAU1373_CLK_SRC_DIV(pll_id), 0x3f, 0x09);
 
         return 0;
 }
 
-static void adau1373_load_drc_settings(struct snd_soc_codec *codec,
+static void adau1373_load_drc_settings(struct adau1373 *adau1373,
         unsigned int nr, uint8_t *drc)
 {
         unsigned int i;
 
         for (i = 0; i < ADAU1373_DRC_SIZE; ++i)
-                snd_soc_write(codec, ADAU1373_DRC(nr) + i, drc[i]);
+                regmap_write(adau1373->regmap, ADAU1373_DRC(nr) + i, drc[i]);
 }
 
 static bool adau1373_valid_micbias(enum adau1373_micbias_voltage micbias)
@@ -1235,13 +1372,14 @@ static bool adau1373_valid_micbias(enum adau1373_micbias_voltage micbias)
 
 static int adau1373_probe(struct snd_soc_codec *codec)
 {
+        struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);
         struct adau1373_platform_data *pdata = codec->dev->platform_data;
         bool lineout_differential = false;
         unsigned int val;
         int ret;
         int i;
 
-        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
+        ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
         if (ret) {
                 dev_err(codec->dev, "failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -1256,7 +1394,7 @@ static int adau1373_probe(struct snd_soc_codec *codec)
                         return -EINVAL;
 
                 for (i = 0; i < pdata->num_drc; ++i) {
-                        adau1373_load_drc_settings(codec, i,
+                        adau1373_load_drc_settings(adau1373, i,
                                 pdata->drc_setting[i]);
                 }
 
@@ -1268,18 +1406,18 @@ static int adau1373_probe(struct snd_soc_codec *codec)
                         if (pdata->input_differential[i])
                                 val |= BIT(i);
                 }
-                snd_soc_write(codec, ADAU1373_INPUT_MODE, val);
+                regmap_write(adau1373->regmap, ADAU1373_INPUT_MODE, val);
 
                 val = 0;
                 if (pdata->lineout_differential)
                         val |= ADAU1373_OUTPUT_CTRL_LDIFF;
                 if (pdata->lineout_ground_sense)
                         val |= ADAU1373_OUTPUT_CTRL_LNFBEN;
-                snd_soc_write(codec, ADAU1373_OUTPUT_CTRL, val);
+                regmap_write(adau1373->regmap, ADAU1373_OUTPUT_CTRL, val);
 
                 lineout_differential = pdata->lineout_differential;
 
-                snd_soc_write(codec, ADAU1373_EP_CTRL,
+                regmap_write(adau1373->regmap, ADAU1373_EP_CTRL,
                         (pdata->micbias1 << ADAU1373_EP_CTRL_MICBIAS1_OFFSET) |
                         (pdata->micbias2 << ADAU1373_EP_CTRL_MICBIAS2_OFFSET));
         }
@@ -1289,7 +1427,7 @@ static int adau1373_probe(struct snd_soc_codec *codec)
                         ARRAY_SIZE(adau1373_lineout2_controls));
         }
 
-        snd_soc_write(codec, ADAU1373_ADC_CTRL,
+        regmap_write(adau1373->regmap, ADAU1373_ADC_CTRL,
             ADAU1373_ADC_CTRL_RESET_FORCE | ADAU1373_ADC_CTRL_PEAK_DETECT);
 
         return 0;
@@ -1298,17 +1436,19 @@ static int adau1373_probe(struct snd_soc_codec *codec)
 static int adau1373_set_bias_level(struct snd_soc_codec *codec,
         enum snd_soc_bias_level level)
 {
+        struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);
+
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
-                snd_soc_update_bits(codec, ADAU1373_PWDN_CTRL3,
+                regmap_update_bits(adau1373->regmap, ADAU1373_PWDN_CTRL3,
                         ADAU1373_PWDN_CTRL3_PWR_EN, ADAU1373_PWDN_CTRL3_PWR_EN);
                 break;
         case SND_SOC_BIAS_OFF:
-                snd_soc_update_bits(codec, ADAU1373_PWDN_CTRL3,
+                regmap_update_bits(adau1373->regmap, ADAU1373_PWDN_CTRL3,
                         ADAU1373_PWDN_CTRL3_PWR_EN, 0);
                 break;
         }
@@ -1324,17 +1464,49 @@ static int adau1373_remove(struct snd_soc_codec *codec)
 
 static int adau1373_suspend(struct snd_soc_codec *codec)
 {
-        return adau1373_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        ret = adau1373_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        regcache_cache_only(adau1373->regmap, true);
+
+        return ret;
 }
 
 static int adau1373_resume(struct snd_soc_codec *codec)
 {
+        struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);
+
+        regcache_cache_only(adau1373->regmap, false);
         adau1373_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-        snd_soc_cache_sync(codec);
+        regcache_sync(adau1373->regmap);
 
         return 0;
 }
 
+static bool adau1373_register_volatile(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case ADAU1373_SOFT_RESET:
+        case ADAU1373_ADC_DAC_STATUS:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static const struct regmap_config adau1373_regmap_config = {
+        .val_bits = 8,
+        .reg_bits = 8,
+
+        .volatile_reg = adau1373_register_volatile,
+        .max_register = ADAU1373_SOFT_RESET,
+
+        .cache_type = REGCACHE_RBTREE,
+        .reg_defaults = adau1373_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(adau1373_reg_defaults),
+};
+
 static struct snd_soc_codec_driver adau1373_codec_driver = {
         .probe =        adau1373_probe,
         .remove =       adau1373_remove,
@@ -1342,9 +1514,6 @@ static struct snd_soc_codec_driver adau1373_codec_driver = {
         .resume =       adau1373_resume,
         .set_bias_level = adau1373_set_bias_level,
         .idle_bias_off = true,
-        .reg_cache_size = ARRAY_SIZE(adau1373_default_regs),
-        .reg_cache_default = adau1373_default_regs,
-        .reg_word_size = sizeof(uint8_t),
 
         .set_pll = adau1373_set_pll,
 
@@ -1366,6 +1535,13 @@ static int adau1373_i2c_probe(struct i2c_client *client,
         if (!adau1373)
                 return -ENOMEM;
 
+        adau1373->regmap = devm_regmap_init_i2c(client,
+                &adau1373_regmap_config);
+        if (IS_ERR(adau1373->regmap))
+                return PTR_ERR(adau1373->regmap);
+
+        regmap_write(adau1373->regmap, ADAU1373_SOFT_RESET, 0x00);
+
         dev_set_drvdata(&client->dev, adau1373);
 
         ret = snd_soc_register_codec(&client->dev, &adau1373_codec_driver,
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
index 15b012d0f226..14a7c169d004 100644
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -115,22 +115,34 @@
 
 #define ADAV80X_PLL_OUTE_SYSCLKPD(x)            BIT(2 - (x))
 
-static u8 adav80x_default_regs[] = {
-        0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x01, 0x80, 0x26, 0x00, 0x00,
-        0x02, 0x40, 0x20, 0x00, 0x09, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd1, 0x92, 0xb1, 0x37,
-        0x48, 0xd2, 0xfb, 0xca, 0xd2, 0x15, 0xe8, 0x29, 0xb9, 0x6a, 0xda, 0x2b,
-        0xb7, 0xc0, 0x11, 0x65, 0x5c, 0xf6, 0xff, 0x8d, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x00, 0x00,
-        0x00, 0xe8, 0x46, 0xe1, 0x5b, 0xd3, 0x43, 0x77, 0x93, 0xa7, 0x44, 0xee,
-        0x32, 0x12, 0xc0, 0x11, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3f, 0x3f,
-        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x52, 0x00,
+static struct reg_default adav80x_reg_defaults[] = {
+        { ADAV80X_PLAYBACK_CTRL,        0x01 },
+        { ADAV80X_AUX_IN_CTRL,          0x01 },
+        { ADAV80X_REC_CTRL,             0x02 },
+        { ADAV80X_AUX_OUT_CTRL,         0x01 },
+        { ADAV80X_DPATH_CTRL1,          0xc0 },
+        { ADAV80X_DPATH_CTRL2,          0x11 },
+        { ADAV80X_DAC_CTRL1,            0x00 },
+        { ADAV80X_DAC_CTRL2,            0x00 },
+        { ADAV80X_DAC_CTRL3,            0x00 },
+        { ADAV80X_DAC_L_VOL,            0xff },
+        { ADAV80X_DAC_R_VOL,            0xff },
+        { ADAV80X_PGA_L_VOL,            0x00 },
+        { ADAV80X_PGA_R_VOL,            0x00 },
+        { ADAV80X_ADC_CTRL1,            0x00 },
+        { ADAV80X_ADC_CTRL2,            0x00 },
+        { ADAV80X_ADC_L_VOL,            0xff },
+        { ADAV80X_ADC_R_VOL,            0xff },
+        { ADAV80X_PLL_CTRL1,            0x00 },
+        { ADAV80X_PLL_CTRL2,            0x00 },
+        { ADAV80X_ICLK_CTRL1,           0x00 },
+        { ADAV80X_ICLK_CTRL2,           0x00 },
+        { ADAV80X_PLL_CLK_SRC,          0x00 },
+        { ADAV80X_PLL_OUTE,             0x00 },
 };
 
 struct adav80x {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
 
         enum adav80x_clk_src clk_src;
         unsigned int sysclk;
@@ -298,7 +310,7 @@ static int adav80x_set_deemph(struct snd_soc_codec *codec)
                 val = ADAV80X_DAC_CTRL2_DEEMPH_NONE;
         }
 
-        return snd_soc_update_bits(codec, ADAV80X_DAC_CTRL2,
+        return regmap_update_bits(adav80x->regmap, ADAV80X_DAC_CTRL2,
                 ADAV80X_DAC_CTRL2_DEEMPH_MASK, val);
 }
 
@@ -394,10 +406,11 @@ static int adav80x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                 return -EINVAL;
         }
 
-        snd_soc_update_bits(codec, adav80x_port_ctrl_regs[dai->id][0],
+        regmap_update_bits(adav80x->regmap, adav80x_port_ctrl_regs[dai->id][0],
                 ADAV80X_CAPTURE_MODE_MASK | ADAV80X_CAPTURE_MODE_MASTER,
                 capture);
-        snd_soc_write(codec, adav80x_port_ctrl_regs[dai->id][1], playback);
+        regmap_write(adav80x->regmap, adav80x_port_ctrl_regs[dai->id][1],
+                playback);
 
         adav80x->dai_fmt[dai->id] = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
 
@@ -407,6 +420,7 @@ static int adav80x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 static int adav80x_set_adc_clock(struct snd_soc_codec *codec,
                 unsigned int sample_rate)
 {
+        struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
         unsigned int val;
 
         if (sample_rate <= 48000)
@@ -414,7 +428,7 @@ static int adav80x_set_adc_clock(struct snd_soc_codec *codec,
         else
                 val = ADAV80X_ADC_CTRL1_MODULATOR_64FS;
 
-        snd_soc_update_bits(codec, ADAV80X_ADC_CTRL1,
+        regmap_update_bits(adav80x->regmap, ADAV80X_ADC_CTRL1,
                 ADAV80X_ADC_CTRL1_MODULATOR_MASK, val);
 
         return 0;
@@ -423,6 +437,7 @@ static int adav80x_set_adc_clock(struct snd_soc_codec *codec,
 static int adav80x_set_dac_clock(struct snd_soc_codec *codec,
                 unsigned int sample_rate)
 {
+        struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
         unsigned int val;
 
         if (sample_rate <= 48000)
@@ -430,7 +445,7 @@ static int adav80x_set_dac_clock(struct snd_soc_codec *codec,
         else
                 val = ADAV80X_DAC_CTRL2_DIV2 | ADAV80X_DAC_CTRL2_INTERPOL_128FS;
 
-        snd_soc_update_bits(codec, ADAV80X_DAC_CTRL2,
+        regmap_update_bits(adav80x->regmap, ADAV80X_DAC_CTRL2,
                 ADAV80X_DAC_CTRL2_DIV_MASK | ADAV80X_DAC_CTRL2_INTERPOL_MASK,
                 val);
 
@@ -440,6 +455,7 @@ static int adav80x_set_dac_clock(struct snd_soc_codec *codec,
 static int adav80x_set_capture_pcm_format(struct snd_soc_codec *codec,
                 struct snd_soc_dai *dai, snd_pcm_format_t format)
 {
+        struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
         unsigned int val;
 
         switch (format) {
@@ -459,7 +475,7 @@ static int adav80x_set_capture_pcm_format(struct snd_soc_codec *codec,
                 return -EINVAL;
         }
 
-        snd_soc_update_bits(codec, adav80x_port_ctrl_regs[dai->id][0],
+        regmap_update_bits(adav80x->regmap, adav80x_port_ctrl_regs[dai->id][0],
                 ADAV80X_CAPTURE_WORD_LEN_MASK, val);
 
         return 0;
@@ -491,7 +507,7 @@ static int adav80x_set_playback_pcm_format(struct snd_soc_codec *codec,
                 return -EINVAL;
         }
 
-        snd_soc_update_bits(codec, adav80x_port_ctrl_regs[dai->id][1],
+        regmap_update_bits(adav80x->regmap, adav80x_port_ctrl_regs[dai->id][1],
                 ADAV80X_PLAYBACK_MODE_MASK, val);
 
         return 0;
@@ -554,8 +570,10 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec,
                                         ADAV80X_ICLK_CTRL1_ICLK2_SRC(clk_id);
                         iclk_ctrl2 = ADAV80X_ICLK_CTRL2_ICLK1_SRC(clk_id);
 
-                        snd_soc_write(codec, ADAV80X_ICLK_CTRL1, iclk_ctrl1);
-                        snd_soc_write(codec, ADAV80X_ICLK_CTRL2, iclk_ctrl2);
+                        regmap_write(adav80x->regmap, ADAV80X_ICLK_CTRL1,
+                                iclk_ctrl1);
+                        regmap_write(adav80x->regmap, ADAV80X_ICLK_CTRL2,
+                                iclk_ctrl2);
 
                         snd_soc_dapm_sync(&codec->dapm);
                 }
@@ -575,10 +593,12 @@ static int adav80x_set_sysclk(struct snd_soc_codec *codec,
                 mask = ADAV80X_PLL_OUTE_SYSCLKPD(clk_id);
 
                 if (freq == 0) {
-                        snd_soc_update_bits(codec, ADAV80X_PLL_OUTE, mask, mask);
+                        regmap_update_bits(adav80x->regmap, ADAV80X_PLL_OUTE,
+                                mask, mask);
                         adav80x->sysclk_pd[clk_id] = true;
                 } else {
-                        snd_soc_update_bits(codec, ADAV80X_PLL_OUTE, mask, 0);
+                        regmap_update_bits(adav80x->regmap, ADAV80X_PLL_OUTE,
+                                mask, 0);
                         adav80x->sysclk_pd[clk_id] = false;
                 }
 
@@ -650,9 +670,9 @@ static int adav80x_set_pll(struct snd_soc_codec *codec, int pll_id,
                 return -EINVAL;
         }
 
-        snd_soc_update_bits(codec, ADAV80X_PLL_CTRL1, ADAV80X_PLL_CTRL1_PLLDIV,
-                pll_ctrl1);
-        snd_soc_update_bits(codec, ADAV80X_PLL_CTRL2,
+        regmap_update_bits(adav80x->regmap, ADAV80X_PLL_CTRL1,
+                        ADAV80X_PLL_CTRL1_PLLDIV, pll_ctrl1);
+        regmap_update_bits(adav80x->regmap, ADAV80X_PLL_CTRL2,
                         ADAV80X_PLL_CTRL2_PLL_MASK(pll_id), pll_ctrl2);
 
         if (source != adav80x->pll_src) {
@@ -661,7 +681,7 @@ static int adav80x_set_pll(struct snd_soc_codec *codec, int pll_id,
                 else
                         pll_src = ADAV80X_PLL_CLK_SRC_PLL_XIN(pll_id);
 
-                snd_soc_update_bits(codec, ADAV80X_PLL_CLK_SRC,
+                regmap_update_bits(adav80x->regmap, ADAV80X_PLL_CLK_SRC,
                                 ADAV80X_PLL_CLK_SRC_PLL_MASK(pll_id), pll_src);
 
                 adav80x->pll_src = source;
@@ -675,6 +695,7 @@ static int adav80x_set_pll(struct snd_soc_codec *codec, int pll_id,
 static int adav80x_set_bias_level(struct snd_soc_codec *codec,
                 enum snd_soc_bias_level level)
 {
+        struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
         unsigned int mask = ADAV80X_DAC_CTRL1_PD;
 
         switch (level) {
@@ -683,10 +704,12 @@ static int adav80x_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
-                snd_soc_update_bits(codec, ADAV80X_DAC_CTRL1, mask, 0x00);
+                regmap_update_bits(adav80x->regmap, ADAV80X_DAC_CTRL1, mask,
+                        0x00);
                 break;
         case SND_SOC_BIAS_OFF:
-                snd_soc_update_bits(codec, ADAV80X_DAC_CTRL1, mask, mask);
+                regmap_update_bits(adav80x->regmap, ADAV80X_DAC_CTRL1, mask,
+                        mask);
                 break;
         }
 
@@ -780,7 +803,7 @@ static int adav80x_probe(struct snd_soc_codec *codec)
         int ret;
         struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, adav80x->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
         if (ret) {
                 dev_err(codec->dev, "failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -791,23 +814,31 @@ static int adav80x_probe(struct snd_soc_codec *codec)
         snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL2");
 
         /* Power down S/PDIF receiver, since it is currently not supported */
-        snd_soc_write(codec, ADAV80X_PLL_OUTE, 0x20);
+        regmap_write(adav80x->regmap, ADAV80X_PLL_OUTE, 0x20);
         /* Disable DAC zero flag */
-        snd_soc_write(codec, ADAV80X_DAC_CTRL3, 0x6);
+        regmap_write(adav80x->regmap, ADAV80X_DAC_CTRL3, 0x6);
 
         return adav80x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 }
 
 static int adav80x_suspend(struct snd_soc_codec *codec)
 {
-        return adav80x_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        ret = adav80x_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        regcache_cache_only(adav80x->regmap, true);
+
+        return ret;
 }
 
 static int adav80x_resume(struct snd_soc_codec *codec)
 {
+        struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
+
+        regcache_cache_only(adav80x->regmap, false);
         adav80x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-        codec->cache_sync = 1;
-        snd_soc_cache_sync(codec);
+        regcache_sync(adav80x->regmap);
 
         return 0;
 }
@@ -827,10 +858,6 @@ static struct snd_soc_codec_driver adav80x_codec_driver = {
         .set_pll = adav80x_set_pll,
         .set_sysclk = adav80x_set_sysclk,
 
-        .reg_word_size = sizeof(u8),
-        .reg_cache_size = ARRAY_SIZE(adav80x_default_regs),
-        .reg_cache_default = adav80x_default_regs,
-
         .controls = adav80x_controls,
         .num_controls = ARRAY_SIZE(adav80x_controls),
         .dapm_widgets = adav80x_dapm_widgets,
@@ -839,18 +866,21 @@ static struct snd_soc_codec_driver adav80x_codec_driver = {
         .num_dapm_routes = ARRAY_SIZE(adav80x_dapm_routes),
 };
 
-static int adav80x_bus_probe(struct device *dev,
-                             enum snd_soc_control_type control_type)
+static int adav80x_bus_probe(struct device *dev, struct regmap *regmap)
 {
         struct adav80x *adav80x;
         int ret;
 
+        if (IS_ERR(regmap))
+                return PTR_ERR(regmap);
+
         adav80x = kzalloc(sizeof(*adav80x), GFP_KERNEL);
         if (!adav80x)
                 return -ENOMEM;
 
+
         dev_set_drvdata(dev, adav80x);
-        adav80x->control_type = control_type;
+        adav80x->regmap = regmap;
 
         ret = snd_soc_register_codec(dev, &adav80x_codec_driver,
                 adav80x_dais, ARRAY_SIZE(adav80x_dais));
@@ -868,6 +898,19 @@ static int adav80x_bus_remove(struct device *dev)
 }
 
 #if defined(CONFIG_SPI_MASTER)
+static const struct regmap_config adav80x_spi_regmap_config = {
+        .val_bits = 8,
+        .pad_bits = 1,
+        .reg_bits = 7,
+        .read_flag_mask = 0x01,
+
+        .max_register = ADAV80X_PLL_OUTE,
+
+        .cache_type = REGCACHE_RBTREE,
+        .reg_defaults = adav80x_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(adav80x_reg_defaults),
+};
+
 static const struct spi_device_id adav80x_spi_id[] = {
         { "adav801", 0 },
         { }
@@ -876,7 +919,8 @@ MODULE_DEVICE_TABLE(spi, adav80x_spi_id);
 
 static int adav80x_spi_probe(struct spi_device *spi)
 {
-        return adav80x_bus_probe(&spi->dev, SND_SOC_SPI);
+        return adav80x_bus_probe(&spi->dev,
+                devm_regmap_init_spi(spi, &adav80x_spi_regmap_config));
 }
 
 static int adav80x_spi_remove(struct spi_device *spi)
@@ -896,6 +940,18 @@ static struct spi_driver adav80x_spi_driver = {
 #endif
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+static const struct regmap_config adav80x_i2c_regmap_config = {
+        .val_bits = 8,
+        .pad_bits = 1,
+        .reg_bits = 7,
+
+        .max_register = ADAV80X_PLL_OUTE,
+
+        .cache_type = REGCACHE_RBTREE,
+        .reg_defaults = adav80x_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(adav80x_reg_defaults),
+};
+
 static const struct i2c_device_id adav80x_i2c_id[] = {
         { "adav803", 0 },
         { }
@@ -905,7 +961,8 @@ MODULE_DEVICE_TABLE(i2c, adav80x_i2c_id);
 static int adav80x_i2c_probe(struct i2c_client *client,
                              const struct i2c_device_id *id)
 {
-        return adav80x_bus_probe(&client->dev, SND_SOC_I2C);
+        return adav80x_bus_probe(&client->dev,
+                devm_regmap_init_i2c(client, &adav80x_i2c_regmap_config));
 }
 
 static int adav80x_i2c_remove(struct i2c_client *client)
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c
index 71059c07ae7b..b4819dcd4f4d 100644
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
@@ -45,8 +45,6 @@
 #define AK4104_TX_TXE                   (1 << 0)
 #define AK4104_TX_V                     (1 << 1)
 
-#define DRV_NAME "ak4104-codec"
-
 struct ak4104_private {
         struct regmap *regmap;
 };
@@ -291,12 +289,19 @@ static const struct of_device_id ak4104_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ak4104_of_match);
 
+static const struct spi_device_id ak4104_id_table[] = {
+        { "ak4104", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(spi, ak4104_id_table);
+
 static struct spi_driver ak4104_spi_driver = {
         .driver  = {
-                .name   = DRV_NAME,
+                .name   = "ak4104",
                 .owner  = THIS_MODULE,
                 .of_match_table = ak4104_of_match,
         },
+        .id_table = ak4104_id_table,
         .probe  = ak4104_spi_probe,
         .remove = ak4104_spi_remove,
 };
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 2d0378709702..21c35ed778cc 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -352,7 +352,6 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
          */
         default:
                 return -EINVAL;
-                break;
         }
         snd_soc_update_bits(codec, MD_CTL1, DIF_MASK, data);
 
@@ -405,7 +404,6 @@ static int ak4642_dai_hw_params(struct snd_pcm_substream *substream,
                 break;
         default:
                 return -EINVAL;
-                break;
         }
         snd_soc_update_bits(codec, MD_CTL2, FS_MASK, rate);
 
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 657808ba1418..6f05b17d1965 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1477,21 +1477,25 @@ static void arizona_enable_fll(struct arizona_fll *fll,
 {
         struct arizona *arizona = fll->arizona;
         int ret;
+        bool use_sync = false;
 
         /*
          * If we have both REFCLK and SYNCCLK then enable both,
          * otherwise apply the SYNCCLK settings to REFCLK.
          */
-        if (fll->ref_src >= 0 && fll->ref_src != fll->sync_src) {
+        if (fll->ref_src >= 0 && fll->ref_freq &&
+            fll->ref_src != fll->sync_src) {
                 regmap_update_bits(arizona->regmap, fll->base + 5,
                                    ARIZONA_FLL1_OUTDIV_MASK,
                                    ref->outdiv << ARIZONA_FLL1_OUTDIV_SHIFT);
 
                 arizona_apply_fll(arizona, fll->base, ref, fll->ref_src,
                                   false);
-                if (fll->sync_src >= 0)
+                if (fll->sync_src >= 0) {
                         arizona_apply_fll(arizona, fll->base + 0x10, sync,
                                           fll->sync_src, true);
+                        use_sync = true;
+                }
         } else if (fll->sync_src >= 0) {
                 regmap_update_bits(arizona->regmap, fll->base + 5,
                                    ARIZONA_FLL1_OUTDIV_MASK,
@@ -1511,7 +1515,7 @@ static void arizona_enable_fll(struct arizona_fll *fll,
          * Increase the bandwidth if we're not using a low frequency
          * sync source.
          */
-        if (fll->sync_src >= 0 && fll->sync_freq > 100000)
+        if (use_sync && fll->sync_freq > 100000)
                 regmap_update_bits(arizona->regmap, fll->base + 0x17,
                                    ARIZONA_FLL1_SYNC_BW, 0);
         else
@@ -1526,8 +1530,7 @@ static void arizona_enable_fll(struct arizona_fll *fll,
 
         regmap_update_bits(arizona->regmap, fll->base + 1,
                            ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
-        if (fll->ref_src >= 0 && fll->sync_src >= 0 &&
-            fll->ref_src != fll->sync_src)
+        if (use_sync)
                 regmap_update_bits(arizona->regmap, fll->base + 0x11,
                                    ARIZONA_FLL1_SYNC_ENA,
                                    ARIZONA_FLL1_SYNC_ENA);
@@ -1561,10 +1564,12 @@ int arizona_set_fll_refclk(struct arizona_fll *fll, int source,
         if (fll->ref_src == source && fll->ref_freq == Fref)
                 return 0;
 
-        if (fll->fout && Fref > 0) {
-                ret = arizona_calc_fll(fll, &ref, Fref, fll->fout);
-                if (ret != 0)
-                        return ret;
+        if (fll->fout) {
+                if (Fref > 0) {
+                        ret = arizona_calc_fll(fll, &ref, Fref, fll->fout);
+                        if (ret != 0)
+                                return ret;
+                }
 
                 if (fll->sync_src >= 0) {
                         ret = arizona_calc_fll(fll, &sync, fll->sync_freq,
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c
index 23316c887b19..43737a27d79c 100644
--- a/sound/soc/codecs/cq93vc.c
+++ b/sound/soc/codecs/cq93vc.c
@@ -38,24 +38,6 @@
 #include <sound/soc.h>
 #include <sound/initval.h>
 
-static inline unsigned int cq93vc_read(struct snd_soc_codec *codec,
-                                                unsigned int reg)
-{
-        struct davinci_vc *davinci_vc = codec->control_data;
-
-        return readl(davinci_vc->base + reg);
-}
-
-static inline int cq93vc_write(struct snd_soc_codec *codec, unsigned int reg,
-                       unsigned int value)
-{
-        struct davinci_vc *davinci_vc = codec->control_data;
-
-        writel(value, davinci_vc->base + reg);
-
-        return 0;
-}
-
 static const struct snd_kcontrol_new cq93vc_snd_controls[] = {
         SOC_SINGLE("PGA Capture Volume", DAVINCI_VC_REG05, 0, 0x03, 0),
         SOC_SINGLE("Mono DAC Playback Volume", DAVINCI_VC_REG09, 0, 0x3f, 0),
@@ -64,13 +46,15 @@ static const struct snd_kcontrol_new cq93vc_snd_controls[] = {
 static int cq93vc_mute(struct snd_soc_dai *dai, int mute)
 {
         struct snd_soc_codec *codec = dai->codec;
-        u8 reg = cq93vc_read(codec, DAVINCI_VC_REG09) & ~DAVINCI_VC_REG09_MUTE;
+        u8 reg;
 
         if (mute)
-                cq93vc_write(codec, DAVINCI_VC_REG09,
-                             reg | DAVINCI_VC_REG09_MUTE);
+                reg = DAVINCI_VC_REG09_MUTE;
         else
-                cq93vc_write(codec, DAVINCI_VC_REG09, reg);
+                reg = 0;
+
+        snd_soc_update_bits(codec, DAVINCI_VC_REG09, DAVINCI_VC_REG09_MUTE,
+                            reg);
 
         return 0;
 }
@@ -79,7 +63,7 @@ static int cq93vc_set_dai_sysclk(struct snd_soc_dai *codec_dai,
                                  int clk_id, unsigned int freq, int dir)
 {
         struct snd_soc_codec *codec = codec_dai->codec;
-        struct davinci_vc *davinci_vc = codec->control_data;
+        struct davinci_vc *davinci_vc = codec->dev->platform_data;
 
         switch (freq) {
         case 22579200:
@@ -97,18 +81,18 @@ static int cq93vc_set_bias_level(struct snd_soc_codec *codec,
 {
         switch (level) {
         case SND_SOC_BIAS_ON:
-                cq93vc_write(codec, DAVINCI_VC_REG12,
+                snd_soc_write(codec, DAVINCI_VC_REG12,
                              DAVINCI_VC_REG12_POWER_ALL_ON);
                 break;
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
-                cq93vc_write(codec, DAVINCI_VC_REG12,
+                snd_soc_write(codec, DAVINCI_VC_REG12,
                              DAVINCI_VC_REG12_POWER_ALL_OFF);
                 break;
         case SND_SOC_BIAS_OFF:
                 /* force all power off */
-                cq93vc_write(codec, DAVINCI_VC_REG12,
+                snd_soc_write(codec, DAVINCI_VC_REG12,
                              DAVINCI_VC_REG12_POWER_ALL_OFF);
                 break;
         }
@@ -154,11 +138,9 @@ static int cq93vc_probe(struct snd_soc_codec *codec)
         struct davinci_vc *davinci_vc = codec->dev->platform_data;
 
         davinci_vc->cq93vc.codec = codec;
-        codec->control_data = davinci_vc;
+        codec->control_data = davinci_vc->regmap;
 
-        /* Set controls */
-        snd_soc_add_codec_controls(codec, cq93vc_snd_controls,
-                             ARRAY_SIZE(cq93vc_snd_controls));
+        snd_soc_codec_set_cache_io(codec, 32, 32, SND_SOC_REGMAP);
 
         /* Off, with power on */
         cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
@@ -174,12 +156,12 @@ static int cq93vc_remove(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_cq93vc = {
-        .read = cq93vc_read,
-        .write = cq93vc_write,
         .set_bias_level = cq93vc_set_bias_level,
         .probe = cq93vc_probe,
         .remove = cq93vc_remove,
         .resume = cq93vc_resume,
+        .controls = cq93vc_snd_controls,
+        .num_controls = ARRAY_SIZE(cq93vc_snd_controls),
 };
 
 static int cq93vc_platform_probe(struct platform_device *pdev)
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index a20f1bb8f071..f6e953454bc0 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -25,6 +25,7 @@
 #include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <sound/pcm.h>
diff --git a/sound/soc/codecs/cs42l52.h b/sound/soc/codecs/cs42l52.h
index 4277012c4719..a935d7381af6 100644
--- a/sound/soc/codecs/cs42l52.h
+++ b/sound/soc/codecs/cs42l52.h
@@ -179,7 +179,7 @@
 #define CS42L52_MICB_CTL                        0x11
 #define CS42L52_MIC_CTL_MIC_SEL_MASK            0xBF
 #define CS42L52_MIC_CTL_MIC_SEL_SHIFT           6
-#define CS42L52_MIC_CTL_TYPE_MASK               0xDF
+#define CS42L52_MIC_CTL_TYPE_MASK               0x20
 #define CS42L52_MIC_CTL_TYPE_SHIFT              5
 
 
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 3b20c86cdb01..549d5d6a3fef 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/of_gpio.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
@@ -28,6 +29,7 @@
 #include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
+#include <sound/cs42l73.h>
 #include "cs42l73.h"
 
 struct sp_config {
@@ -35,6 +37,7 @@ struct sp_config {
         u32 srate;
 };
 struct  cs42l73_private {
+        struct cs42l73_platform_data pdata;
         struct sp_config config[3];
         struct regmap *regmap;
         u32 sysclk;
@@ -310,15 +313,6 @@ static const struct soc_enum ng_delay_enum =
         SOC_ENUM_SINGLE(CS42L73_NGCAB, 0,
                 ARRAY_SIZE(cs42l73_ng_delay_text), cs42l73_ng_delay_text);
 
-static const char * const charge_pump_freq_text[] = {
-        "0", "1", "2", "3", "4",
-        "5", "6", "7", "8", "9",
-        "10", "11", "12", "13", "14", "15" };
-
-static const struct soc_enum charge_pump_enum =
-        SOC_ENUM_SINGLE(CS42L73_CPFCHC, 4,
-                ARRAY_SIZE(charge_pump_freq_text), charge_pump_freq_text);
-
 static const char * const cs42l73_mono_mix_texts[] = {
         "Left", "Right", "Mono Mix"};
 
@@ -511,8 +505,6 @@ static const struct snd_kcontrol_new cs42l73_snd_controls[] = {
         SOC_SINGLE("NG Threshold", CS42L73_NGCAB, 2, 7, 0),
         SOC_ENUM("NG Delay", ng_delay_enum),
 
-        SOC_ENUM("Charge Pump Frequency", charge_pump_enum),
-
         SOC_DOUBLE_R_TLV("XSP-IP Volume",
                         CS42L73_XSPAIPAA, CS42L73_XSPBIPBA, 0, 0x3F, 1,
                         attn_tlv),
@@ -1055,11 +1047,11 @@ static int cs42l73_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 
         switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
         case SND_SOC_DAIFMT_CBM_CFM:
-                mmcc |= MS_MASTER;
+                mmcc |= CS42L73_MS_MASTER;
                 break;
 
         case SND_SOC_DAIFMT_CBS_CFS:
-                mmcc &= ~MS_MASTER;
+                mmcc &= ~CS42L73_MS_MASTER;
                 break;
 
         default:
@@ -1071,11 +1063,11 @@ static int cs42l73_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 
         switch (format) {
         case SND_SOC_DAIFMT_I2S:
-                spc &= ~SPDIF_PCM;
+                spc &= ~CS42L73_SPDIF_PCM;
                 break;
         case SND_SOC_DAIFMT_DSP_A:
         case SND_SOC_DAIFMT_DSP_B:
-                if (mmcc & MS_MASTER) {
+                if (mmcc & CS42L73_MS_MASTER) {
                         dev_err(codec->dev,
                                 "PCM format in slave mode only\n");
                         return -EINVAL;
@@ -1085,25 +1077,25 @@ static int cs42l73_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
                                 "PCM format is not supported on ASP port\n");
                         return -EINVAL;
                 }
-                spc |= SPDIF_PCM;
+                spc |= CS42L73_SPDIF_PCM;
                 break;
         default:
                 return -EINVAL;
         }
 
-        if (spc & SPDIF_PCM) {
+        if (spc & CS42L73_SPDIF_PCM) {
                 /* Clear PCM mode, clear PCM_BIT_ORDER bit for MSB->LSB */
-                spc &= ~(PCM_MODE_MASK | PCM_BIT_ORDER);
+                spc &= ~(CS42L73_PCM_MODE_MASK | CS42L73_PCM_BIT_ORDER);
                 switch (format) {
                 case SND_SOC_DAIFMT_DSP_B:
                         if (inv == SND_SOC_DAIFMT_IB_IF)
-                                spc |= PCM_MODE0;
+                                spc |= CS42L73_PCM_MODE0;
                         if (inv == SND_SOC_DAIFMT_IB_NF)
-                                spc |= PCM_MODE1;
+                                spc |= CS42L73_PCM_MODE1;
                 break;
                 case SND_SOC_DAIFMT_DSP_A:
                         if (inv == SND_SOC_DAIFMT_IB_IF)
-                                spc |= PCM_MODE1;
+                                spc |= CS42L73_PCM_MODE1;
                         break;
                 default:
                         return -EINVAL;
@@ -1163,7 +1155,7 @@ static int cs42l73_pcm_hw_params(struct snd_pcm_substream *substream,
         int mclk_coeff;
         int srate = params_rate(params);
 
-        if (priv->config[id].mmcc & MS_MASTER) {
+        if (priv->config[id].mmcc & CS42L73_MS_MASTER) {
                 /* CS42L73 Master */
                 /* MCLK -> srate */
                 mclk_coeff =
@@ -1182,13 +1174,13 @@ static int cs42l73_pcm_hw_params(struct snd_pcm_substream *substream,
                 priv->config[id].spc &= 0xFC;
                 /* Use SCLK=64*Fs if internal MCLK >= 6.4MHz */
                 if (priv->mclk >= 6400000)
-                        priv->config[id].spc |= MCK_SCLK_64FS;
+                        priv->config[id].spc |= CS42L73_MCK_SCLK_64FS;
                 else
-                        priv->config[id].spc |= MCK_SCLK_MCLK;
+                        priv->config[id].spc |= CS42L73_MCK_SCLK_MCLK;
         } else {
                 /* CS42L73 Slave */
                 priv->config[id].spc &= 0xFC;
-                priv->config[id].spc |= MCK_SCLK_64FS;
+                priv->config[id].spc |= CS42L73_MCK_SCLK_64FS;
         }
         /* Update ASRCs */
         priv->config[id].srate = srate;
@@ -1208,8 +1200,8 @@ static int cs42l73_set_bias_level(struct snd_soc_codec *codec,
 
         switch (level) {
         case SND_SOC_BIAS_ON:
-                snd_soc_update_bits(codec, CS42L73_DMMCC, MCLKDIS, 0);
-                snd_soc_update_bits(codec, CS42L73_PWRCTL1, PDN, 0);
+                snd_soc_update_bits(codec, CS42L73_DMMCC, CS42L73_MCLKDIS, 0);
+                snd_soc_update_bits(codec, CS42L73_PWRCTL1, CS42L73_PDN, 0);
                 break;
 
         case SND_SOC_BIAS_PREPARE:
@@ -1220,11 +1212,11 @@ static int cs42l73_set_bias_level(struct snd_soc_codec *codec,
                         regcache_cache_only(cs42l73->regmap, false);
                         regcache_sync(cs42l73->regmap);
                 }
-                snd_soc_update_bits(codec, CS42L73_PWRCTL1, PDN, 1);
+                snd_soc_update_bits(codec, CS42L73_PWRCTL1, CS42L73_PDN, 1);
                 break;
 
         case SND_SOC_BIAS_OFF:
-                snd_soc_update_bits(codec, CS42L73_PWRCTL1, PDN, 1);
+                snd_soc_update_bits(codec, CS42L73_PWRCTL1, CS42L73_PDN, 1);
                 if (cs42l73->shutdwn_delay > 0) {
                         mdelay(cs42l73->shutdwn_delay);
                         cs42l73->shutdwn_delay = 0;
@@ -1233,7 +1225,7 @@ static int cs42l73_set_bias_level(struct snd_soc_codec *codec,
                                      * down.
                                      */
                 }
-                snd_soc_update_bits(codec, CS42L73_DMMCC, MCLKDIS, 1);
+                snd_soc_update_bits(codec, CS42L73_DMMCC, CS42L73_MCLKDIS, 1);
                 break;
         }
         codec->dapm.bias_level = level;
@@ -1367,11 +1359,16 @@ static int cs42l73_probe(struct snd_soc_codec *codec)
                 return ret;
         }
 
-        regcache_cache_only(cs42l73->regmap, true);
-
         cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-        cs42l73->mclksel = CS42L73_CLKID_MCLK1; /* MCLK1 as master clk */
+        /* Set Charge Pump Frequency */
+        if (cs42l73->pdata.chgfreq)
+                snd_soc_update_bits(codec, CS42L73_CPFCHC,
+                                    CS42L73_CHARGEPUMP_MASK,
+                                        cs42l73->pdata.chgfreq << 4);
+
+        /* MCLK1 as master clk */
+        cs42l73->mclksel = CS42L73_CLKID_MCLK1;
         cs42l73->mclk = 0;
 
         return ret;
@@ -1415,9 +1412,11 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
                              const struct i2c_device_id *id)
 {
         struct cs42l73_private *cs42l73;
+        struct cs42l73_platform_data *pdata = dev_get_platdata(&i2c_client->dev);
         int ret;
         unsigned int devid = 0;
         unsigned int reg;
+        u32 val32;
 
         cs42l73 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l73_private),
                                GFP_KERNEL);
@@ -1426,14 +1425,49 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
                 return -ENOMEM;
         }
 
-        i2c_set_clientdata(i2c_client, cs42l73);
-
         cs42l73->regmap = devm_regmap_init_i2c(i2c_client, &cs42l73_regmap);
         if (IS_ERR(cs42l73->regmap)) {
                 ret = PTR_ERR(cs42l73->regmap);
                 dev_err(&i2c_client->dev, "regmap_init() failed: %d\n", ret);
                 return ret;
         }
+
+        if (pdata) {
+                cs42l73->pdata = *pdata;
+        } else {
+                pdata = devm_kzalloc(&i2c_client->dev,
+                                     sizeof(struct cs42l73_platform_data),
+                                GFP_KERNEL);
+                if (!pdata) {
+                        dev_err(&i2c_client->dev, "could not allocate pdata\n");
+                        return -ENOMEM;
+                }
+                if (i2c_client->dev.of_node) {
+                        if (of_property_read_u32(i2c_client->dev.of_node,
+                                "chgfreq", &val32) >= 0)
+                                pdata->chgfreq = val32;
+                }
+                pdata->reset_gpio = of_get_named_gpio(i2c_client->dev.of_node,
+                                                "reset-gpio", 0);
+                cs42l73->pdata = *pdata;
+        }
+
+        i2c_set_clientdata(i2c_client, cs42l73);
+
+        if (cs42l73->pdata.reset_gpio) {
+                ret = gpio_request_one(cs42l73->pdata.reset_gpio,
+                                       GPIOF_OUT_INIT_HIGH, "CS42L73 /RST");
+                if (ret < 0) {
+                        dev_err(&i2c_client->dev, "Failed to request /RST %d: %d\n",
+                                cs42l73->pdata.reset_gpio, ret);
+                        return ret;
+                }
+                gpio_set_value_cansleep(cs42l73->pdata.reset_gpio, 0);
+                gpio_set_value_cansleep(cs42l73->pdata.reset_gpio, 1);
+        }
+
+        regcache_cache_bypass(cs42l73->regmap, true);
+
         /* initialize codec */
         ret = regmap_read(cs42l73->regmap, CS42L73_DEVID_AB, &reg);
         devid = (reg & 0xFF) << 12;
@@ -1444,7 +1478,6 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
         ret = regmap_read(cs42l73->regmap, CS42L73_DEVID_E, &reg);
         devid |= (reg & 0xF0) >> 4;
 
-
         if (devid != CS42L73_DEVID) {
                 ret = -ENODEV;
                 dev_err(&i2c_client->dev,
@@ -1462,7 +1495,7 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,
         dev_info(&i2c_client->dev,
                  "Cirrus Logic CS42L73, Revision: %02X\n", reg & 0xFF);
 
-        regcache_cache_only(cs42l73->regmap, true);
+        regcache_cache_bypass(cs42l73->regmap, false);
 
         ret =  snd_soc_register_codec(&i2c_client->dev,
                         &soc_codec_dev_cs42l73, cs42l73_dai,
@@ -1478,6 +1511,12 @@ static int cs42l73_i2c_remove(struct i2c_client *client)
         return 0;
 }
 
+static const struct of_device_id cs42l73_of_match[] = {
+        { .compatible = "cirrus,cs42l73", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, cs42l73_of_match);
+
 static const struct i2c_device_id cs42l73_id[] = {
         {"cs42l73", 0},
         {}
@@ -1489,6 +1528,7 @@ static struct i2c_driver cs42l73_i2c_driver = {
         .driver = {
                    .name = "cs42l73",
                    .owner = THIS_MODULE,
+                   .of_match_table = cs42l73_of_match,
                    },
         .id_table = cs42l73_id,
         .probe = cs42l73_i2c_probe,
diff --git a/sound/soc/codecs/cs42l73.h b/sound/soc/codecs/cs42l73.h
index f30a4c4d62e6..45746186a678 100644
--- a/sound/soc/codecs/cs42l73.h
+++ b/sound/soc/codecs/cs42l73.h
@@ -128,59 +128,60 @@
 /* Bitfield Definitions */
 
 /* CS42L73_PWRCTL1 */
-#define PDN_ADCB                (1 << 7)
-#define PDN_DMICB               (1 << 6)
-#define PDN_ADCA                (1 << 5)
-#define PDN_DMICA               (1 << 4)
-#define PDN_LDO                 (1 << 2)
-#define DISCHG_FILT             (1 << 1)
-#define PDN                     (1 << 0)
+#define CS42L73_PDN_ADCB                (1 << 7)
+#define CS42L73_PDN_DMICB               (1 << 6)
+#define CS42L73_PDN_ADCA                (1 << 5)
+#define CS42L73_PDN_DMICA               (1 << 4)
+#define CS42L73_PDN_LDO                 (1 << 2)
+#define CS42L73_DISCHG_FILT             (1 << 1)
+#define CS42L73_PDN                     (1 << 0)
 
 /* CS42L73_PWRCTL2 */
-#define PDN_MIC2_BIAS           (1 << 7)
-#define PDN_MIC1_BIAS           (1 << 6)
-#define PDN_VSP                 (1 << 4)
-#define PDN_ASP_SDOUT           (1 << 3)
-#define PDN_ASP_SDIN            (1 << 2)
-#define PDN_XSP_SDOUT           (1 << 1)
-#define PDN_XSP_SDIN            (1 << 0)
+#define CS42L73_PDN_MIC2_BIAS           (1 << 7)
+#define CS42L73_PDN_MIC1_BIAS           (1 << 6)
+#define CS42L73_PDN_VSP                 (1 << 4)
+#define CS42L73_PDN_ASP_SDOUT           (1 << 3)
+#define CS42L73_PDN_ASP_SDIN            (1 << 2)
+#define CS42L73_PDN_XSP_SDOUT           (1 << 1)
+#define CS42L73_PDN_XSP_SDIN            (1 << 0)
 
 /* CS42L73_PWRCTL3 */
-#define PDN_THMS                (1 << 5)
-#define PDN_SPKLO               (1 << 4)
-#define PDN_EAR                 (1 << 3)
-#define PDN_SPK                 (1 << 2)
-#define PDN_LO                  (1 << 1)
-#define PDN_HP                  (1 << 0)
+#define CS42L73_PDN_THMS                (1 << 5)
+#define CS42L73_PDN_SPKLO               (1 << 4)
+#define CS42L73_PDN_EAR                 (1 << 3)
+#define CS42L73_PDN_SPK                 (1 << 2)
+#define CS42L73_PDN_LO                  (1 << 1)
+#define CS42L73_PDN_HP                  (1 << 0)
 
 /* Thermal Overload Detect. Requires interrupt ... */
-#define THMOVLD_150C            0
-#define THMOVLD_132C            1
-#define THMOVLD_115C            2
-#define THMOVLD_098C            3
+#define CS42L73_THMOVLD_150C            0
+#define CS42L73_THMOVLD_132C            1
+#define CS42L73_THMOVLD_115C            2
+#define CS42L73_THMOVLD_098C            3
 
+#define CS42L73_CHARGEPUMP_MASK (0xF0)
 
 /* CS42L73_ASPC, CS42L73_XSPC, CS42L73_VSPC */
-#define SP_3ST                  (1 << 7)
-#define SPDIF_I2S               (0 << 6)
-#define SPDIF_PCM               (1 << 6)
-#define PCM_MODE0               (0 << 4)
-#define PCM_MODE1               (1 << 4)
-#define PCM_MODE2               (2 << 4)
-#define PCM_MODE_MASK           (3 << 4)
-#define PCM_BIT_ORDER           (1 << 3)
-#define MCK_SCLK_64FS           (0 << 0)
-#define MCK_SCLK_MCLK           (2 << 0)
-#define MCK_SCLK_PREMCLK        (3 << 0)
+#define CS42L73_SP_3ST                  (1 << 7)
+#define CS42L73_SPDIF_I2S               (0 << 6)
+#define CS42L73_SPDIF_PCM               (1 << 6)
+#define CS42L73_PCM_MODE0               (0 << 4)
+#define CS42L73_PCM_MODE1               (1 << 4)
+#define CS42L73_PCM_MODE2               (2 << 4)
+#define CS42L73_PCM_MODE_MASK           (3 << 4)
+#define CS42L73_PCM_BIT_ORDER           (1 << 3)
+#define CS42L73_MCK_SCLK_64FS           (0 << 0)
+#define CS42L73_MCK_SCLK_MCLK           (2 << 0)
+#define CS42L73_MCK_SCLK_PREMCLK        (3 << 0)
 
 /* CS42L73_xSPMMCC */
-#define MS_MASTER               (1 << 7)
+#define CS42L73_MS_MASTER               (1 << 7)
 
 
 /* CS42L73_DMMCC */
-#define MCLKDIS                 (1 << 0)
-#define MCLKSEL_MCLK2           (1 << 4)
-#define MCLKSEL_MCLK1           (0 << 4)
+#define CS42L73_MCLKDIS                 (1 << 0)
+#define CS42L73_MCLKSEL_MCLK2           (1 << 4)
+#define CS42L73_MCLKSEL_MCLK1           (0 << 4)
 
 /* CS42L73 MCLK derived from MCLK1 or MCLK2 */
 #define CS42L73_CLKID_MCLK1     0
@@ -194,28 +195,26 @@
 #define CS42L73_VSP             2
 
 /* IS1, IM1 */
-#define MIC2_SDET               (1 << 6)
-#define THMOVLD                 (1 << 4)
-#define DIGMIXOVFL              (1 << 3)
-#define IPBOVFL                 (1 << 1)
-#define IPAOVFL                 (1 << 0)
+#define CS42L73_MIC2_SDET               (1 << 6)
+#define CS42L73_THMOVLD                 (1 << 4)
+#define CS42L73_DIGMIXOVFL              (1 << 3)
+#define CS42L73_IPBOVFL                 (1 << 1)
+#define CS42L73_IPAOVFL                 (1 << 0)
 
 /* Analog Softramp */
-#define ANLGOSFT                (1 << 0)
+#define CS42L73_ANLGOSFT                (1 << 0)
 
 /* HP A/B Analog Mute */
-#define HPA_MUTE                (1 << 7)
+#define CS42L73_HPA_MUTE                (1 << 7)
 /* LO A/B Analog Mute   */
-#define LOA_MUTE                (1 << 7)
+#define CS42L73_LOA_MUTE                (1 << 7)
 /* Digital Mute */
-#define HLAD_MUTE               (1 << 0)
-#define HLBD_MUTE               (1 << 1)
-#define SPKD_MUTE               (1 << 2)
-#define ESLD_MUTE               (1 << 3)
+#define CS42L73_HLAD_MUTE               (1 << 0)
+#define CS42L73_HLBD_MUTE               (1 << 1)
+#define CS42L73_SPKD_MUTE               (1 << 2)
+#define CS42L73_ESLD_MUTE               (1 << 3)
 
 /* Misc defines for codec */
-#define CS42L73_RESET_GPIO 143
-
 #define CS42L73_DEVID           0x00042A73
 #define CS42L73_MCLKX_MIN       5644800
 #define CS42L73_MCLKX_MAX       38400000
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index 566a367c94fa..66ceee22fdad 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -38,294 +39,223 @@ struct max98088_cdata {
 };
 
 struct max98088_priv {
-       enum max98088_type devtype;
-       struct max98088_pdata *pdata;
-       unsigned int sysclk;
-       struct max98088_cdata dai[2];
-       int eq_textcnt;
-       const char **eq_texts;
-       struct soc_enum eq_enum;
-       u8 ina_state;
-       u8 inb_state;
-       unsigned int ex_mode;
-       unsigned int digmic;
-       unsigned int mic1pre;
-       unsigned int mic2pre;
-       unsigned int extmic_mode;
+        struct regmap *regmap;
+        enum max98088_type devtype;
+        struct max98088_pdata *pdata;
+        unsigned int sysclk;
+        struct max98088_cdata dai[2];
+        int eq_textcnt;
+        const char **eq_texts;
+        struct soc_enum eq_enum;
+        u8 ina_state;
+        u8 inb_state;
+        unsigned int ex_mode;
+        unsigned int digmic;
+        unsigned int mic1pre;
+        unsigned int mic2pre;
+        unsigned int extmic_mode;
 };
 
-static const u8 max98088_reg[M98088_REG_CNT] = {
-       0x00, /* 00 IRQ status */
-       0x00, /* 01 MIC status */
-       0x00, /* 02 jack status */
-       0x00, /* 03 battery voltage */
-       0x00, /* 04 */
-       0x00, /* 05 */
-       0x00, /* 06 */
-       0x00, /* 07 */
-       0x00, /* 08 */
-       0x00, /* 09 */
-       0x00, /* 0A */
-       0x00, /* 0B */
-       0x00, /* 0C */
-       0x00, /* 0D */
-       0x00, /* 0E */
-       0x00, /* 0F interrupt enable */
-
-       0x00, /* 10 master clock */
-       0x00, /* 11 DAI1 clock mode */
-       0x00, /* 12 DAI1 clock control */
-       0x00, /* 13 DAI1 clock control */
-       0x00, /* 14 DAI1 format */
-       0x00, /* 15 DAI1 clock */
-       0x00, /* 16 DAI1 config */
-       0x00, /* 17 DAI1 TDM */
-       0x00, /* 18 DAI1 filters */
-       0x00, /* 19 DAI2 clock mode */
-       0x00, /* 1A DAI2 clock control */
-       0x00, /* 1B DAI2 clock control */
-       0x00, /* 1C DAI2 format */
-       0x00, /* 1D DAI2 clock */
-       0x00, /* 1E DAI2 config */
-       0x00, /* 1F DAI2 TDM */
-
-       0x00, /* 20 DAI2 filters */
-       0x00, /* 21 data config */
-       0x00, /* 22 DAC mixer */
-       0x00, /* 23 left ADC mixer */
-       0x00, /* 24 right ADC mixer */
-       0x00, /* 25 left HP mixer */
-       0x00, /* 26 right HP mixer */
-       0x00, /* 27 HP control */
-       0x00, /* 28 left REC mixer */
-       0x00, /* 29 right REC mixer */
-       0x00, /* 2A REC control */
-       0x00, /* 2B left SPK mixer */
-       0x00, /* 2C right SPK mixer */
-       0x00, /* 2D SPK control */
-       0x00, /* 2E sidetone */
-       0x00, /* 2F DAI1 playback level */
-
-       0x00, /* 30 DAI1 playback level */
-       0x00, /* 31 DAI2 playback level */
-       0x00, /* 32 DAI2 playbakc level */
-       0x00, /* 33 left ADC level */
-       0x00, /* 34 right ADC level */
-       0x00, /* 35 MIC1 level */
-       0x00, /* 36 MIC2 level */
-       0x00, /* 37 INA level */
-       0x00, /* 38 INB level */
-       0x00, /* 39 left HP volume */
-       0x00, /* 3A right HP volume */
-       0x00, /* 3B left REC volume */
-       0x00, /* 3C right REC volume */
-       0x00, /* 3D left SPK volume */
-       0x00, /* 3E right SPK volume */
-       0x00, /* 3F MIC config */
-
-       0x00, /* 40 MIC threshold */
-       0x00, /* 41 excursion limiter filter */
-       0x00, /* 42 excursion limiter threshold */
-       0x00, /* 43 ALC */
-       0x00, /* 44 power limiter threshold */
-       0x00, /* 45 power limiter config */
-       0x00, /* 46 distortion limiter config */
-       0x00, /* 47 audio input */
-       0x00, /* 48 microphone */
-       0x00, /* 49 level control */
-       0x00, /* 4A bypass switches */
-       0x00, /* 4B jack detect */
-       0x00, /* 4C input enable */
-       0x00, /* 4D output enable */
-       0xF0, /* 4E bias control */
-       0x00, /* 4F DAC power */
-
-       0x0F, /* 50 DAC power */
-       0x00, /* 51 system */
-       0x00, /* 52 DAI1 EQ1 */
-       0x00, /* 53 DAI1 EQ1 */
-       0x00, /* 54 DAI1 EQ1 */
-       0x00, /* 55 DAI1 EQ1 */
-       0x00, /* 56 DAI1 EQ1 */
-       0x00, /* 57 DAI1 EQ1 */
-       0x00, /* 58 DAI1 EQ1 */
-       0x00, /* 59 DAI1 EQ1 */
-       0x00, /* 5A DAI1 EQ1 */
-       0x00, /* 5B DAI1 EQ1 */
-       0x00, /* 5C DAI1 EQ2 */
-       0x00, /* 5D DAI1 EQ2 */
-       0x00, /* 5E DAI1 EQ2 */
-       0x00, /* 5F DAI1 EQ2 */
-
-       0x00, /* 60 DAI1 EQ2 */
-       0x00, /* 61 DAI1 EQ2 */
-       0x00, /* 62 DAI1 EQ2 */
-       0x00, /* 63 DAI1 EQ2 */
-       0x00, /* 64 DAI1 EQ2 */
-       0x00, /* 65 DAI1 EQ2 */
-       0x00, /* 66 DAI1 EQ3 */
-       0x00, /* 67 DAI1 EQ3 */
-       0x00, /* 68 DAI1 EQ3 */
-       0x00, /* 69 DAI1 EQ3 */
-       0x00, /* 6A DAI1 EQ3 */
-       0x00, /* 6B DAI1 EQ3 */
-       0x00, /* 6C DAI1 EQ3 */
-       0x00, /* 6D DAI1 EQ3 */
-       0x00, /* 6E DAI1 EQ3 */
-       0x00, /* 6F DAI1 EQ3 */
-
-       0x00, /* 70 DAI1 EQ4 */
-       0x00, /* 71 DAI1 EQ4 */
-       0x00, /* 72 DAI1 EQ4 */
-       0x00, /* 73 DAI1 EQ4 */
-       0x00, /* 74 DAI1 EQ4 */
-       0x00, /* 75 DAI1 EQ4 */
-       0x00, /* 76 DAI1 EQ4 */
-       0x00, /* 77 DAI1 EQ4 */
-       0x00, /* 78 DAI1 EQ4 */
-       0x00, /* 79 DAI1 EQ4 */
-       0x00, /* 7A DAI1 EQ5 */
-       0x00, /* 7B DAI1 EQ5 */
-       0x00, /* 7C DAI1 EQ5 */
-       0x00, /* 7D DAI1 EQ5 */
-       0x00, /* 7E DAI1 EQ5 */
-       0x00, /* 7F DAI1 EQ5 */
-
-       0x00, /* 80 DAI1 EQ5 */
-       0x00, /* 81 DAI1 EQ5 */
-       0x00, /* 82 DAI1 EQ5 */
-       0x00, /* 83 DAI1 EQ5 */
-       0x00, /* 84 DAI2 EQ1 */
-       0x00, /* 85 DAI2 EQ1 */
-       0x00, /* 86 DAI2 EQ1 */
-       0x00, /* 87 DAI2 EQ1 */
-       0x00, /* 88 DAI2 EQ1 */
-       0x00, /* 89 DAI2 EQ1 */
-       0x00, /* 8A DAI2 EQ1 */
-       0x00, /* 8B DAI2 EQ1 */
-       0x00, /* 8C DAI2 EQ1 */
-       0x00, /* 8D DAI2 EQ1 */
-       0x00, /* 8E DAI2 EQ2 */
-       0x00, /* 8F DAI2 EQ2 */
-
-       0x00, /* 90 DAI2 EQ2 */
-       0x00, /* 91 DAI2 EQ2 */
-       0x00, /* 92 DAI2 EQ2 */
-       0x00, /* 93 DAI2 EQ2 */
-       0x00, /* 94 DAI2 EQ2 */
-       0x00, /* 95 DAI2 EQ2 */
-       0x00, /* 96 DAI2 EQ2 */
-       0x00, /* 97 DAI2 EQ2 */
-       0x00, /* 98 DAI2 EQ3 */
-       0x00, /* 99 DAI2 EQ3 */
-       0x00, /* 9A DAI2 EQ3 */
-       0x00, /* 9B DAI2 EQ3 */
-       0x00, /* 9C DAI2 EQ3 */
-       0x00, /* 9D DAI2 EQ3 */
-       0x00, /* 9E DAI2 EQ3 */
-       0x00, /* 9F DAI2 EQ3 */
-
-       0x00, /* A0 DAI2 EQ3 */
-       0x00, /* A1 DAI2 EQ3 */
-       0x00, /* A2 DAI2 EQ4 */
-       0x00, /* A3 DAI2 EQ4 */
-       0x00, /* A4 DAI2 EQ4 */
-       0x00, /* A5 DAI2 EQ4 */
-       0x00, /* A6 DAI2 EQ4 */
-       0x00, /* A7 DAI2 EQ4 */
-       0x00, /* A8 DAI2 EQ4 */
-       0x00, /* A9 DAI2 EQ4 */
-       0x00, /* AA DAI2 EQ4 */
-       0x00, /* AB DAI2 EQ4 */
-       0x00, /* AC DAI2 EQ5 */
-       0x00, /* AD DAI2 EQ5 */
-       0x00, /* AE DAI2 EQ5 */
-       0x00, /* AF DAI2 EQ5 */
-
-       0x00, /* B0 DAI2 EQ5 */
-       0x00, /* B1 DAI2 EQ5 */
-       0x00, /* B2 DAI2 EQ5 */
-       0x00, /* B3 DAI2 EQ5 */
-       0x00, /* B4 DAI2 EQ5 */
-       0x00, /* B5 DAI2 EQ5 */
-       0x00, /* B6 DAI1 biquad */
-       0x00, /* B7 DAI1 biquad */
-       0x00, /* B8 DAI1 biquad */
-       0x00, /* B9 DAI1 biquad */
-       0x00, /* BA DAI1 biquad */
-       0x00, /* BB DAI1 biquad */
-       0x00, /* BC DAI1 biquad */
-       0x00, /* BD DAI1 biquad */
-       0x00, /* BE DAI1 biquad */
-       0x00, /* BF DAI1 biquad */
-
-       0x00, /* C0 DAI2 biquad */
-       0x00, /* C1 DAI2 biquad */
-       0x00, /* C2 DAI2 biquad */
-       0x00, /* C3 DAI2 biquad */
-       0x00, /* C4 DAI2 biquad */
-       0x00, /* C5 DAI2 biquad */
-       0x00, /* C6 DAI2 biquad */
-       0x00, /* C7 DAI2 biquad */
-       0x00, /* C8 DAI2 biquad */
-       0x00, /* C9 DAI2 biquad */
-       0x00, /* CA */
-       0x00, /* CB */
-       0x00, /* CC */
-       0x00, /* CD */
-       0x00, /* CE */
-       0x00, /* CF */
-
-       0x00, /* D0 */
-       0x00, /* D1 */
-       0x00, /* D2 */
-       0x00, /* D3 */
-       0x00, /* D4 */
-       0x00, /* D5 */
-       0x00, /* D6 */
-       0x00, /* D7 */
-       0x00, /* D8 */
-       0x00, /* D9 */
-       0x00, /* DA */
-       0x70, /* DB */
-       0x00, /* DC */
-       0x00, /* DD */
-       0x00, /* DE */
-       0x00, /* DF */
-
-       0x00, /* E0 */
-       0x00, /* E1 */
-       0x00, /* E2 */
-       0x00, /* E3 */
-       0x00, /* E4 */
-       0x00, /* E5 */
-       0x00, /* E6 */
-       0x00, /* E7 */
-       0x00, /* E8 */
-       0x00, /* E9 */
-       0x00, /* EA */
-       0x00, /* EB */
-       0x00, /* EC */
-       0x00, /* ED */
-       0x00, /* EE */
-       0x00, /* EF */
-
-       0x00, /* F0 */
-       0x00, /* F1 */
-       0x00, /* F2 */
-       0x00, /* F3 */
-       0x00, /* F4 */
-       0x00, /* F5 */
-       0x00, /* F6 */
-       0x00, /* F7 */
-       0x00, /* F8 */
-       0x00, /* F9 */
-       0x00, /* FA */
-       0x00, /* FB */
-       0x00, /* FC */
-       0x00, /* FD */
-       0x00, /* FE */
-       0x00, /* FF */
+static const struct reg_default max98088_reg[] = {
+        {  0xf, 0x00 }, /* 0F interrupt enable */
+
+        { 0x10, 0x00 }, /* 10 master clock */
+        { 0x11, 0x00 }, /* 11 DAI1 clock mode */
+        { 0x12, 0x00 }, /* 12 DAI1 clock control */
+        { 0x13, 0x00 }, /* 13 DAI1 clock control */
+        { 0x14, 0x00 }, /* 14 DAI1 format */
+        { 0x15, 0x00 }, /* 15 DAI1 clock */
+        { 0x16, 0x00 }, /* 16 DAI1 config */
+        { 0x17, 0x00 }, /* 17 DAI1 TDM */
+        { 0x18, 0x00 }, /* 18 DAI1 filters */
+        { 0x19, 0x00 }, /* 19 DAI2 clock mode */
+        { 0x1a, 0x00 }, /* 1A DAI2 clock control */
+        { 0x1b, 0x00 }, /* 1B DAI2 clock control */
+        { 0x1c, 0x00 }, /* 1C DAI2 format */
+        { 0x1d, 0x00 }, /* 1D DAI2 clock */
+        { 0x1e, 0x00 }, /* 1E DAI2 config */
+        { 0x1f, 0x00 }, /* 1F DAI2 TDM */
+
+        { 0x20, 0x00 }, /* 20 DAI2 filters */
+        { 0x21, 0x00 }, /* 21 data config */
+        { 0x22, 0x00 }, /* 22 DAC mixer */
+        { 0x23, 0x00 }, /* 23 left ADC mixer */
+        { 0x24, 0x00 }, /* 24 right ADC mixer */
+        { 0x25, 0x00 }, /* 25 left HP mixer */
+        { 0x26, 0x00 }, /* 26 right HP mixer */
+        { 0x27, 0x00 }, /* 27 HP control */
+        { 0x28, 0x00 }, /* 28 left REC mixer */
+        { 0x29, 0x00 }, /* 29 right REC mixer */
+        { 0x2a, 0x00 }, /* 2A REC control */
+        { 0x2b, 0x00 }, /* 2B left SPK mixer */
+        { 0x2c, 0x00 }, /* 2C right SPK mixer */
+        { 0x2d, 0x00 }, /* 2D SPK control */
+        { 0x2e, 0x00 }, /* 2E sidetone */
+        { 0x2f, 0x00 }, /* 2F DAI1 playback level */
+
+        { 0x30, 0x00 }, /* 30 DAI1 playback level */
+        { 0x31, 0x00 }, /* 31 DAI2 playback level */
+        { 0x32, 0x00 }, /* 32 DAI2 playbakc level */
+        { 0x33, 0x00 }, /* 33 left ADC level */
+        { 0x34, 0x00 }, /* 34 right ADC level */
+        { 0x35, 0x00 }, /* 35 MIC1 level */
+        { 0x36, 0x00 }, /* 36 MIC2 level */
+        { 0x37, 0x00 }, /* 37 INA level */
+        { 0x38, 0x00 }, /* 38 INB level */
+        { 0x39, 0x00 }, /* 39 left HP volume */
+        { 0x3a, 0x00 }, /* 3A right HP volume */
+        { 0x3b, 0x00 }, /* 3B left REC volume */
+        { 0x3c, 0x00 }, /* 3C right REC volume */
+        { 0x3d, 0x00 }, /* 3D left SPK volume */
+        { 0x3e, 0x00 }, /* 3E right SPK volume */
+        { 0x3f, 0x00 }, /* 3F MIC config */
+
+        { 0x40, 0x00 }, /* 40 MIC threshold */
+        { 0x41, 0x00 }, /* 41 excursion limiter filter */
+        { 0x42, 0x00 }, /* 42 excursion limiter threshold */
+        { 0x43, 0x00 }, /* 43 ALC */
+        { 0x44, 0x00 }, /* 44 power limiter threshold */
+        { 0x45, 0x00 }, /* 45 power limiter config */
+        { 0x46, 0x00 }, /* 46 distortion limiter config */
+        { 0x47, 0x00 }, /* 47 audio input */
+        { 0x48, 0x00 }, /* 48 microphone */
+        { 0x49, 0x00 }, /* 49 level control */
+        { 0x4a, 0x00 }, /* 4A bypass switches */
+        { 0x4b, 0x00 }, /* 4B jack detect */
+        { 0x4c, 0x00 }, /* 4C input enable */
+        { 0x4d, 0x00 }, /* 4D output enable */
+        { 0x4e, 0xF0 }, /* 4E bias control */
+        { 0x4f, 0x00 }, /* 4F DAC power */
+
+        { 0x50, 0x0F }, /* 50 DAC power */
+        { 0x51, 0x00 }, /* 51 system */
+        { 0x52, 0x00 }, /* 52 DAI1 EQ1 */
+        { 0x53, 0x00 }, /* 53 DAI1 EQ1 */
+        { 0x54, 0x00 }, /* 54 DAI1 EQ1 */
+        { 0x55, 0x00 }, /* 55 DAI1 EQ1 */
+        { 0x56, 0x00 }, /* 56 DAI1 EQ1 */
+        { 0x57, 0x00 }, /* 57 DAI1 EQ1 */
+        { 0x58, 0x00 }, /* 58 DAI1 EQ1 */
+        { 0x59, 0x00 }, /* 59 DAI1 EQ1 */
+        { 0x5a, 0x00 }, /* 5A DAI1 EQ1 */
+        { 0x5b, 0x00 }, /* 5B DAI1 EQ1 */
+        { 0x5c, 0x00 }, /* 5C DAI1 EQ2 */
+        { 0x5d, 0x00 }, /* 5D DAI1 EQ2 */
+        { 0x5e, 0x00 }, /* 5E DAI1 EQ2 */
+        { 0x5f, 0x00 }, /* 5F DAI1 EQ2 */
+
+        { 0x60, 0x00 }, /* 60 DAI1 EQ2 */
+        { 0x61, 0x00 }, /* 61 DAI1 EQ2 */
+        { 0x62, 0x00 }, /* 62 DAI1 EQ2 */
+        { 0x63, 0x00 }, /* 63 DAI1 EQ2 */
+        { 0x64, 0x00 }, /* 64 DAI1 EQ2 */
+        { 0x65, 0x00 }, /* 65 DAI1 EQ2 */
+        { 0x66, 0x00 }, /* 66 DAI1 EQ3 */
+        { 0x67, 0x00 }, /* 67 DAI1 EQ3 */
+        { 0x68, 0x00 }, /* 68 DAI1 EQ3 */
+        { 0x69, 0x00 }, /* 69 DAI1 EQ3 */
+        { 0x6a, 0x00 }, /* 6A DAI1 EQ3 */
+        { 0x6b, 0x00 }, /* 6B DAI1 EQ3 */
+        { 0x6c, 0x00 }, /* 6C DAI1 EQ3 */
+        { 0x6d, 0x00 }, /* 6D DAI1 EQ3 */
+        { 0x6e, 0x00 }, /* 6E DAI1 EQ3 */
+        { 0x6f, 0x00 }, /* 6F DAI1 EQ3 */
+
+        { 0x70, 0x00 }, /* 70 DAI1 EQ4 */
+        { 0x71, 0x00 }, /* 71 DAI1 EQ4 */
+        { 0x72, 0x00 }, /* 72 DAI1 EQ4 */
+        { 0x73, 0x00 }, /* 73 DAI1 EQ4 */
+        { 0x74, 0x00 }, /* 74 DAI1 EQ4 */
+        { 0x75, 0x00 }, /* 75 DAI1 EQ4 */
+        { 0x76, 0x00 }, /* 76 DAI1 EQ4 */
+        { 0x77, 0x00 }, /* 77 DAI1 EQ4 */
+        { 0x78, 0x00 }, /* 78 DAI1 EQ4 */
+        { 0x79, 0x00 }, /* 79 DAI1 EQ4 */
+        { 0x7a, 0x00 }, /* 7A DAI1 EQ5 */
+        { 0x7b, 0x00 }, /* 7B DAI1 EQ5 */
+        { 0x7c, 0x00 }, /* 7C DAI1 EQ5 */
+        { 0x7d, 0x00 }, /* 7D DAI1 EQ5 */
+        { 0x7e, 0x00 }, /* 7E DAI1 EQ5 */
+        { 0x7f, 0x00 }, /* 7F DAI1 EQ5 */
+
+        { 0x80, 0x00 }, /* 80 DAI1 EQ5 */
+        { 0x81, 0x00 }, /* 81 DAI1 EQ5 */
+        { 0x82, 0x00 }, /* 82 DAI1 EQ5 */
+        { 0x83, 0x00 }, /* 83 DAI1 EQ5 */
+        { 0x84, 0x00 }, /* 84 DAI2 EQ1 */
+        { 0x85, 0x00 }, /* 85 DAI2 EQ1 */
+        { 0x86, 0x00 }, /* 86 DAI2 EQ1 */
+        { 0x87, 0x00 }, /* 87 DAI2 EQ1 */
+        { 0x88, 0x00 }, /* 88 DAI2 EQ1 */
+        { 0x89, 0x00 }, /* 89 DAI2 EQ1 */
+        { 0x8a, 0x00 }, /* 8A DAI2 EQ1 */
+        { 0x8b, 0x00 }, /* 8B DAI2 EQ1 */
+        { 0x8c, 0x00 }, /* 8C DAI2 EQ1 */
+        { 0x8d, 0x00 }, /* 8D DAI2 EQ1 */
+        { 0x8e, 0x00 }, /* 8E DAI2 EQ2 */
+        { 0x8f, 0x00 }, /* 8F DAI2 EQ2 */
+
+        { 0x90, 0x00 }, /* 90 DAI2 EQ2 */
+        { 0x91, 0x00 }, /* 91 DAI2 EQ2 */
+        { 0x92, 0x00 }, /* 92 DAI2 EQ2 */
+        { 0x93, 0x00 }, /* 93 DAI2 EQ2 */
+        { 0x94, 0x00 }, /* 94 DAI2 EQ2 */
+        { 0x95, 0x00 }, /* 95 DAI2 EQ2 */
+        { 0x96, 0x00 }, /* 96 DAI2 EQ2 */
+        { 0x97, 0x00 }, /* 97 DAI2 EQ2 */
+        { 0x98, 0x00 }, /* 98 DAI2 EQ3 */
+        { 0x99, 0x00 }, /* 99 DAI2 EQ3 */
+        { 0x9a, 0x00 }, /* 9A DAI2 EQ3 */
+        { 0x9b, 0x00 }, /* 9B DAI2 EQ3 */
+        { 0x9c, 0x00 }, /* 9C DAI2 EQ3 */
+        { 0x9d, 0x00 }, /* 9D DAI2 EQ3 */
+        { 0x9e, 0x00 }, /* 9E DAI2 EQ3 */
+        { 0x9f, 0x00 }, /* 9F DAI2 EQ3 */
+
+        { 0xa0, 0x00 }, /* A0 DAI2 EQ3 */
+        { 0xa1, 0x00 }, /* A1 DAI2 EQ3 */
+        { 0xa2, 0x00 }, /* A2 DAI2 EQ4 */
+        { 0xa3, 0x00 }, /* A3 DAI2 EQ4 */
+        { 0xa4, 0x00 }, /* A4 DAI2 EQ4 */
+        { 0xa5, 0x00 }, /* A5 DAI2 EQ4 */
+        { 0xa6, 0x00 }, /* A6 DAI2 EQ4 */
+        { 0xa7, 0x00 }, /* A7 DAI2 EQ4 */
+        { 0xa8, 0x00 }, /* A8 DAI2 EQ4 */
+        { 0xa9, 0x00 }, /* A9 DAI2 EQ4 */
+        { 0xaa, 0x00 }, /* AA DAI2 EQ4 */
+        { 0xab, 0x00 }, /* AB DAI2 EQ4 */
+        { 0xac, 0x00 }, /* AC DAI2 EQ5 */
+        { 0xad, 0x00 }, /* AD DAI2 EQ5 */
+        { 0xae, 0x00 }, /* AE DAI2 EQ5 */
+        { 0xaf, 0x00 }, /* AF DAI2 EQ5 */
+
+        { 0xb0, 0x00 }, /* B0 DAI2 EQ5 */
+        { 0xb1, 0x00 }, /* B1 DAI2 EQ5 */
+        { 0xb2, 0x00 }, /* B2 DAI2 EQ5 */
+        { 0xb3, 0x00 }, /* B3 DAI2 EQ5 */
+        { 0xb4, 0x00 }, /* B4 DAI2 EQ5 */
+        { 0xb5, 0x00 }, /* B5 DAI2 EQ5 */
+        { 0xb6, 0x00 }, /* B6 DAI1 biquad */
+        { 0xb7, 0x00 }, /* B7 DAI1 biquad */
+        { 0xb8 ,0x00 }, /* B8 DAI1 biquad */
+        { 0xb9, 0x00 }, /* B9 DAI1 biquad */
+        { 0xba, 0x00 }, /* BA DAI1 biquad */
+        { 0xbb, 0x00 }, /* BB DAI1 biquad */
+        { 0xbc, 0x00 }, /* BC DAI1 biquad */
+        { 0xbd, 0x00 }, /* BD DAI1 biquad */
+        { 0xbe, 0x00 }, /* BE DAI1 biquad */
+        { 0xbf, 0x00 }, /* BF DAI1 biquad */
+
+        { 0xc0, 0x00 }, /* C0 DAI2 biquad */
+        { 0xc1, 0x00 }, /* C1 DAI2 biquad */
+        { 0xc2, 0x00 }, /* C2 DAI2 biquad */
+        { 0xc3, 0x00 }, /* C3 DAI2 biquad */
+        { 0xc4, 0x00 }, /* C4 DAI2 biquad */
+        { 0xc5, 0x00 }, /* C5 DAI2 biquad */
+        { 0xc6, 0x00 }, /* C6 DAI2 biquad */
+        { 0xc7, 0x00 }, /* C7 DAI2 biquad */
+        { 0xc8, 0x00 }, /* C8 DAI2 biquad */
+        { 0xc9, 0x00 }, /* C9 DAI2 biquad */
 };
 
 static struct {
@@ -606,11 +536,28 @@ static struct {
        { 0xFF, 0x00, 1 }, /* FF */
 };
 
-static int max98088_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
+static bool max98088_readable_register(struct device *dev, unsigned int reg)
+{
+       return max98088_access[reg].readable;
+}
+
+static bool max98088_volatile_register(struct device *dev, unsigned int reg)
 {
        return max98088_access[reg].vol;
 }
 
+static const struct regmap_config max98088_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .readable_reg = max98088_readable_register,
+        .volatile_reg = max98088_volatile_register,
+        .max_register = 0xff,
+
+        .reg_defaults = max98088_reg,
+        .num_reg_defaults = ARRAY_SIZE(max98088_reg),
+        .cache_type = REGCACHE_RBTREE,
+};
 
 /*
  * Load equalizer DSP coefficient configurations registers
@@ -1610,58 +1557,34 @@ static int max98088_dai2_digital_mute(struct snd_soc_dai *codec_dai, int mute)
        return 0;
 }
 
-static void max98088_sync_cache(struct snd_soc_codec *codec)
-{
-       u8 *reg_cache = codec->reg_cache;
-       int i;
-
-       if (!codec->cache_sync)
-               return;
-
-       codec->cache_only = 0;
-
-       /* write back cached values if they're writeable and
-        * different from the hardware default.
-        */
-       for (i = 1; i < codec->driver->reg_cache_size; i++) {
-               if (!max98088_access[i].writable)
-                       continue;
-
-               if (reg_cache[i] == max98088_reg[i])
-                       continue;
-
-               snd_soc_write(codec, i, reg_cache[i]);
-       }
-
-       codec->cache_sync = 0;
-}
-
 static int max98088_set_bias_level(struct snd_soc_codec *codec,
                                   enum snd_soc_bias_level level)
 {
-       switch (level) {
-       case SND_SOC_BIAS_ON:
-               break;
-
-       case SND_SOC_BIAS_PREPARE:
-               break;
-
-       case SND_SOC_BIAS_STANDBY:
-               if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
-                       max98088_sync_cache(codec);
-
-               snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN,
-                               M98088_MBEN, M98088_MBEN);
-               break;
-
-       case SND_SOC_BIAS_OFF:
-               snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN,
-                               M98088_MBEN, 0);
-               codec->cache_sync = 1;
-               break;
-       }
-       codec->dapm.bias_level = level;
-       return 0;
+        struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
+
+        switch (level) {
+        case SND_SOC_BIAS_ON:
+                break;
+
+        case SND_SOC_BIAS_PREPARE:
+                break;
+
+        case SND_SOC_BIAS_STANDBY:
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
+                        regcache_sync(max98088->regmap);
+
+                snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN,
+                                   M98088_MBEN, M98088_MBEN);
+                break;
+
+        case SND_SOC_BIAS_OFF:
+                snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN,
+                                    M98088_MBEN, 0);
+                regcache_mark_dirty(max98088->regmap);
+                break;
+        }
+        codec->dapm.bias_level = level;
+        return 0;
 }
 
 #define MAX98088_RATES SNDRV_PCM_RATE_8000_96000
@@ -1988,9 +1911,9 @@ static int max98088_probe(struct snd_soc_codec *codec)
        struct max98088_cdata *cdata;
        int ret = 0;
 
-       codec->cache_sync = 1;
+       regcache_mark_dirty(max98088->regmap);
 
-       ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
+       ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
        if (ret != 0) {
                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                return ret;
@@ -2048,9 +1971,6 @@ static int max98088_probe(struct snd_soc_codec *codec)
 
        max98088_handle_pdata(codec);
 
-       snd_soc_add_codec_controls(codec, max98088_snd_controls,
-                            ARRAY_SIZE(max98088_snd_controls));
-
 err_access:
        return ret;
 }
@@ -2066,15 +1986,13 @@ static int max98088_remove(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_max98088 = {
-       .probe   = max98088_probe,
-       .remove  = max98088_remove,
-       .suspend = max98088_suspend,
-       .resume  = max98088_resume,
-       .set_bias_level = max98088_set_bias_level,
-       .reg_cache_size = ARRAY_SIZE(max98088_reg),
-       .reg_word_size = sizeof(u8),
-       .reg_cache_default = max98088_reg,
-       .volatile_register = max98088_volatile_register,
+        .probe   = max98088_probe,
+        .remove  = max98088_remove,
+        .suspend = max98088_suspend,
+        .resume  = max98088_resume,
+        .set_bias_level = max98088_set_bias_level,
+        .controls = max98088_snd_controls,
+        .num_controls = ARRAY_SIZE(max98088_snd_controls),
         .dapm_widgets = max98088_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(max98088_dapm_widgets),
         .dapm_routes = max98088_audio_map,
@@ -2082,7 +2000,7 @@ static struct snd_soc_codec_driver soc_codec_dev_max98088 = {
 };
 
 static int max98088_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+                              const struct i2c_device_id *id)
 {
        struct max98088_priv *max98088;
        int ret;
@@ -2092,6 +2010,10 @@ static int max98088_i2c_probe(struct i2c_client *i2c,
        if (max98088 == NULL)
                return -ENOMEM;
 
+       max98088->regmap = devm_regmap_init_i2c(i2c, &max98088_regmap);
+       if (IS_ERR(max98088->regmap))
+               return PTR_ERR(max98088->regmap);
+
        max98088->devtype = id->driver_data;
 
        i2c_set_clientdata(i2c, max98088);
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 8dbcacd44e6a..8fb072455802 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -39,6 +39,7 @@ struct max98095_cdata {
 };
 
 struct max98095_priv {
+        struct regmap *regmap;
         enum max98095_type devtype;
         struct max98095_pdata *pdata;
         unsigned int sysclk;
@@ -56,263 +57,145 @@ struct max98095_priv {
         struct snd_soc_jack *mic_jack;
 };
 
-static const u8 max98095_reg_def[M98095_REG_CNT] = {
-        0x00, /* 00 */
-        0x00, /* 01 */
-        0x00, /* 02 */
-        0x00, /* 03 */
-        0x00, /* 04 */
-        0x00, /* 05 */
-        0x00, /* 06 */
-        0x00, /* 07 */
-        0x00, /* 08 */
-        0x00, /* 09 */
-        0x00, /* 0A */
-        0x00, /* 0B */
-        0x00, /* 0C */
-        0x00, /* 0D */
-        0x00, /* 0E */
-        0x00, /* 0F */
-        0x00, /* 10 */
-        0x00, /* 11 */
-        0x00, /* 12 */
-        0x00, /* 13 */
-        0x00, /* 14 */
-        0x00, /* 15 */
-        0x00, /* 16 */
-        0x00, /* 17 */
-        0x00, /* 18 */
-        0x00, /* 19 */
-        0x00, /* 1A */
-        0x00, /* 1B */
-        0x00, /* 1C */
-        0x00, /* 1D */
-        0x00, /* 1E */
-        0x00, /* 1F */
-        0x00, /* 20 */
-        0x00, /* 21 */
-        0x00, /* 22 */
-        0x00, /* 23 */
-        0x00, /* 24 */
-        0x00, /* 25 */
-        0x00, /* 26 */
-        0x00, /* 27 */
-        0x00, /* 28 */
-        0x00, /* 29 */
-        0x00, /* 2A */
-        0x00, /* 2B */
-        0x00, /* 2C */
-        0x00, /* 2D */
-        0x00, /* 2E */
-        0x00, /* 2F */
-        0x00, /* 30 */
-        0x00, /* 31 */
-        0x00, /* 32 */
-        0x00, /* 33 */
-        0x00, /* 34 */
-        0x00, /* 35 */
-        0x00, /* 36 */
-        0x00, /* 37 */
-        0x00, /* 38 */
-        0x00, /* 39 */
-        0x00, /* 3A */
-        0x00, /* 3B */
-        0x00, /* 3C */
-        0x00, /* 3D */
-        0x00, /* 3E */
-        0x00, /* 3F */
-        0x00, /* 40 */
-        0x00, /* 41 */
-        0x00, /* 42 */
-        0x00, /* 43 */
-        0x00, /* 44 */
-        0x00, /* 45 */
-        0x00, /* 46 */
-        0x00, /* 47 */
-        0x00, /* 48 */
-        0x00, /* 49 */
-        0x00, /* 4A */
-        0x00, /* 4B */
-        0x00, /* 4C */
-        0x00, /* 4D */
-        0x00, /* 4E */
-        0x00, /* 4F */
-        0x00, /* 50 */
-        0x00, /* 51 */
-        0x00, /* 52 */
-        0x00, /* 53 */
-        0x00, /* 54 */
-        0x00, /* 55 */
-        0x00, /* 56 */
-        0x00, /* 57 */
-        0x00, /* 58 */
-        0x00, /* 59 */
-        0x00, /* 5A */
-        0x00, /* 5B */
-        0x00, /* 5C */
-        0x00, /* 5D */
-        0x00, /* 5E */
-        0x00, /* 5F */
-        0x00, /* 60 */
-        0x00, /* 61 */
-        0x00, /* 62 */
-        0x00, /* 63 */
-        0x00, /* 64 */
-        0x00, /* 65 */
-        0x00, /* 66 */
-        0x00, /* 67 */
-        0x00, /* 68 */
-        0x00, /* 69 */
-        0x00, /* 6A */
-        0x00, /* 6B */
-        0x00, /* 6C */
-        0x00, /* 6D */
-        0x00, /* 6E */
-        0x00, /* 6F */
-        0x00, /* 70 */
-        0x00, /* 71 */
-        0x00, /* 72 */
-        0x00, /* 73 */
-        0x00, /* 74 */
-        0x00, /* 75 */
-        0x00, /* 76 */
-        0x00, /* 77 */
-        0x00, /* 78 */
-        0x00, /* 79 */
-        0x00, /* 7A */
-        0x00, /* 7B */
-        0x00, /* 7C */
-        0x00, /* 7D */
-        0x00, /* 7E */
-        0x00, /* 7F */
-        0x00, /* 80 */
-        0x00, /* 81 */
-        0x00, /* 82 */
-        0x00, /* 83 */
-        0x00, /* 84 */
-        0x00, /* 85 */
-        0x00, /* 86 */
-        0x00, /* 87 */
-        0x00, /* 88 */
-        0x00, /* 89 */
-        0x00, /* 8A */
-        0x00, /* 8B */
-        0x00, /* 8C */
-        0x00, /* 8D */
-        0x00, /* 8E */
-        0x00, /* 8F */
-        0x00, /* 90 */
-        0x00, /* 91 */
-        0x30, /* 92 */
-        0xF0, /* 93 */
-        0x00, /* 94 */
-        0x00, /* 95 */
-        0x3F, /* 96 */
-        0x00, /* 97 */
-        0x00, /* 98 */
-        0x00, /* 99 */
-        0x00, /* 9A */
-        0x00, /* 9B */
-        0x00, /* 9C */
-        0x00, /* 9D */
-        0x00, /* 9E */
-        0x00, /* 9F */
-        0x00, /* A0 */
-        0x00, /* A1 */
-        0x00, /* A2 */
-        0x00, /* A3 */
-        0x00, /* A4 */
-        0x00, /* A5 */
-        0x00, /* A6 */
-        0x00, /* A7 */
-        0x00, /* A8 */
-        0x00, /* A9 */
-        0x00, /* AA */
-        0x00, /* AB */
-        0x00, /* AC */
-        0x00, /* AD */
-        0x00, /* AE */
-        0x00, /* AF */
-        0x00, /* B0 */
-        0x00, /* B1 */
-        0x00, /* B2 */
-        0x00, /* B3 */
-        0x00, /* B4 */
-        0x00, /* B5 */
-        0x00, /* B6 */
-        0x00, /* B7 */
-        0x00, /* B8 */
-        0x00, /* B9 */
-        0x00, /* BA */
-        0x00, /* BB */
-        0x00, /* BC */
-        0x00, /* BD */
-        0x00, /* BE */
-        0x00, /* BF */
-        0x00, /* C0 */
-        0x00, /* C1 */
-        0x00, /* C2 */
-        0x00, /* C3 */
-        0x00, /* C4 */
-        0x00, /* C5 */
-        0x00, /* C6 */
-        0x00, /* C7 */
-        0x00, /* C8 */
-        0x00, /* C9 */
-        0x00, /* CA */
-        0x00, /* CB */
-        0x00, /* CC */
-        0x00, /* CD */
-        0x00, /* CE */
-        0x00, /* CF */
-        0x00, /* D0 */
-        0x00, /* D1 */
-        0x00, /* D2 */
-        0x00, /* D3 */
-        0x00, /* D4 */
-        0x00, /* D5 */
-        0x00, /* D6 */
-        0x00, /* D7 */
-        0x00, /* D8 */
-        0x00, /* D9 */
-        0x00, /* DA */
-        0x00, /* DB */
-        0x00, /* DC */
-        0x00, /* DD */
-        0x00, /* DE */
-        0x00, /* DF */
-        0x00, /* E0 */
-        0x00, /* E1 */
-        0x00, /* E2 */
-        0x00, /* E3 */
-        0x00, /* E4 */
-        0x00, /* E5 */
-        0x00, /* E6 */
-        0x00, /* E7 */
-        0x00, /* E8 */
-        0x00, /* E9 */
-        0x00, /* EA */
-        0x00, /* EB */
-        0x00, /* EC */
-        0x00, /* ED */
-        0x00, /* EE */
-        0x00, /* EF */
-        0x00, /* F0 */
-        0x00, /* F1 */
-        0x00, /* F2 */
-        0x00, /* F3 */
-        0x00, /* F4 */
-        0x00, /* F5 */
-        0x00, /* F6 */
-        0x00, /* F7 */
-        0x00, /* F8 */
-        0x00, /* F9 */
-        0x00, /* FA */
-        0x00, /* FB */
-        0x00, /* FC */
-        0x00, /* FD */
-        0x00, /* FE */
-        0x00, /* FF */
+static const struct reg_default max98095_reg_def[] = {
+        {  0xf, 0x00 }, /* 0F */
+        { 0x10, 0x00 }, /* 10 */
+        { 0x11, 0x00 }, /* 11 */
+        { 0x12, 0x00 }, /* 12 */
+        { 0x13, 0x00 }, /* 13 */
+        { 0x14, 0x00 }, /* 14 */
+        { 0x15, 0x00 }, /* 15 */
+        { 0x16, 0x00 }, /* 16 */
+        { 0x17, 0x00 }, /* 17 */
+        { 0x18, 0x00 }, /* 18 */
+        { 0x19, 0x00 }, /* 19 */
+        { 0x1a, 0x00 }, /* 1A */
+        { 0x1b, 0x00 }, /* 1B */
+        { 0x1c, 0x00 }, /* 1C */
+        { 0x1d, 0x00 }, /* 1D */
+        { 0x1e, 0x00 }, /* 1E */
+        { 0x1f, 0x00 }, /* 1F */
+        { 0x20, 0x00 }, /* 20 */
+        { 0x21, 0x00 }, /* 21 */
+        { 0x22, 0x00 }, /* 22 */
+        { 0x23, 0x00 }, /* 23 */
+        { 0x24, 0x00 }, /* 24 */
+        { 0x25, 0x00 }, /* 25 */
+        { 0x26, 0x00 }, /* 26 */
+        { 0x27, 0x00 }, /* 27 */
+        { 0x28, 0x00 }, /* 28 */
+        { 0x29, 0x00 }, /* 29 */
+        { 0x2a, 0x00 }, /* 2A */
+        { 0x2b, 0x00 }, /* 2B */
+        { 0x2c, 0x00 }, /* 2C */
+        { 0x2d, 0x00 }, /* 2D */
+        { 0x2e, 0x00 }, /* 2E */
+        { 0x2f, 0x00 }, /* 2F */
+        { 0x30, 0x00 }, /* 30 */
+        { 0x31, 0x00 }, /* 31 */
+        { 0x32, 0x00 }, /* 32 */
+        { 0x33, 0x00 }, /* 33 */
+        { 0x34, 0x00 }, /* 34 */
+        { 0x35, 0x00 }, /* 35 */
+        { 0x36, 0x00 }, /* 36 */
+        { 0x37, 0x00 }, /* 37 */
+        { 0x38, 0x00 }, /* 38 */
+        { 0x39, 0x00 }, /* 39 */
+        { 0x3a, 0x00 }, /* 3A */
+        { 0x3b, 0x00 }, /* 3B */
+        { 0x3c, 0x00 }, /* 3C */
+        { 0x3d, 0x00 }, /* 3D */
+        { 0x3e, 0x00 }, /* 3E */
+        { 0x3f, 0x00 }, /* 3F */
+        { 0x40, 0x00 }, /* 40 */
+        { 0x41, 0x00 }, /* 41 */
+        { 0x42, 0x00 }, /* 42 */
+        { 0x43, 0x00 }, /* 43 */
+        { 0x44, 0x00 }, /* 44 */
+        { 0x45, 0x00 }, /* 45 */
+        { 0x46, 0x00 }, /* 46 */
+        { 0x47, 0x00 }, /* 47 */
+        { 0x48, 0x00 }, /* 48 */
+        { 0x49, 0x00 }, /* 49 */
+        { 0x4a, 0x00 }, /* 4A */
+        { 0x4b, 0x00 }, /* 4B */
+        { 0x4c, 0x00 }, /* 4C */
+        { 0x4d, 0x00 }, /* 4D */
+        { 0x4e, 0x00 }, /* 4E */
+        { 0x4f, 0x00 }, /* 4F */
+        { 0x50, 0x00 }, /* 50 */
+        { 0x51, 0x00 }, /* 51 */
+        { 0x52, 0x00 }, /* 52 */
+        { 0x53, 0x00 }, /* 53 */
+        { 0x54, 0x00 }, /* 54 */
+        { 0x55, 0x00 }, /* 55 */
+        { 0x56, 0x00 }, /* 56 */
+        { 0x57, 0x00 }, /* 57 */
+        { 0x58, 0x00 }, /* 58 */
+        { 0x59, 0x00 }, /* 59 */
+        { 0x5a, 0x00 }, /* 5A */
+        { 0x5b, 0x00 }, /* 5B */
+        { 0x5c, 0x00 }, /* 5C */
+        { 0x5d, 0x00 }, /* 5D */
+        { 0x5e, 0x00 }, /* 5E */
+        { 0x5f, 0x00 }, /* 5F */
+        { 0x60, 0x00 }, /* 60 */
+        { 0x61, 0x00 }, /* 61 */
+        { 0x62, 0x00 }, /* 62 */
+        { 0x63, 0x00 }, /* 63 */
+        { 0x64, 0x00 }, /* 64 */
+        { 0x65, 0x00 }, /* 65 */
+        { 0x66, 0x00 }, /* 66 */
+        { 0x67, 0x00 }, /* 67 */
+        { 0x68, 0x00 }, /* 68 */
+        { 0x69, 0x00 }, /* 69 */
+        { 0x6a, 0x00 }, /* 6A */
+        { 0x6b, 0x00 }, /* 6B */
+        { 0x6c, 0x00 }, /* 6C */
+        { 0x6d, 0x00 }, /* 6D */
+        { 0x6e, 0x00 }, /* 6E */
+        { 0x6f, 0x00 }, /* 6F */
+        { 0x70, 0x00 }, /* 70 */
+        { 0x71, 0x00 }, /* 71 */
+        { 0x72, 0x00 }, /* 72 */
+        { 0x73, 0x00 }, /* 73 */
+        { 0x74, 0x00 }, /* 74 */
+        { 0x75, 0x00 }, /* 75 */
+        { 0x76, 0x00 }, /* 76 */
+        { 0x77, 0x00 }, /* 77 */
+        { 0x78, 0x00 }, /* 78 */
+        { 0x79, 0x00 }, /* 79 */
+        { 0x7a, 0x00 }, /* 7A */
+        { 0x7b, 0x00 }, /* 7B */
+        { 0x7c, 0x00 }, /* 7C */
+        { 0x7d, 0x00 }, /* 7D */
+        { 0x7e, 0x00 }, /* 7E */
+        { 0x7f, 0x00 }, /* 7F */
+        { 0x80, 0x00 }, /* 80 */
+        { 0x81, 0x00 }, /* 81 */
+        { 0x82, 0x00 }, /* 82 */
+        { 0x83, 0x00 }, /* 83 */
+        { 0x84, 0x00 }, /* 84 */
+        { 0x85, 0x00 }, /* 85 */
+        { 0x86, 0x00 }, /* 86 */
+        { 0x87, 0x00 }, /* 87 */
+        { 0x88, 0x00 }, /* 88 */
+        { 0x89, 0x00 }, /* 89 */
+        { 0x8a, 0x00 }, /* 8A */
+        { 0x8b, 0x00 }, /* 8B */
+        { 0x8c, 0x00 }, /* 8C */
+        { 0x8d, 0x00 }, /* 8D */
+        { 0x8e, 0x00 }, /* 8E */
+        { 0x8f, 0x00 }, /* 8F */
+        { 0x90, 0x00 }, /* 90 */
+        { 0x91, 0x00 }, /* 91 */
+        { 0x92, 0x30 }, /* 92 */
+        { 0x93, 0xF0 }, /* 93 */
+        { 0x94, 0x00 }, /* 94 */
+        { 0x95, 0x00 }, /* 95 */
+        { 0x96, 0x3F }, /* 96 */
+        { 0x97, 0x00 }, /* 97 */
+        { 0xff, 0x00 }, /* FF */
 };
 
 static struct {
@@ -577,14 +460,14 @@ static struct {
         { 0xFF, 0x00 }, /* FF */
 };
 
-static int max98095_readable(struct snd_soc_codec *codec, unsigned int reg)
+static bool max98095_readable(struct device *dev, unsigned int reg)
 {
         if (reg >= M98095_REG_CNT)
                 return 0;
         return max98095_access[reg].readable != 0;
 }
 
-static int max98095_volatile(struct snd_soc_codec *codec, unsigned int reg)
+static bool max98095_volatile(struct device *dev, unsigned int reg)
 {
         if (reg > M98095_REG_MAX_CACHED)
                 return 1;
@@ -611,22 +494,18 @@ static int max98095_volatile(struct snd_soc_codec *codec, unsigned int reg)
         return 0;
 }
 
-/*
- * Filter coefficients are in a separate register segment
- * and they share the address space of the normal registers.
- * The coefficient registers do not need or share the cache.
- */
-static int max98095_hw_write(struct snd_soc_codec *codec, unsigned int reg,
-                             unsigned int value)
-{
-        int ret;
+static const struct regmap_config max98095_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
 
-        codec->cache_bypass = 1;
-        ret = snd_soc_write(codec, reg, value);
-        codec->cache_bypass = 0;
+        .reg_defaults = max98095_reg_def,
+        .num_reg_defaults = ARRAY_SIZE(max98095_reg_def),
+        .max_register = M98095_0FF_REV_ID,
+        .cache_type = REGCACHE_RBTREE,
 
-        return ret ? -EIO : 0;
-}
+        .readable_reg = max98095_readable,
+        .volatile_reg = max98095_volatile,
+};
 
 /*
  * Load equalizer DSP coefficient configurations registers
@@ -648,8 +527,8 @@ static void m98095_eq_band(struct snd_soc_codec *codec, unsigned int dai,
 
         /* Step through the registers and coefs */
         for (i = 0; i < M98095_COEFS_PER_BAND; i++) {
-                max98095_hw_write(codec, eq_reg++, M98095_BYTE1(coefs[i]));
-                max98095_hw_write(codec, eq_reg++, M98095_BYTE0(coefs[i]));
+                snd_soc_write(codec, eq_reg++, M98095_BYTE1(coefs[i]));
+                snd_soc_write(codec, eq_reg++, M98095_BYTE0(coefs[i]));
         }
 }
 
@@ -673,8 +552,8 @@ static void m98095_biquad_band(struct snd_soc_codec *codec, unsigned int dai,
 
         /* Step through the registers and coefs */
         for (i = 0; i < M98095_COEFS_PER_BAND; i++) {
-                max98095_hw_write(codec, bq_reg++, M98095_BYTE1(coefs[i]));
-                max98095_hw_write(codec, bq_reg++, M98095_BYTE0(coefs[i]));
+                snd_soc_write(codec, bq_reg++, M98095_BYTE1(coefs[i]));
+                snd_soc_write(codec, bq_reg++, M98095_BYTE0(coefs[i]));
         }
 }
 
@@ -1285,14 +1164,6 @@ static const struct snd_soc_dapm_route max98095_audio_map[] = {
         {"MIC2 Input", NULL, "MIC2"},
 };
 
-static int max98095_add_widgets(struct snd_soc_codec *codec)
-{
-        snd_soc_add_codec_controls(codec, max98095_snd_controls,
-                             ARRAY_SIZE(max98095_snd_controls));
-
-        return 0;
-}
-
 /* codec mclk clock divider coefficients */
 static const struct {
         u32 rate;
@@ -1748,6 +1619,7 @@ static int max98095_dai3_set_fmt(struct snd_soc_dai *codec_dai,
 static int max98095_set_bias_level(struct snd_soc_codec *codec,
                                    enum snd_soc_bias_level level)
 {
+        struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
         switch (level) {
@@ -1759,7 +1631,7 @@ static int max98095_set_bias_level(struct snd_soc_codec *codec,
 
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
-                        ret = snd_soc_cache_sync(codec);
+                        ret = regcache_sync(max98095->regmap);
 
                         if (ret != 0) {
                                 dev_err(codec->dev, "Failed to sync cache: %d\n", ret);
@@ -1774,7 +1646,7 @@ static int max98095_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_OFF:
                 snd_soc_update_bits(codec, M98095_090_PWR_EN_IN,
                                 M98095_MBEN, 0);
-                codec->cache_sync = 1;
+                regcache_mark_dirty(max98095->regmap);
                 break;
         }
         codec->dapm.bias_level = level;
@@ -2341,7 +2213,7 @@ static int max98095_reset(struct snd_soc_codec *codec)
         /* Reset to hardware default for registers, as there is not
          * a soft reset hardware control register */
         for (i = M98095_010_HOST_INT_CFG; i < M98095_REG_MAX_CACHED; i++) {
-                ret = snd_soc_write(codec, i, max98095_reg_def[i]);
+                ret = snd_soc_write(codec, i, snd_soc_read(codec, i));
                 if (ret < 0) {
                         dev_err(codec->dev, "Failed to reset: %d\n", ret);
                         return ret;
@@ -2358,7 +2230,7 @@ static int max98095_probe(struct snd_soc_codec *codec)
         struct i2c_client *client;
         int ret = 0;
 
-        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
+        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -2447,8 +2319,6 @@ static int max98095_probe(struct snd_soc_codec *codec)
         snd_soc_update_bits(codec, M98095_097_PWR_SYS, M98095_SHDNRUN,
                 M98095_SHDNRUN);
 
-        max98095_add_widgets(codec);
-
         return 0;
 
 err_irq:
@@ -2480,11 +2350,8 @@ static struct snd_soc_codec_driver soc_codec_dev_max98095 = {
         .suspend = max98095_suspend,
         .resume  = max98095_resume,
         .set_bias_level = max98095_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(max98095_reg_def),
-        .reg_word_size = sizeof(u8),
-        .reg_cache_default = max98095_reg_def,
-        .readable_register = max98095_readable,
-        .volatile_register = max98095_volatile,
+        .controls = max98095_snd_controls,
+        .num_controls = ARRAY_SIZE(max98095_snd_controls),
         .dapm_widgets     = max98095_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(max98095_dapm_widgets),
         .dapm_routes     = max98095_audio_map,
@@ -2502,6 +2369,13 @@ static int max98095_i2c_probe(struct i2c_client *i2c,
         if (max98095 == NULL)
                 return -ENOMEM;
 
+        max98095->regmap = devm_regmap_init_i2c(i2c, &max98095_regmap);
+        if (IS_ERR(max98095->regmap)) {
+                ret = PTR_ERR(max98095->regmap);
+                dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
+                return ret;
+        }
+
         max98095->devtype = id->driver_data;
         i2c_set_clientdata(i2c, max98095);
         max98095->pdata = i2c->dev.platform_data;
diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c
index 58c38a5b481c..c5dd61785f8d 100644
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/slab.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -27,18 +28,26 @@
 #include "max9850.h"
 
 struct max9850_priv {
+        struct regmap *regmap;
         unsigned int sysclk;
 };
 
 /* max9850 register cache */
-static const u8 max9850_reg[MAX9850_CACHEREGNUM] = {
-        0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+static const struct reg_default max9850_reg[] = {
+        {  2, 0x0c },
+        {  3, 0x00 },
+        {  4, 0x00 },
+        {  5, 0x00 },
+        {  6, 0x00 },
+        {  7, 0x00 },
+        {  8, 0x00 },
+        {  9, 0x00 },
+        { 10, 0x00 },
 };
 
 /* these registers are not used at the moment but provided for the sake of
  * completeness */
-static int max9850_volatile_register(struct snd_soc_codec *codec,
-                unsigned int reg)
+static bool max9850_volatile_register(struct device *dev, unsigned int reg)
 {
         switch (reg) {
         case MAX9850_STATUSA:
@@ -49,6 +58,15 @@ static int max9850_volatile_register(struct snd_soc_codec *codec,
         }
 }
 
+static const struct regmap_config max9850_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .max_register = MAX9850_DIGITAL_AUDIO,
+        .volatile_reg = max9850_volatile_register,
+        .cache_type = REGCACHE_RBTREE,
+};
+
 static const unsigned int max9850_tlv[] = {
         TLV_DB_RANGE_HEAD(4),
         0x18, 0x1f, TLV_DB_SCALE_ITEM(-7450, 400, 0),
@@ -225,6 +243,7 @@ static int max9850_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 static int max9850_set_bias_level(struct snd_soc_codec *codec,
                                   enum snd_soc_bias_level level)
 {
+        struct max9850_priv *max9850 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
         switch (level) {
@@ -234,7 +253,7 @@ static int max9850_set_bias_level(struct snd_soc_codec *codec,
                 break;
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
-                        ret = snd_soc_cache_sync(codec);
+                        ret = regcache_sync(max9850->regmap);
                         if (ret) {
                                 dev_err(codec->dev,
                                         "Failed to sync cache: %d\n", ret);
@@ -295,7 +314,7 @@ static int max9850_probe(struct snd_soc_codec *codec)
 {
         int ret;
 
-        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
+        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -316,10 +335,6 @@ static struct snd_soc_codec_driver soc_codec_dev_max9850 = {
         .suspend =      max9850_suspend,
         .resume =       max9850_resume,
         .set_bias_level = max9850_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(max9850_reg),
-        .reg_word_size = sizeof(u8),
-        .reg_cache_default = max9850_reg,
-        .volatile_register = max9850_volatile_register,
 
         .controls = max9850_controls,
         .num_controls = ARRAY_SIZE(max9850_controls),
@@ -340,6 +355,10 @@ static int max9850_i2c_probe(struct i2c_client *i2c,
         if (max9850 == NULL)
                 return -ENOMEM;
 
+        max9850->regmap = devm_regmap_init_i2c(i2c, &max9850_regmap);
+        if (IS_ERR(max9850->regmap))
+                return PTR_ERR(max9850->regmap);
+
         i2c_set_clientdata(i2c, max9850);
 
         ret = snd_soc_register_codec(&i2c->dev,
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index ea141e1d6f28..f5472adee674 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -30,16 +30,10 @@
 #include <sound/soc.h>
 #include <sound/initval.h>
 #include <sound/soc-dapm.h>
+#include <linux/regmap.h>
 
 #include "mc13783.h"
 
-#define MC13783_AUDIO_RX0       36
-#define MC13783_AUDIO_RX1       37
-#define MC13783_AUDIO_TX        38
-#define MC13783_SSI_NETWORK     39
-#define MC13783_AUDIO_CODEC     40
-#define MC13783_AUDIO_DAC       41
-
 #define AUDIO_RX0_ALSPEN                (1 << 5)
 #define AUDIO_RX0_ALSPSEL               (1 << 7)
 #define AUDIO_RX0_ADDCDC                (1 << 21)
@@ -95,45 +89,12 @@
 
 struct mc13783_priv {
         struct mc13xxx *mc13xxx;
+        struct regmap *regmap;
 
         enum mc13783_ssi_port adc_ssi_port;
         enum mc13783_ssi_port dac_ssi_port;
 };
 
-static unsigned int mc13783_read(struct snd_soc_codec *codec,
-        unsigned int reg)
-{
-        struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);
-        unsigned int value = 0;
-
-        mc13xxx_lock(priv->mc13xxx);
-
-        mc13xxx_reg_read(priv->mc13xxx, reg, &value);
-
-        mc13xxx_unlock(priv->mc13xxx);
-
-        return value;
-}
-
-static int mc13783_write(struct snd_soc_codec *codec,
-        unsigned int reg, unsigned int value)
-{
-        struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);
-        int ret;
-
-        mc13xxx_lock(priv->mc13xxx);
-
-        ret = mc13xxx_reg_write(priv->mc13xxx, reg, value);
-
-        /* include errata fix for spi audio problems */
-        if (reg == MC13783_AUDIO_CODEC || reg == MC13783_AUDIO_DAC)
-                ret = mc13xxx_reg_write(priv->mc13xxx, reg, value);
-
-        mc13xxx_unlock(priv->mc13xxx);
-
-        return ret;
-}
-
 /* Mapping between sample rates and register value */
 static unsigned int mc13783_rates[] = {
         8000, 11025, 12000, 16000,
@@ -466,6 +427,29 @@ static const struct snd_kcontrol_new right_input_mux =
 static const struct snd_kcontrol_new samp_ctl =
         SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 3, 1, 0);
 
+static const char * const speaker_amp_source_text[] = {
+        "CODEC", "Right"
+};
+static const SOC_ENUM_SINGLE_DECL(speaker_amp_source, MC13783_AUDIO_RX0, 4,
+                                  speaker_amp_source_text);
+static const struct snd_kcontrol_new speaker_amp_source_mux =
+        SOC_DAPM_ENUM("Speaker Amp Source MUX", speaker_amp_source);
+
+static const char * const headset_amp_source_text[] = {
+        "CODEC", "Mixer"
+};
+
+static const SOC_ENUM_SINGLE_DECL(headset_amp_source, MC13783_AUDIO_RX0, 11,
+                                  headset_amp_source_text);
+static const struct snd_kcontrol_new headset_amp_source_mux =
+        SOC_DAPM_ENUM("Headset Amp Source MUX", headset_amp_source);
+
+static const struct snd_kcontrol_new cdcout_ctl =
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 18, 1, 0);
+
+static const struct snd_kcontrol_new adc_bypass_ctl =
+        SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_CODEC, 16, 1, 0);
+
 static const struct snd_kcontrol_new lamp_ctl =
         SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 5, 1, 0);
 
@@ -503,12 +487,22 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = {
         SND_SOC_DAPM_VIRT_MUX("PGA Right Input Mux", SND_SOC_NOPM, 0, 0,
                               &right_input_mux),
 
+        SND_SOC_DAPM_MUX("Speaker Amp Source MUX", SND_SOC_NOPM, 0, 0,
+                         &speaker_amp_source_mux),
+
+        SND_SOC_DAPM_MUX("Headset Amp Source MUX", SND_SOC_NOPM, 0, 0,
+                         &headset_amp_source_mux),
+
         SND_SOC_DAPM_PGA("PGA Left Input", SND_SOC_NOPM, 0, 0, NULL, 0),
         SND_SOC_DAPM_PGA("PGA Right Input", SND_SOC_NOPM, 0, 0, NULL, 0),
 
         SND_SOC_DAPM_ADC("ADC", "Capture", MC13783_AUDIO_CODEC, 11, 0),
         SND_SOC_DAPM_SUPPLY("ADC_Reset", MC13783_AUDIO_CODEC, 15, 0, NULL, 0),
 
+        SND_SOC_DAPM_PGA("Voice CODEC PGA", MC13783_AUDIO_RX1, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SWITCH("Voice CODEC Bypass", MC13783_AUDIO_CODEC, 16, 0,
+                        &adc_bypass_ctl),
+
 /* Output */
         SND_SOC_DAPM_SUPPLY("DAC_E", MC13783_AUDIO_DAC, 11, 0, NULL, 0),
         SND_SOC_DAPM_SUPPLY("DAC_Reset", MC13783_AUDIO_DAC, 15, 0, NULL, 0),
@@ -516,10 +510,15 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("RXOUTR"),
         SND_SOC_DAPM_OUTPUT("HSL"),
         SND_SOC_DAPM_OUTPUT("HSR"),
+        SND_SOC_DAPM_OUTPUT("LSPL"),
         SND_SOC_DAPM_OUTPUT("LSP"),
         SND_SOC_DAPM_OUTPUT("SP"),
+        SND_SOC_DAPM_OUTPUT("CDCOUT"),
 
-        SND_SOC_DAPM_SWITCH("Speaker Amp", MC13783_AUDIO_RX0, 3, 0, &samp_ctl),
+        SND_SOC_DAPM_SWITCH("CDCOUT Switch", MC13783_AUDIO_RX0, 18, 0,
+                        &cdcout_ctl),
+        SND_SOC_DAPM_SWITCH("Speaker Amp Switch", MC13783_AUDIO_RX0, 3, 0,
+                        &samp_ctl),
         SND_SOC_DAPM_SWITCH("Loudspeaker Amp", SND_SOC_NOPM, 0, 0, &lamp_ctl),
         SND_SOC_DAPM_SWITCH("Headset Amp Left", MC13783_AUDIO_RX0, 10, 0,
                         &hlamp_ctl),
@@ -554,20 +553,28 @@ static struct snd_soc_dapm_route mc13783_routes[] = {
         { "ADC", NULL, "PGA Right Input"},
         { "ADC", NULL, "ADC_Reset"},
 
+        { "Voice CODEC PGA", "Voice CODEC Bypass", "ADC" },
+
+        { "Speaker Amp Source MUX", "CODEC", "Voice CODEC PGA"},
+        { "Speaker Amp Source MUX", "Right", "DAC PGA"},
+
+        { "Headset Amp Source MUX", "CODEC", "Voice CODEC PGA"},
+        { "Headset Amp Source MUX", "Mixer", "DAC PGA"},
+
 /* Output */
         { "HSL", NULL, "Headset Amp Left" },
         { "HSR", NULL, "Headset Amp Right"},
         { "RXOUTL", NULL, "Line out Amp Left"},
         { "RXOUTR", NULL, "Line out Amp Right"},
-        { "SP", NULL, "Speaker Amp"},
-        { "Speaker Amp", NULL, "DAC PGA"},
-        { "LSP", NULL, "DAC PGA"},
-        { "Headset Amp Left", NULL, "DAC PGA"},
-        { "Headset Amp Right", NULL, "DAC PGA"},
+        { "SP", "Speaker Amp Switch", "Speaker Amp Source MUX"},
+        { "LSP", "Loudspeaker Amp", "Speaker Amp Source MUX"},
+        { "HSL", "Headset Amp Left", "Headset Amp Source MUX"},
+        { "HSR", "Headset Amp Right", "Headset Amp Source MUX"},
         { "Line out Amp Left", NULL, "DAC PGA"},
         { "Line out Amp Right", NULL, "DAC PGA"},
         { "DAC PGA", NULL, "DAC"},
         { "DAC", NULL, "DAC_E"},
+        { "CDCOUT", "CDCOUT Switch", "Voice CODEC PGA"},
 };
 
 static const char * const mc13783_3d_mixer[] = {"Stereo", "Phase Mix",
@@ -580,15 +587,39 @@ static const struct soc_enum mc13783_enum_3d_mixer =
 static struct snd_kcontrol_new mc13783_control_list[] = {
         SOC_SINGLE("Loudspeaker enable", MC13783_AUDIO_RX0, 5, 1, 0),
         SOC_SINGLE("PCM Playback Volume", MC13783_AUDIO_RX1, 6, 15, 0),
+        SOC_SINGLE("PCM Playback Switch", MC13783_AUDIO_RX1, 5, 1, 0),
         SOC_DOUBLE("PCM Capture Volume", MC13783_AUDIO_TX, 19, 14, 31, 0),
         SOC_ENUM("3D Control", mc13783_enum_3d_mixer),
+
+        SOC_SINGLE("CDCOUT Switch", MC13783_AUDIO_RX0, 18, 1, 0),
+        SOC_SINGLE("Earpiece Amp Switch", MC13783_AUDIO_RX0, 3, 1, 0),
+        SOC_DOUBLE("Headset Amp Switch", MC13783_AUDIO_RX0, 10, 9, 1, 0),
+        SOC_DOUBLE("Line out Amp Switch", MC13783_AUDIO_RX0, 16, 15, 1, 0),
+
+        SOC_SINGLE("PCM Capture Mixin Switch", MC13783_AUDIO_RX0, 22, 1, 0),
+        SOC_SINGLE("Line in Capture Mixin Switch", MC13783_AUDIO_RX0, 23, 1, 0),
+
+        SOC_SINGLE("CODEC Capture Volume", MC13783_AUDIO_RX1, 1, 15, 0),
+        SOC_SINGLE("CODEC Capture Mixin Switch", MC13783_AUDIO_RX0, 21, 1, 0),
+
+        SOC_SINGLE("Line in Capture Volume", MC13783_AUDIO_RX1, 12, 15, 0),
+        SOC_SINGLE("Line in Capture Switch", MC13783_AUDIO_RX1, 10, 1, 0),
+
+        SOC_SINGLE("MC1 Capture Bias Switch", MC13783_AUDIO_TX, 0, 1, 0),
+        SOC_SINGLE("MC2 Capture Bias Switch", MC13783_AUDIO_TX, 1, 1, 0),
 };
 
 static int mc13783_probe(struct snd_soc_codec *codec)
 {
         struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);
+        int ret;
 
-        mc13xxx_lock(priv->mc13xxx);
+        codec->control_data = dev_get_regmap(codec->dev->parent, NULL);
+        ret = snd_soc_codec_set_cache_io(codec, 8, 24, SND_SOC_REGMAP);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
+                return ret;
+        }
 
         /* these are the reset values */
         mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX0, 0x25893);
@@ -612,8 +643,6 @@ static int mc13783_probe(struct snd_soc_codec *codec)
                 mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_DAC,
                                 0, AUDIO_SSI_SEL);
 
-        mc13xxx_unlock(priv->mc13xxx);
-
         return 0;
 }
 
@@ -621,13 +650,9 @@ static int mc13783_remove(struct snd_soc_codec *codec)
 {
         struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);
 
-        mc13xxx_lock(priv->mc13xxx);
-
         /* Make sure VAUDIOON is off */
         mc13xxx_reg_rmw(priv->mc13xxx, MC13783_AUDIO_RX0, 0x3, 0);
 
-        mc13xxx_unlock(priv->mc13xxx);
-
         return 0;
 }
 
@@ -717,8 +742,6 @@ static struct snd_soc_dai_driver mc13783_dai_sync[] = {
 static struct snd_soc_codec_driver soc_codec_dev_mc13783 = {
         .probe          = mc13783_probe,
         .remove         = mc13783_remove,
-        .read           = mc13783_read,
-        .write          = mc13783_write,
         .controls       = mc13783_control_list,
         .num_controls   = ARRAY_SIZE(mc13783_control_list),
         .dapm_widgets   = mc13783_dapm_widgets,
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index 651ce0923675..73f9c3630e2c 100644
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -21,6 +21,7 @@
 #include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <sound/pcm.h>
@@ -270,7 +271,7 @@ MODULE_DEVICE_TABLE(of, pcm1681_dt_ids);
 static const struct regmap_config pcm1681_regmap = {
         .reg_bits               = 8,
         .val_bits               = 8,
-        .max_register           = ARRAY_SIZE(pcm1681_reg_defaults) + 1,
+        .max_register           = 0x13,
         .reg_defaults           = pcm1681_reg_defaults,
         .num_reg_defaults       = ARRAY_SIZE(pcm1681_reg_defaults),
         .writeable_reg          = pcm1681_writeable_reg,
diff --git a/sound/soc/codecs/pcm1792a.c b/sound/soc/codecs/pcm1792a.c
index 2a8eccf64c76..7146653a8e16 100644
--- a/sound/soc/codecs/pcm1792a.c
+++ b/sound/soc/codecs/pcm1792a.c
@@ -28,6 +28,7 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 #include <sound/tlv.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 
 #include "pcm1792a.h"
@@ -188,7 +189,7 @@ MODULE_DEVICE_TABLE(of, pcm1792a_of_match);
 static const struct regmap_config pcm1792a_regmap = {
         .reg_bits               = 8,
         .val_bits               = 8,
-        .max_register           = 24,
+        .max_register           = 23,
         .reg_defaults           = pcm1792a_reg_defaults,
         .num_reg_defaults       = ARRAY_SIZE(pcm1792a_reg_defaults),
         .writeable_reg          = pcm1792a_writeable_reg,
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index c26a8f814b18..4d041d376f31 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -21,6 +21,7 @@
 #include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
+#include <linux/acpi.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -926,7 +927,7 @@ static int rt5640_set_dmic2_event(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
-void hp_amp_power_on(struct snd_soc_codec *codec)
+static void hp_amp_power_on(struct snd_soc_codec *codec)
 {
         struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
 
@@ -1609,7 +1610,8 @@ static int rt5640_hw_params(struct snd_pcm_substream *substream,
         rt5640->lrck[dai->id] = params_rate(params);
         pre_div = get_clk_info(rt5640->sysclk, rt5640->lrck[dai->id]);
         if (pre_div < 0) {
-                dev_err(codec->dev, "Unsupported clock setting\n");
+                dev_err(codec->dev, "Unsupported clock setting %d for DAI %d\n",
+                        rt5640->lrck[dai->id], dai->id);
                 return -EINVAL;
         }
         frame_size = snd_soc_params_to_frame_size(params);
@@ -1977,13 +1979,20 @@ static int rt5640_suspend(struct snd_soc_codec *codec)
         rt5640_reset(codec);
         regcache_cache_only(rt5640->regmap, true);
         regcache_mark_dirty(rt5640->regmap);
+        if (gpio_is_valid(rt5640->pdata.ldo1_en))
+                gpio_set_value_cansleep(rt5640->pdata.ldo1_en, 0);
 
         return 0;
 }
 
 static int rt5640_resume(struct snd_soc_codec *codec)
 {
-        rt5640_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+        struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
+
+        if (gpio_is_valid(rt5640->pdata.ldo1_en)) {
+                gpio_set_value_cansleep(rt5640->pdata.ldo1_en, 1);
+                msleep(400);
+        }
 
         return 0;
 }
@@ -2080,6 +2089,14 @@ static const struct i2c_device_id rt5640_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id);
 
+#ifdef CONFIG_ACPI
+static struct acpi_device_id rt5640_acpi_match[] = {
+        { "INT33CA", 0 },
+        { },
+};
+MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match);
+#endif
+
 static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np)
 {
         rt5640->pdata.in1_diff = of_property_read_bool(np,
@@ -2199,6 +2216,7 @@ static struct i2c_driver rt5640_i2c_driver = {
         .driver = {
                 .name = "rt5640",
                 .owner = THIS_MODULE,
+                .acpi_match_table = ACPI_PTR(rt5640_acpi_match),
         },
         .probe = rt5640_i2c_probe,
         .remove   = rt5640_i2c_remove,
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c
index 38f3b105c17d..52e7cb08434b 100644
--- a/sound/soc/codecs/si476x.c
+++ b/sound/soc/codecs/si476x.c
@@ -60,48 +60,6 @@ enum si476x_pcm_format {
         SI476X_PCM_FORMAT_S24_LE        = 6,
 };
 
-static unsigned int si476x_codec_read(struct snd_soc_codec *codec,
-                                      unsigned int reg)
-{
-        int err;
-        unsigned int val;
-        struct si476x_core *core = codec->control_data;
-
-        si476x_core_lock(core);
-        if (!si476x_core_is_powered_up(core))
-                regcache_cache_only(core->regmap, true);
-
-        err = regmap_read(core->regmap, reg, &val);
-
-        if (!si476x_core_is_powered_up(core))
-                regcache_cache_only(core->regmap, false);
-        si476x_core_unlock(core);
-
-        if (err < 0)
-                return err;
-
-        return val;
-}
-
-static int si476x_codec_write(struct snd_soc_codec *codec,
-                              unsigned int reg, unsigned int val)
-{
-        int err;
-        struct si476x_core *core = codec->control_data;
-
-        si476x_core_lock(core);
-        if (!si476x_core_is_powered_up(core))
-                regcache_cache_only(core->regmap, true);
-
-        err = regmap_write(core->regmap, reg, val);
-
-        if (!si476x_core_is_powered_up(core))
-                regcache_cache_only(core->regmap, false);
-        si476x_core_unlock(core);
-
-        return err;
-}
-
 static const struct snd_soc_dapm_widget si476x_dapm_widgets[] = {
 SND_SOC_DAPM_OUTPUT("LOUT"),
 SND_SOC_DAPM_OUTPUT("ROUT"),
@@ -115,6 +73,7 @@ static const struct snd_soc_dapm_route si476x_dapm_routes[] = {
 static int si476x_codec_set_dai_fmt(struct snd_soc_dai *codec_dai,
                                     unsigned int fmt)
 {
+        struct si476x_core *core = i2c_mfd_cell_to_core(codec_dai->dev);
         int err;
         u16 format = 0;
 
@@ -178,9 +137,14 @@ static int si476x_codec_set_dai_fmt(struct snd_soc_dai *codec_dai,
                 return -EINVAL;
         }
 
+        si476x_core_lock(core);
+
         err = snd_soc_update_bits(codec_dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
                                   SI476X_DIGITAL_IO_OUTPUT_FORMAT_MASK,
                                   format);
+
+        si476x_core_unlock(core);
+
         if (err < 0) {
                 dev_err(codec_dai->codec->dev, "Failed to set output format\n");
                 return err;
@@ -193,6 +157,7 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream,
                                   struct snd_pcm_hw_params *params,
                                   struct snd_soc_dai *dai)
 {
+        struct si476x_core *core = i2c_mfd_cell_to_core(dai->dev);
         int rate, width, err;
 
         rate = params_rate(params);
@@ -218,11 +183,13 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
+        si476x_core_lock(core);
+
         err = snd_soc_write(dai->codec, SI476X_DIGITAL_IO_OUTPUT_SAMPLE_RATE,
                             rate);
         if (err < 0) {
                 dev_err(dai->codec->dev, "Failed to set sample rate\n");
-                return err;
+                goto out;
         }
 
         err = snd_soc_update_bits(dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
@@ -231,15 +198,18 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream,
                                   (width << SI476X_DIGITAL_IO_SAMPLE_SIZE_SHIFT));
         if (err < 0) {
                 dev_err(dai->codec->dev, "Failed to set output width\n");
-                return err;
+                goto out;
         }
 
-        return 0;
+out:
+        si476x_core_unlock(core);
+
+        return err;
 }
 
 static int si476x_codec_probe(struct snd_soc_codec *codec)
 {
-        codec->control_data = i2c_mfd_cell_to_core(codec->dev);
+        codec->control_data = dev_get_regmap(codec->dev->parent, NULL);
         return 0;
 }
 
@@ -268,8 +238,6 @@ static struct snd_soc_dai_driver si476x_dai = {
 
 static struct snd_soc_codec_driver soc_codec_dev_si476x = {
         .probe  = si476x_codec_probe,
-        .read   = si476x_codec_read,
-        .write  = si476x_codec_write,
         .dapm_widgets = si476x_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets),
         .dapm_routes = si476x_dapm_routes,
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index dba26e63844e..13045f2af4d3 100644
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -164,30 +164,28 @@ static unsigned int sn95031_get_mic_bias(struct snd_soc_codec *codec)
 }
 /*end - adc helper functions */
 
-static inline unsigned int sn95031_read(struct snd_soc_codec *codec,
-                        unsigned int reg)
+static int sn95031_read(void *ctx, unsigned int reg, unsigned int *val)
 {
         u8 value = 0;
         int ret;
 
         ret = intel_scu_ipc_ioread8(reg, &value);
-        if (ret)
-                pr_err("read of %x failed, err %d\n", reg, ret);
-        return value;
+        if (ret == 0)
+                *val = value;
 
+        return ret;
 }
 
-static inline int sn95031_write(struct snd_soc_codec *codec,
-                        unsigned int reg, unsigned int value)
+static int sn95031_write(void *ctx, unsigned int reg, unsigned int value)
 {
-        int ret;
-
-        ret = intel_scu_ipc_iowrite8(reg, value);
-        if (ret)
-                pr_err("write of %x failed, err %d\n", reg, ret);
-        return ret;
+        return intel_scu_ipc_iowrite8(reg, value);
 }
 
+static const struct regmap_config sn95031_regmap = {
+        .reg_read = sn95031_read,
+        .reg_write = sn95031_write,
+};
+
 static int sn95031_set_vaud_bias(struct snd_soc_codec *codec,
                 enum snd_soc_bias_level level)
 {
@@ -827,6 +825,8 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec)
 {
         pr_debug("codec_probe called\n");
 
+        snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);
+
         /* PCM interface config
          * This sets the pcm rx slot conguration to max 6 slots
          * for max 4 dais (2 stereo and 2 mono)
@@ -886,8 +886,6 @@ static int sn95031_codec_remove(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver sn95031_codec = {
         .probe          = sn95031_codec_probe,
         .remove         = sn95031_codec_remove,
-        .read           = sn95031_read,
-        .write          = sn95031_write,
         .set_bias_level = sn95031_set_vaud_bias,
         .idle_bias_off  = true,
         .dapm_widgets   = sn95031_dapm_widgets,
@@ -898,7 +896,14 @@ static struct snd_soc_codec_driver sn95031_codec = {
 
 static int sn95031_device_probe(struct platform_device *pdev)
 {
+        struct regmap *regmap;
+
         pr_debug("codec device probe called for %s\n", dev_name(&pdev->dev));
+
+        regmap = devm_regmap_init(&pdev->dev, NULL, NULL, &sn95031_regmap);
+        if (IS_ERR(regmap))
+                return PTR_ERR(regmap);
+
         return snd_soc_register_codec(&pdev->dev, &sn95031_codec,
                         sn95031_dais, ARRAY_SIZE(sn95031_dais));
 }
diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
index 6d31d88f7204..fe4d29d88564 100644
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -37,6 +37,7 @@
 #include <linux/i2c.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <sound/pcm.h>
@@ -244,6 +245,8 @@ struct tas5086_private {
         unsigned int    mclk, sclk;
         unsigned int    format;
         bool            deemph;
+        unsigned int    charge_period;
+        unsigned int    pwm_start_mid_z;
         /* Current sample rate for de-emphasis control */
         int             rate;
         /* GPIO driving Reset pin, if any */
@@ -456,6 +459,75 @@ static int tas5086_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
         return regmap_write(priv->regmap, TAS5086_SOFT_MUTE, val);
 }
 
+static void tas5086_reset(struct tas5086_private *priv)
+{
+        if (gpio_is_valid(priv->gpio_nreset)) {
+                /* Reset codec - minimum assertion time is 400ns */
+                gpio_direction_output(priv->gpio_nreset, 0);
+                udelay(1);
+                gpio_set_value(priv->gpio_nreset, 1);
+
+                /* Codec needs ~15ms to wake up */
+                msleep(15);
+        }
+}
+
+/* charge period values in microseconds */
+static const int tas5086_charge_period[] = {
+          13000,  16900,   23400,   31200,   41600,   54600,   72800,   96200,
+         130000, 156000,  234000,  312000,  416000,  546000,  728000,  962000,
+        1300000, 169000, 2340000, 3120000, 4160000, 5460000, 7280000, 9620000,
+};
+
+static int tas5086_init(struct device *dev, struct tas5086_private *priv)
+{
+        int ret, i;
+
+        /*
+         * If any of the channels is configured to start in Mid-Z mode,
+         * configure 'part 1' of the PWM starts to use Mid-Z, and tell
+         * all configured mid-z channels to start start under 'part 1'.
+         */
+        if (priv->pwm_start_mid_z)
+                regmap_write(priv->regmap, TAS5086_PWM_START,
+                             TAS5086_PWM_START_MIDZ_FOR_START_1 |
+                                priv->pwm_start_mid_z);
+
+        /* lookup and set split-capacitor charge period */
+        if (priv->charge_period == 0) {
+                regmap_write(priv->regmap, TAS5086_SPLIT_CAP_CHARGE, 0);
+        } else {
+                i = index_in_array(tas5086_charge_period,
+                                   ARRAY_SIZE(tas5086_charge_period),
+                                   priv->charge_period);
+                if (i >= 0)
+                        regmap_write(priv->regmap, TAS5086_SPLIT_CAP_CHARGE,
+                                     i + 0x08);
+                else
+                        dev_warn(dev,
+                                 "Invalid split-cap charge period of %d ns.\n",
+                                 priv->charge_period);
+        }
+
+        /* enable factory trim */
+        ret = regmap_write(priv->regmap, TAS5086_OSC_TRIM, 0x00);
+        if (ret < 0)
+                return ret;
+
+        /* start all channels */
+        ret = regmap_write(priv->regmap, TAS5086_SYS_CONTROL_2, 0x20);
+        if (ret < 0)
+                return ret;
+
+        /* mute all channels for now */
+        ret = regmap_write(priv->regmap, TAS5086_SOFT_MUTE,
+                           TAS5086_SOFT_MUTE_ALL);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
 /* TAS5086 controls */
 static const DECLARE_TLV_DB_SCALE(tas5086_dac_tlv, -10350, 50, 1);
 
@@ -691,14 +763,39 @@ static struct snd_soc_dai_driver tas5086_dai = {
 };
 
 #ifdef CONFIG_PM
+static int tas5086_soc_suspend(struct snd_soc_codec *codec)
+{
+        struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        /* Shut down all channels */
+        ret = regmap_write(priv->regmap, TAS5086_SYS_CONTROL_2, 0x60);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
 static int tas5086_soc_resume(struct snd_soc_codec *codec)
 {
         struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        tas5086_reset(priv);
+        regcache_mark_dirty(priv->regmap);
+
+        ret = tas5086_init(codec->dev, priv);
+        if (ret < 0)
+                return ret;
+
+        ret = regcache_sync(priv->regmap);
+        if (ret < 0)
+                return ret;
 
-        /* Restore codec state */
-        return regcache_sync(priv->regmap);
+        return 0;
 }
 #else
+#define tas5086_soc_suspend     NULL
 #define tas5086_soc_resume      NULL
 #endif /* CONFIG_PM */
 
@@ -710,23 +807,19 @@ static const struct of_device_id tas5086_dt_ids[] = {
 MODULE_DEVICE_TABLE(of, tas5086_dt_ids);
 #endif
 
-/* charge period values in microseconds */
-static const int tas5086_charge_period[] = {
-          13000,  16900,   23400,   31200,   41600,   54600,   72800,   96200,
-         130000, 156000,  234000,  312000,  416000,  546000,  728000,  962000,
-        1300000, 169000, 2340000, 3120000, 4160000, 5460000, 7280000, 9620000,
-};
-
 static int tas5086_probe(struct snd_soc_codec *codec)
 {
         struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
-        int charge_period = 1300000; /* hardware default is 1300 ms */
-        u8 pwm_start_mid_z = 0;
         int i, ret;
 
+        priv->pwm_start_mid_z = 0;
+        priv->charge_period = 1300000; /* hardware default is 1300 ms */
+
         if (of_match_device(of_match_ptr(tas5086_dt_ids), codec->dev)) {
                 struct device_node *of_node = codec->dev->of_node;
-                of_property_read_u32(of_node, "ti,charge-period", &charge_period);
+
+                of_property_read_u32(of_node, "ti,charge-period",
+                                     &priv->charge_period);
 
                 for (i = 0; i < 6; i++) {
                         char name[25];
@@ -735,43 +828,11 @@ static int tas5086_probe(struct snd_soc_codec *codec)
                                  "ti,mid-z-channel-%d", i + 1);
 
                         if (of_get_property(of_node, name, NULL) != NULL)
-                                pwm_start_mid_z |= 1 << i;
+                                priv->pwm_start_mid_z |= 1 << i;
                 }
         }
 
-        /*
-         * If any of the channels is configured to start in Mid-Z mode,
-         * configure 'part 1' of the PWM starts to use Mid-Z, and tell
-         * all configured mid-z channels to start start under 'part 1'.
-         */
-        if (pwm_start_mid_z)
-                regmap_write(priv->regmap, TAS5086_PWM_START,
-                             TAS5086_PWM_START_MIDZ_FOR_START_1 |
-                                pwm_start_mid_z);
-
-        /* lookup and set split-capacitor charge period */
-        if (charge_period == 0) {
-                regmap_write(priv->regmap, TAS5086_SPLIT_CAP_CHARGE, 0);
-        } else {
-                i = index_in_array(tas5086_charge_period,
-                                   ARRAY_SIZE(tas5086_charge_period),
-                                   charge_period);
-                if (i >= 0)
-                        regmap_write(priv->regmap, TAS5086_SPLIT_CAP_CHARGE,
-                                     i + 0x08);
-                else
-                        dev_warn(codec->dev,
-                                 "Invalid split-cap charge period of %d ns.\n",
-                                 charge_period);
-        }
-
-        /* enable factory trim */
-        ret = regmap_write(priv->regmap, TAS5086_OSC_TRIM, 0x00);
-        if (ret < 0)
-                return ret;
-
-        /* start all channels */
-        ret = regmap_write(priv->regmap, TAS5086_SYS_CONTROL_2, 0x20);
+        ret = tas5086_init(codec->dev, priv);
         if (ret < 0)
                 return ret;
 
@@ -780,12 +841,6 @@ static int tas5086_probe(struct snd_soc_codec *codec)
         if (ret < 0)
                 return ret;
 
-        /* mute all channels for now */
-        ret = regmap_write(priv->regmap, TAS5086_SOFT_MUTE,
-                           TAS5086_SOFT_MUTE_ALL);
-        if (ret < 0)
-                return ret;
-
         return 0;
 }
 
@@ -803,6 +858,7 @@ static int tas5086_remove(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver soc_codec_dev_tas5086 = {
         .probe                  = tas5086_probe,
         .remove                 = tas5086_remove,
+        .suspend                = tas5086_soc_suspend,
         .resume                 = tas5086_soc_resume,
         .controls               = tas5086_controls,
         .num_controls           = ARRAY_SIZE(tas5086_controls),
@@ -862,17 +918,8 @@ static int tas5086_i2c_probe(struct i2c_client *i2c,
                 if (devm_gpio_request(dev, gpio_nreset, "TAS5086 Reset"))
                         gpio_nreset = -EINVAL;
 
-        if (gpio_is_valid(gpio_nreset)) {
-                /* Reset codec - minimum assertion time is 400ns */
-                gpio_direction_output(gpio_nreset, 0);
-                udelay(1);
-                gpio_set_value(gpio_nreset, 1);
-
-                /* Codec needs ~15ms to wake up */
-                msleep(15);
-        }
-
         priv->gpio_nreset = gpio_nreset;
+        tas5086_reset(priv);
 
         /* The TAS5086 always returns 0x03 in its TAS5086_DEV_ID register */
         ret = regmap_read(priv->regmap, TAS5086_DEV_ID, &i);
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index 31762ebdd774..5d430cc56f51 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regmap.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -37,11 +38,27 @@
 /*
  * AIC23 register cache
  */
-static const u16 tlv320aic23_reg[] = {
-        0x0097, 0x0097, 0x00F9, 0x00F9, /* 0 */
-        0x001A, 0x0004, 0x0007, 0x0001, /* 4 */
-        0x0020, 0x0000, 0x0000, 0x0000, /* 8 */
-        0x0000, 0x0000, 0x0000, 0x0000, /* 12 */
+static const struct reg_default tlv320aic23_reg[] = {
+        {  0, 0x0097 },
+        {  1, 0x0097 },
+        {  2, 0x00F9 },
+        {  3, 0x00F9 },
+        {  4, 0x001A },
+        {  5, 0x0004 },
+        {  6, 0x0007 },
+        {  7, 0x0001 },
+        {  8, 0x0020 },
+        {  9, 0x0000 },
+};
+
+static const struct regmap_config tlv320aic23_regmap = {
+        .reg_bits = 7,
+        .val_bits = 9,
+
+        .max_register = TLV320AIC23_RESET,
+        .reg_defaults = tlv320aic23_reg,
+        .num_reg_defaults = ARRAY_SIZE(tlv320aic23_reg),
+        .cache_type = REGCACHE_RBTREE,
 };
 
 static const char *rec_src_text[] = { "Line", "Mic" };
@@ -171,7 +188,7 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = {
 
 /* AIC23 driver data */
 struct aic23 {
-        enum snd_soc_control_type control_type;
+        struct regmap *regmap;
         int mclk;
         int requested_adc;
         int requested_dac;
@@ -532,7 +549,9 @@ static int tlv320aic23_suspend(struct snd_soc_codec *codec)
 
 static int tlv320aic23_resume(struct snd_soc_codec *codec)
 {
-        snd_soc_cache_sync(codec);
+        struct aic23 *aic23 = snd_soc_codec_get_drvdata(codec);
+        regcache_mark_dirty(aic23->regmap);
+        regcache_sync(aic23->regmap);
         tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         return 0;
@@ -540,10 +559,9 @@ static int tlv320aic23_resume(struct snd_soc_codec *codec)
 
 static int tlv320aic23_probe(struct snd_soc_codec *codec)
 {
-        struct aic23 *aic23 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
-        ret = snd_soc_codec_set_cache_io(codec, 7, 9, aic23->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
@@ -552,16 +570,6 @@ static int tlv320aic23_probe(struct snd_soc_codec *codec)
         /* Reset codec */
         snd_soc_write(codec, TLV320AIC23_RESET, 0);
 
-        /* Write the register default value to cache for reserved registers,
-         * so the write to the these registers are suppressed by the cache
-         * restore code when it skips writes of default registers.
-         */
-        snd_soc_cache_write(codec, 0x0A, 0);
-        snd_soc_cache_write(codec, 0x0B, 0);
-        snd_soc_cache_write(codec, 0x0C, 0);
-        snd_soc_cache_write(codec, 0x0D, 0);
-        snd_soc_cache_write(codec, 0x0E, 0);
-
         /* power on device */
         tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
@@ -586,9 +594,6 @@ static int tlv320aic23_probe(struct snd_soc_codec *codec)
 
         snd_soc_write(codec, TLV320AIC23_ACTIVE, 0x1);
 
-        snd_soc_add_codec_controls(codec, tlv320aic23_snd_controls,
-                                ARRAY_SIZE(tlv320aic23_snd_controls));
-
         return 0;
 }
 
@@ -599,21 +604,19 @@ static int tlv320aic23_remove(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_tlv320aic23 = {
-        .reg_cache_size = ARRAY_SIZE(tlv320aic23_reg),
-        .reg_word_size = sizeof(u16),
-        .reg_cache_default = tlv320aic23_reg,
         .probe = tlv320aic23_probe,
         .remove = tlv320aic23_remove,
         .suspend = tlv320aic23_suspend,
         .resume = tlv320aic23_resume,
         .set_bias_level = tlv320aic23_set_bias_level,
+        .controls = tlv320aic23_snd_controls,
+        .num_controls = ARRAY_SIZE(tlv320aic23_snd_controls),
         .dapm_widgets = tlv320aic23_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets),
         .dapm_routes = tlv320aic23_intercon,
         .num_dapm_routes = ARRAY_SIZE(tlv320aic23_intercon),
 };
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 /*
  * If the i2c layer weren't so broken, we could pass this kind of data
  * around
@@ -631,8 +634,11 @@ static int tlv320aic23_codec_probe(struct i2c_client *i2c,
         if (aic23 == NULL)
                 return -ENOMEM;
 
+        aic23->regmap = devm_regmap_init_i2c(i2c, &tlv320aic23_regmap);
+        if (IS_ERR(aic23->regmap))
+                return PTR_ERR(aic23->regmap);
+
         i2c_set_clientdata(i2c, aic23);
-        aic23->control_type = SND_SOC_I2C;
 
         ret =  snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_tlv320aic23, &tlv320aic23_dai, 1);
@@ -660,29 +666,7 @@ static struct i2c_driver tlv320aic23_i2c_driver = {
         .id_table = tlv320aic23_id,
 };
 
-#endif
-
-static int __init tlv320aic23_modinit(void)
-{
-        int ret;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-        ret = i2c_add_driver(&tlv320aic23_i2c_driver);
-        if (ret != 0) {
-                printk(KERN_ERR "Failed to register TLV320AIC23 I2C driver: %d\n",
-                       ret);
-        }
-#endif
-        return ret;
-}
-module_init(tlv320aic23_modinit);
-
-static void __exit tlv320aic23_exit(void)
-{
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-        i2c_del_driver(&tlv320aic23_i2c_driver);
-#endif
-}
-module_exit(tlv320aic23_exit);
+module_i2c_driver(tlv320aic23_i2c_driver);
 
 MODULE_DESCRIPTION("ASoC TLV320AIC23 codec driver");
 MODULE_AUTHOR("Arun KS <arunks@mistralsolutions.com>");
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 7b8f3d965f43..94a658fa6d97 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -29,6 +29,7 @@ MODULE_LICENSE("GPL");
 /* AIC26 driver private data */
 struct aic26 {
         struct spi_device *spi;
+        struct regmap *regmap;
         struct snd_soc_codec *codec;
         int master;
         int datfm;
@@ -40,85 +41,6 @@ struct aic26 {
         int keyclick_len;
 };
 
-/* ---------------------------------------------------------------------
- * Register access routines
- */
-static unsigned int aic26_reg_read(struct snd_soc_codec *codec,
-                                   unsigned int reg)
-{
-        struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
-        u16 *cache = codec->reg_cache;
-        u16 cmd, value;
-        u8 buffer[2];
-        int rc;
-
-        if (reg >= AIC26_NUM_REGS) {
-                WARN_ON_ONCE(1);
-                return 0;
-        }
-
-        /* Do SPI transfer; first 16bits are command; remaining is
-         * register contents */
-        cmd = AIC26_READ_COMMAND_WORD(reg);
-        buffer[0] = (cmd >> 8) & 0xff;
-        buffer[1] = cmd & 0xff;
-        rc = spi_write_then_read(aic26->spi, buffer, 2, buffer, 2);
-        if (rc) {
-                dev_err(&aic26->spi->dev, "AIC26 reg read error\n");
-                return -EIO;
-        }
-        value = (buffer[0] << 8) | buffer[1];
-
-        /* Update the cache before returning with the value */
-        cache[reg] = value;
-        return value;
-}
-
-static unsigned int aic26_reg_read_cache(struct snd_soc_codec *codec,
-                                         unsigned int reg)
-{
-        u16 *cache = codec->reg_cache;
-
-        if (reg >= AIC26_NUM_REGS) {
-                WARN_ON_ONCE(1);
-                return 0;
-        }
-
-        return cache[reg];
-}
-
-static int aic26_reg_write(struct snd_soc_codec *codec, unsigned int reg,
-                           unsigned int value)
-{
-        struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
-        u16 *cache = codec->reg_cache;
-        u16 cmd;
-        u8 buffer[4];
-        int rc;
-
-        if (reg >= AIC26_NUM_REGS) {
-                WARN_ON_ONCE(1);
-                return -EINVAL;
-        }
-
-        /* Do SPI transfer; first 16bits are command; remaining is data
-         * to write into register */
-        cmd = AIC26_WRITE_COMMAND_WORD(reg);
-        buffer[0] = (cmd >> 8) & 0xff;
-        buffer[1] = cmd & 0xff;
-        buffer[2] = value >> 8;
-        buffer[3] = value;
-        rc = spi_write(aic26->spi, buffer, 4);
-        if (rc) {
-                dev_err(&aic26->spi->dev, "AIC26 reg read error\n");
-                return -EIO;
-        }
-
-        /* update cache before returning */
-        cache[reg] = value;
-        return 0;
-}
-
 static const struct snd_soc_dapm_widget tlv320aic26_dapm_widgets[] = {
 SND_SOC_DAPM_INPUT("MICIN"),
 SND_SOC_DAPM_INPUT("AUX"),
@@ -195,19 +117,15 @@ static int aic26_hw_params(struct snd_pcm_substream *substream,
         snd_soc_write(codec, AIC26_REG_PLL_PROG2, reg);
 
         /* Audio Control 3 (master mode, fsref rate) */
-        reg = aic26_reg_read_cache(codec, AIC26_REG_AUDIO_CTRL3);
-        reg &= ~0xf800;
         if (aic26->master)
-                reg |= 0x0800;
+                reg = 0x0800;
         if (fsref == 48000)
-                reg |= 0x2000;
-        snd_soc_write(codec, AIC26_REG_AUDIO_CTRL3, reg);
+                reg = 0x2000;
+        snd_soc_update_bits(codec, AIC26_REG_AUDIO_CTRL3, 0xf800, reg);
 
         /* Audio Control 1 (FSref divisor) */
-        reg = aic26_reg_read_cache(codec, AIC26_REG_AUDIO_CTRL1);
-        reg &= ~0x0fff;
-        reg |= wlen | aic26->datfm | (divisor << 3) | divisor;
-        snd_soc_write(codec, AIC26_REG_AUDIO_CTRL1, reg);
+        reg = wlen | aic26->datfm | (divisor << 3) | divisor;
+        snd_soc_update_bits(codec, AIC26_REG_AUDIO_CTRL1, 0xfff, reg);
 
         return 0;
 }
@@ -219,16 +137,16 @@ static int aic26_mute(struct snd_soc_dai *dai, int mute)
 {
         struct snd_soc_codec *codec = dai->codec;
         struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
-        u16 reg = aic26_reg_read_cache(codec, AIC26_REG_DAC_GAIN);
+        u16 reg;
 
         dev_dbg(&aic26->spi->dev, "aic26_mute(dai=%p, mute=%i)\n",
                 dai, mute);
 
         if (mute)
-                reg |= 0x8080;
+                reg = 0x8080;
         else
-                reg &= ~0x8080;
-        snd_soc_write(codec, AIC26_REG_DAC_GAIN, reg);
+                reg = 0;
+        snd_soc_update_bits(codec, AIC26_REG_DAC_GAIN, 0x8000, reg);
 
         return 0;
 }
@@ -346,7 +264,7 @@ static ssize_t aic26_keyclick_show(struct device *dev,
         struct aic26 *aic26 = dev_get_drvdata(dev);
         int val, amp, freq, len;
 
-        val = aic26_reg_read_cache(aic26->codec, AIC26_REG_AUDIO_CTRL2);
+        val = snd_soc_read(aic26->codec, AIC26_REG_AUDIO_CTRL2);
         amp = (val >> 12) & 0x7;
         freq = (125 << ((val >> 8) & 0x7)) >> 1;
         len = 2 * (1 + ((val >> 4) & 0xf));
@@ -360,11 +278,9 @@ static ssize_t aic26_keyclick_set(struct device *dev,
                                   const char *buf, size_t count)
 {
         struct aic26 *aic26 = dev_get_drvdata(dev);
-        int val;
 
-        val = aic26_reg_read_cache(aic26->codec, AIC26_REG_AUDIO_CTRL2);
-        val |= 0x8000;
-        snd_soc_write(aic26->codec, AIC26_REG_AUDIO_CTRL2, val);
+        snd_soc_update_bits(aic26->codec, AIC26_REG_AUDIO_CTRL2,
+                            0x8000, 0x800);
 
         return count;
 }
@@ -377,7 +293,9 @@ static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set);
 static int aic26_probe(struct snd_soc_codec *codec)
 {
         struct aic26 *aic26 = dev_get_drvdata(codec->dev);
-        int ret, err, i, reg;
+        int ret, reg;
+
+        snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP);
 
         aic26->codec = codec;
 
@@ -393,37 +311,30 @@ static int aic26_probe(struct snd_soc_codec *codec)
         reg |= 0x0800; /* set master mode */
         snd_soc_write(codec, AIC26_REG_AUDIO_CTRL3, reg);
 
-        /* Fill register cache */
-        for (i = 0; i < codec->driver->reg_cache_size; i++)
-                snd_soc_read(codec, i);
-
         /* Register the sysfs files for debugging */
         /* Create SysFS files */
         ret = device_create_file(codec->dev, &dev_attr_keyclick);
         if (ret)
                 dev_info(codec->dev, "error creating sysfs files\n");
 
-        /* register controls */
-        dev_dbg(codec->dev, "Registering controls\n");
-        err = snd_soc_add_codec_controls(codec, aic26_snd_controls,
-                        ARRAY_SIZE(aic26_snd_controls));
-        WARN_ON(err < 0);
-
         return 0;
 }
 
 static struct snd_soc_codec_driver aic26_soc_codec_dev = {
         .probe = aic26_probe,
-        .read = aic26_reg_read,
-        .write = aic26_reg_write,
-        .reg_cache_size = AIC26_NUM_REGS,
-        .reg_word_size = sizeof(u16),
+        .controls = aic26_snd_controls,
+        .num_controls = ARRAY_SIZE(aic26_snd_controls),
         .dapm_widgets = tlv320aic26_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(tlv320aic26_dapm_widgets),
         .dapm_routes = tlv320aic26_dapm_routes,
         .num_dapm_routes = ARRAY_SIZE(tlv320aic26_dapm_routes),
 };
 
+static const struct regmap_config aic26_regmap = {
+        .reg_bits = 16,
+        .val_bits = 16,
+};
+
 /* ---------------------------------------------------------------------
  * SPI device portion of driver: probe and release routines and SPI
  *                               driver registration.
@@ -440,6 +351,10 @@ static int aic26_spi_probe(struct spi_device *spi)
         if (!aic26)
                 return -ENOMEM;
 
+        aic26->regmap = devm_regmap_init_spi(spi, &aic26_regmap);
+        if (IS_ERR(aic26->regmap))
+                return PTR_ERR(aic26->regmap);
+
         /* Initialize the driver data */
         aic26->spi = spi;
         dev_set_drvdata(&spi->dev, aic26);
diff --git a/sound/soc/codecs/tlv320aic26.h b/sound/soc/codecs/tlv320aic26.h
index 67f19c3bebe6..629b85e75409 100644
--- a/sound/soc/codecs/tlv320aic26.h
+++ b/sound/soc/codecs/tlv320aic26.h
@@ -9,10 +9,7 @@
 #define _TLV320AIC16_H_
 
 /* AIC26 Registers */
-#define AIC26_READ_COMMAND_WORD(addr)   ((1 << 15) | (addr << 5))
-#define AIC26_WRITE_COMMAND_WORD(addr)  ((0 << 15) | (addr << 5))
-#define AIC26_PAGE_ADDR(page, offset)   ((page << 6) | offset)
-#define AIC26_NUM_REGS                  AIC26_PAGE_ADDR(3, 0)
+#define AIC26_PAGE_ADDR(page, offset)   ((page << 11) | offset << 5)
 
 /* Page 0: Auxiliary data registers */
 #define AIC26_REG_BAT1                  AIC26_PAGE_ADDR(0, 0x05)
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index 2ed57d4aa445..18cdcca9014c 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -60,9 +60,8 @@ struct aic32x4_rate_divs {
 };
 
 struct aic32x4_priv {
+        struct regmap *regmap;
         u32 sysclk;
-        u8 page_no;
-        void *control_data;
         u32 power_cfg;
         u32 micpga_routing;
         bool swapdacs;
@@ -262,67 +261,25 @@ static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
         {"Right ADC", NULL, "Right Input Mixer"},
 };
 
-static inline int aic32x4_change_page(struct snd_soc_codec *codec,
-                                        unsigned int new_page)
-{
-        struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
-        u8 data[2];
-        int ret;
-
-        data[0] = 0x00;
-        data[1] = new_page & 0xff;
-
-        ret = codec->hw_write(codec->control_data, data, 2);
-        if (ret == 2) {
-                aic32x4->page_no = new_page;
-                return 0;
-        } else {
-                return ret;
-        }
-}
-
-static int aic32x4_write(struct snd_soc_codec *codec, unsigned int reg,
-                                unsigned int val)
-{
-        struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
-        unsigned int page = reg / 128;
-        unsigned int fixed_reg = reg % 128;
-        u8 data[2];
-        int ret;
-
-        /* A write to AIC32X4_PSEL is really a non-explicit page change */
-        if (reg == AIC32X4_PSEL)
-                return aic32x4_change_page(codec, val);
-
-        if (aic32x4->page_no != page) {
-                ret = aic32x4_change_page(codec, page);
-                if (ret != 0)
-                        return ret;
-        }
-
-        data[0] = fixed_reg & 0xff;
-        data[1] = val & 0xff;
-
-        if (codec->hw_write(codec->control_data, data, 2) == 2)
-                return 0;
-        else
-                return -EIO;
-}
+static const struct regmap_range_cfg aic32x4_regmap_pages[] = {
+        {
+                .selector_reg = 0,
+                .selector_mask  = 0xff,
+                .window_start = 0,
+                .window_len = 128,
+                .range_min = AIC32X4_PAGE1,
+                .range_max = AIC32X4_PAGE1 + 127,
+        },
+};
 
-static unsigned int aic32x4_read(struct snd_soc_codec *codec, unsigned int reg)
-{
-        struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
-        unsigned int page = reg / 128;
-        unsigned int fixed_reg = reg % 128;
-        int ret;
+static const struct regmap_config aic32x4_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
 
-        if (aic32x4->page_no != page) {
-                ret = aic32x4_change_page(codec, page);
-                if (ret != 0)
-                        return ret;
-        }
-        return i2c_smbus_read_byte_data(codec->control_data, fixed_reg & 0xff);
-}
+        .max_register = AIC32X4_RMICPGAVOL,
+        .ranges = aic32x4_regmap_pages,
+        .num_ranges = ARRAY_SIZE(aic32x4_regmap_pages),
+};
 
 static inline int aic32x4_get_divs(int mclk, int rate)
 {
@@ -617,16 +574,10 @@ static int aic32x4_probe(struct snd_soc_codec *codec)
 {
         struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);
         u32 tmp_reg;
-        int ret;
 
-        codec->hw_write = (hw_write_t) i2c_master_send;
-        codec->control_data = aic32x4->control_data;
+        snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
 
         if (aic32x4->rstn_gpio >= 0) {
-                ret = devm_gpio_request_one(codec->dev, aic32x4->rstn_gpio,
-                                GPIOF_OUT_INIT_LOW, "tlv320aic32x4 rstn");
-                if (ret != 0)
-                        return ret;
                 ndelay(10);
                 gpio_set_value(aic32x4->rstn_gpio, 1);
         }
@@ -692,8 +643,6 @@ static int aic32x4_remove(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = {
-        .read = aic32x4_read,
-        .write = aic32x4_write,
         .probe = aic32x4_probe,
         .remove = aic32x4_remove,
         .suspend = aic32x4_suspend,
@@ -720,7 +669,10 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c,
         if (aic32x4 == NULL)
                 return -ENOMEM;
 
-        aic32x4->control_data = i2c;
+        aic32x4->regmap = devm_regmap_init_i2c(i2c, &aic32x4_regmap);
+        if (IS_ERR(aic32x4->regmap))
+                return PTR_ERR(aic32x4->regmap);
+
         i2c_set_clientdata(i2c, aic32x4);
 
         if (pdata) {
@@ -735,6 +687,13 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c,
                 aic32x4->rstn_gpio = -1;
         }
 
+        if (aic32x4->rstn_gpio >= 0) {
+                ret = devm_gpio_request_one(&i2c->dev, aic32x4->rstn_gpio,
+                                GPIOF_OUT_INIT_LOW, "tlv320aic32x4 rstn");
+                if (ret != 0)
+                        return ret;
+        }
+
         ret = snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_aic32x4, &aic32x4_dai, 1);
         return ret;
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 6e3f269243e0..546d16b7d38f 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -40,6 +40,7 @@
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
+#include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -72,9 +73,9 @@ struct aic3x_disable_nb {
 /* codec private data */
 struct aic3x_priv {
         struct snd_soc_codec *codec;
+        struct regmap *regmap;
         struct regulator_bulk_data supplies[AIC3X_NUM_SUPPLIES];
         struct aic3x_disable_nb disable_nb[AIC3X_NUM_SUPPLIES];
-        enum snd_soc_control_type control_type;
         struct aic3x_setup_data *setup;
         unsigned int sysclk;
         struct list_head list;
@@ -90,41 +91,45 @@ struct aic3x_priv {
         enum aic3x_micbias_voltage micbias_vg;
 };
 
-/*
- * AIC3X register cache
- * We can't read the AIC3X register space when we are
- * using 2 wire for device control, so we cache them instead.
- * There is no point in caching the reset register
- */
-static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = {
-        0x00, 0x00, 0x00, 0x10, /* 0 */
-        0x04, 0x00, 0x00, 0x00, /* 4 */
-        0x00, 0x00, 0x00, 0x01, /* 8 */
-        0x00, 0x00, 0x00, 0x80, /* 12 */
-        0x80, 0xff, 0xff, 0x78, /* 16 */
-        0x78, 0x78, 0x78, 0x78, /* 20 */
-        0x78, 0x00, 0x00, 0xfe, /* 24 */
-        0x00, 0x00, 0xfe, 0x00, /* 28 */
-        0x18, 0x18, 0x00, 0x00, /* 32 */
-        0x00, 0x00, 0x00, 0x00, /* 36 */
-        0x00, 0x00, 0x00, 0x80, /* 40 */
-        0x80, 0x00, 0x00, 0x00, /* 44 */
-        0x00, 0x00, 0x00, 0x04, /* 48 */
-        0x00, 0x00, 0x00, 0x00, /* 52 */
-        0x00, 0x00, 0x04, 0x00, /* 56 */
-        0x00, 0x00, 0x00, 0x00, /* 60 */
-        0x00, 0x04, 0x00, 0x00, /* 64 */
-        0x00, 0x00, 0x00, 0x00, /* 68 */
-        0x04, 0x00, 0x00, 0x00, /* 72 */
-        0x00, 0x00, 0x00, 0x00, /* 76 */
-        0x00, 0x00, 0x00, 0x00, /* 80 */
-        0x00, 0x00, 0x00, 0x00, /* 84 */
-        0x00, 0x00, 0x00, 0x00, /* 88 */
-        0x00, 0x00, 0x00, 0x00, /* 92 */
-        0x00, 0x00, 0x00, 0x00, /* 96 */
-        0x00, 0x00, 0x02, 0x00, /* 100 */
-        0x00, 0x00, 0x00, 0x00, /* 104 */
-        0x00, 0x00,             /* 108 */
+static const struct reg_default aic3x_reg[] = {
+        {   0, 0x00 }, {   1, 0x00 }, {   2, 0x00 }, {   3, 0x10 },
+        {   4, 0x04 }, {   5, 0x00 }, {   6, 0x00 }, {   7, 0x00 },
+        {   8, 0x00 }, {   9, 0x00 }, {  10, 0x00 }, {  11, 0x01 },
+        {  12, 0x00 }, {  13, 0x00 }, {  14, 0x00 }, {  15, 0x80 },
+        {  16, 0x80 }, {  17, 0xff }, {  18, 0xff }, {  19, 0x78 },
+        {  20, 0x78 }, {  21, 0x78 }, {  22, 0x78 }, {  23, 0x78 },
+        {  24, 0x78 }, {  25, 0x00 }, {  26, 0x00 }, {  27, 0xfe },
+        {  28, 0x00 }, {  29, 0x00 }, {  30, 0xfe }, {  31, 0x00 },
+        {  32, 0x18 }, {  33, 0x18 }, {  34, 0x00 }, {  35, 0x00 },
+        {  36, 0x00 }, {  37, 0x00 }, {  38, 0x00 }, {  39, 0x00 },
+        {  40, 0x00 }, {  41, 0x00 }, {  42, 0x00 }, {  43, 0x80 },
+        {  44, 0x80 }, {  45, 0x00 }, {  46, 0x00 }, {  47, 0x00 },
+        {  48, 0x00 }, {  49, 0x00 }, {  50, 0x00 }, {  51, 0x04 },
+        {  52, 0x00 }, {  53, 0x00 }, {  54, 0x00 }, {  55, 0x00 },
+        {  56, 0x00 }, {  57, 0x00 }, {  58, 0x04 }, {  59, 0x00 },
+        {  60, 0x00 }, {  61, 0x00 }, {  62, 0x00 }, {  63, 0x00 },
+        {  64, 0x00 }, {  65, 0x04 }, {  66, 0x00 }, {  67, 0x00 },
+        {  68, 0x00 }, {  69, 0x00 }, {  70, 0x00 }, {  71, 0x00 },
+        {  72, 0x04 }, {  73, 0x00 }, {  74, 0x00 }, {  75, 0x00 },
+        {  76, 0x00 }, {  77, 0x00 }, {  78, 0x00 }, {  79, 0x00 },
+        {  80, 0x00 }, {  81, 0x00 }, {  82, 0x00 }, {  83, 0x00 },
+        {  84, 0x00 }, {  85, 0x00 }, {  86, 0x00 }, {  87, 0x00 },
+        {  88, 0x00 }, {  89, 0x00 }, {  90, 0x00 }, {  91, 0x00 },
+        {  92, 0x00 }, {  93, 0x00 }, {  94, 0x00 }, {  95, 0x00 },
+        {  96, 0x00 }, {  97, 0x00 }, {  98, 0x00 }, {  99, 0x00 },
+        { 100, 0x00 }, { 101, 0x00 }, { 102, 0x02 }, { 103, 0x00 },
+        { 104, 0x00 }, { 105, 0x00 }, { 106, 0x00 }, { 107, 0x00 },
+        { 108, 0x00 }, { 109, 0x00 },
+};
+
+static const struct regmap_config aic3x_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .max_register = DAC_ICC_ADJ,
+        .reg_defaults = aic3x_reg,
+        .num_reg_defaults = ARRAY_SIZE(aic3x_reg),
+        .cache_type = REGCACHE_RBTREE,
 };
 
 #define SOC_DAPM_SINGLE_AIC3X(xname, reg, shift, mask, invert) \
@@ -674,6 +679,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         /* Left Input */
         {"Left Line1L Mux", "single-ended", "LINE1L"},
         {"Left Line1L Mux", "differential", "LINE1L"},
+        {"Left Line1R Mux", "single-ended", "LINE1R"},
+        {"Left Line1R Mux", "differential", "LINE1R"},
 
         {"Left Line2L Mux", "single-ended", "LINE2L"},
         {"Left Line2L Mux", "differential", "LINE2L"},
@@ -690,6 +697,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         /* Right Input */
         {"Right Line1R Mux", "single-ended", "LINE1R"},
         {"Right Line1R Mux", "differential", "LINE1R"},
+        {"Right Line1L Mux", "single-ended", "LINE1L"},
+        {"Right Line1L Mux", "differential", "LINE1L"},
 
         {"Right Line2R Mux", "single-ended", "LINE2R"},
         {"Right Line2R Mux", "differential", "LINE2R"},
@@ -824,12 +833,6 @@ static int aic3x_add_widgets(struct snd_soc_codec *codec)
         struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
         struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_new_controls(dapm, aic3x_dapm_widgets,
-                                  ARRAY_SIZE(aic3x_dapm_widgets));
-
-        /* set up audio path interconnects */
-        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
-
         if (aic3x->model == AIC3X_MODEL_3007) {
                 snd_soc_dapm_new_controls(dapm, aic3007_dapm_widgets,
                         ARRAY_SIZE(aic3007_dapm_widgets));
@@ -1078,29 +1081,6 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
         return 0;
 }
 
-static int aic3x_init_3007(struct snd_soc_codec *codec)
-{
-        u8 tmp1, tmp2, *cache = codec->reg_cache;
-
-        /*
-         * There is no need to cache writes to undocumented page 0xD but
-         * respective page 0 register cache entries must be preserved
-         */
-        tmp1 = cache[0xD];
-        tmp2 = cache[0x8];
-        /* Class-D speaker driver init; datasheet p. 46 */
-        snd_soc_write(codec, AIC3X_PAGE_SELECT, 0x0D);
-        snd_soc_write(codec, 0xD, 0x0D);
-        snd_soc_write(codec, 0x8, 0x5C);
-        snd_soc_write(codec, 0x8, 0x5D);
-        snd_soc_write(codec, 0x8, 0x5C);
-        snd_soc_write(codec, AIC3X_PAGE_SELECT, 0x00);
-        cache[0xD] = tmp1;
-        cache[0x8] = tmp2;
-
-        return 0;
-}
-
 static int aic3x_regulator_event(struct notifier_block *nb,
                                  unsigned long event, void *data)
 {
@@ -1115,7 +1095,7 @@ static int aic3x_regulator_event(struct notifier_block *nb,
                  */
                 if (gpio_is_valid(aic3x->gpio_reset))
                         gpio_set_value(aic3x->gpio_reset, 0);
-                aic3x->codec->cache_sync = 1;
+                regcache_mark_dirty(aic3x->regmap);
         }
 
         return 0;
@@ -1124,8 +1104,7 @@ static int aic3x_regulator_event(struct notifier_block *nb,
 static int aic3x_set_power(struct snd_soc_codec *codec, int power)
 {
         struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
-        int i, ret;
-        u8 *cache = codec->reg_cache;
+        int ret;
 
         if (power) {
                 ret = regulator_bulk_enable(ARRAY_SIZE(aic3x->supplies),
@@ -1133,12 +1112,6 @@ static int aic3x_set_power(struct snd_soc_codec *codec, int power)
                 if (ret)
                         goto out;
                 aic3x->power = 1;
-                /*
-                 * Reset release and cache sync is necessary only if some
-                 * supply was off or if there were cached writes
-                 */
-                if (!codec->cache_sync)
-                        goto out;
 
                 if (gpio_is_valid(aic3x->gpio_reset)) {
                         udelay(1);
@@ -1146,12 +1119,8 @@ static int aic3x_set_power(struct snd_soc_codec *codec, int power)
                 }
 
                 /* Sync reg_cache with the hardware */
-                codec->cache_only = 0;
-                for (i = AIC3X_SAMPLE_RATE_SEL_REG; i < ARRAY_SIZE(aic3x_reg); i++)
-                        snd_soc_write(codec, i, cache[i]);
-                if (aic3x->model == AIC3X_MODEL_3007)
-                        aic3x_init_3007(codec);
-                codec->cache_sync = 0;
+                regcache_cache_only(aic3x->regmap, false);
+                regcache_sync(aic3x->regmap);
         } else {
                 /*
                  * Do soft reset to this codec instance in order to clear
@@ -1159,10 +1128,10 @@ static int aic3x_set_power(struct snd_soc_codec *codec, int power)
                  * remain on
                  */
                 snd_soc_write(codec, AIC3X_RESET, SOFT_RESET);
-                codec->cache_sync = 1;
+                regcache_mark_dirty(aic3x->regmap);
                 aic3x->power = 0;
                 /* HW writes are needless when bias is off */
-                codec->cache_only = 1;
+                regcache_cache_only(aic3x->regmap, true);
                 ret = regulator_bulk_disable(ARRAY_SIZE(aic3x->supplies),
                                              aic3x->supplies);
         }
@@ -1317,7 +1286,6 @@ static int aic3x_init(struct snd_soc_codec *codec)
         snd_soc_write(codec, LINE2R_2_MONOLOPM_VOL, DEFAULT_VOL);
 
         if (aic3x->model == AIC3X_MODEL_3007) {
-                aic3x_init_3007(codec);
                 snd_soc_write(codec, CLASSD_CTRL, 0);
         }
 
@@ -1345,29 +1313,12 @@ static int aic3x_probe(struct snd_soc_codec *codec)
         INIT_LIST_HEAD(&aic3x->list);
         aic3x->codec = codec;
 
-        ret = snd_soc_codec_set_cache_io(codec, 8, 8, aic3x->control_type);
+        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_REGMAP);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
-        if (gpio_is_valid(aic3x->gpio_reset) &&
-            !aic3x_is_shared_reset(aic3x)) {
-                ret = gpio_request(aic3x->gpio_reset, "tlv320aic3x reset");
-                if (ret != 0)
-                        goto err_gpio;
-                gpio_direction_output(aic3x->gpio_reset, 0);
-        }
-
-        for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++)
-                aic3x->supplies[i].supply = aic3x_supply_names[i];
-
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(aic3x->supplies),
-                                 aic3x->supplies);
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
-                goto err_get;
-        }
         for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++) {
                 aic3x->disable_nb[i].nb.notifier_call = aic3x_regulator_event;
                 aic3x->disable_nb[i].aic3x = aic3x;
@@ -1381,7 +1332,7 @@ static int aic3x_probe(struct snd_soc_codec *codec)
                 }
         }
 
-        codec->cache_only = 1;
+        regcache_mark_dirty(aic3x->regmap);
         aic3x_init(codec);
 
         if (aic3x->setup) {
@@ -1392,8 +1343,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
                               (aic3x->setup->gpio_func[1] & 0xf) << 4);
         }
 
-        snd_soc_add_codec_controls(codec, aic3x_snd_controls,
-                             ARRAY_SIZE(aic3x_snd_controls));
         if (aic3x->model == AIC3X_MODEL_3007)
                 snd_soc_add_codec_controls(codec, &aic3x_classd_amp_gain_ctrl, 1);
 
@@ -1424,12 +1373,6 @@ err_notif:
         while (i--)
                 regulator_unregister_notifier(aic3x->supplies[i].consumer,
                                               &aic3x->disable_nb[i].nb);
-        regulator_bulk_free(ARRAY_SIZE(aic3x->supplies), aic3x->supplies);
-err_get:
-        if (gpio_is_valid(aic3x->gpio_reset) &&
-            !aic3x_is_shared_reset(aic3x))
-                gpio_free(aic3x->gpio_reset);
-err_gpio:
         return ret;
 }
 
@@ -1440,15 +1383,9 @@ static int aic3x_remove(struct snd_soc_codec *codec)
 
         aic3x_set_bias_level(codec, SND_SOC_BIAS_OFF);
         list_del(&aic3x->list);
-        if (gpio_is_valid(aic3x->gpio_reset) &&
-            !aic3x_is_shared_reset(aic3x)) {
-                gpio_set_value(aic3x->gpio_reset, 0);
-                gpio_free(aic3x->gpio_reset);
-        }
         for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++)
                 regulator_unregister_notifier(aic3x->supplies[i].consumer,
                                               &aic3x->disable_nb[i].nb);
-        regulator_bulk_free(ARRAY_SIZE(aic3x->supplies), aic3x->supplies);
 
         return 0;
 }
@@ -1456,13 +1393,16 @@ static int aic3x_remove(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver soc_codec_dev_aic3x = {
         .set_bias_level = aic3x_set_bias_level,
         .idle_bias_off = true,
-        .reg_cache_size = ARRAY_SIZE(aic3x_reg),
-        .reg_word_size = sizeof(u8),
-        .reg_cache_default = aic3x_reg,
         .probe = aic3x_probe,
         .remove = aic3x_remove,
         .suspend = aic3x_suspend,
         .resume = aic3x_resume,
+        .controls = aic3x_snd_controls,
+        .num_controls = ARRAY_SIZE(aic3x_snd_controls),
+        .dapm_widgets = aic3x_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(aic3x_dapm_widgets),
+        .dapm_routes = intercon,
+        .num_dapm_routes = ARRAY_SIZE(intercon),
 };
 
 /*
@@ -1479,6 +1419,16 @@ static const struct i2c_device_id aic3x_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id);
 
+static const struct reg_default aic3007_class_d[] = {
+        /* Class-D speaker driver init; datasheet p. 46 */
+        { AIC3X_PAGE_SELECT, 0x0D },
+        { 0xD, 0x0D },
+        { 0x8, 0x5C },
+        { 0x8, 0x5D },
+        { 0x8, 0x5C },
+        { AIC3X_PAGE_SELECT, 0x00 },
+};
+
 /*
  * If the i2c layer weren't so broken, we could pass this kind of data
  * around
@@ -1490,7 +1440,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
         struct aic3x_priv *aic3x;
         struct aic3x_setup_data *ai3x_setup;
         struct device_node *np = i2c->dev.of_node;
-        int ret;
+        int ret, i;
         u32 value;
 
         aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL);
@@ -1499,7 +1449,13 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
                 return -ENOMEM;
         }
 
-        aic3x->control_type = SND_SOC_I2C;
+        aic3x->regmap = devm_regmap_init_i2c(i2c, &aic3x_regmap);
+        if (IS_ERR(aic3x->regmap)) {
+                ret = PTR_ERR(aic3x->regmap);
+                return ret;
+        }
+
+        regcache_cache_only(aic3x->regmap, true);
 
         i2c_set_clientdata(i2c, aic3x);
         if (pdata) {
@@ -1551,14 +1507,54 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
 
         aic3x->model = id->driver_data;
 
+        if (gpio_is_valid(aic3x->gpio_reset) &&
+            !aic3x_is_shared_reset(aic3x)) {
+                ret = gpio_request(aic3x->gpio_reset, "tlv320aic3x reset");
+                if (ret != 0)
+                        goto err;
+                gpio_direction_output(aic3x->gpio_reset, 0);
+        }
+
+        for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++)
+                aic3x->supplies[i].supply = aic3x_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(aic3x->supplies),
+                                      aic3x->supplies);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
+                goto err_gpio;
+        }
+
+        if (aic3x->model == AIC3X_MODEL_3007) {
+                ret = regmap_register_patch(aic3x->regmap, aic3007_class_d,
+                                            ARRAY_SIZE(aic3007_class_d));
+                if (ret != 0)
+                        dev_err(&i2c->dev, "Failed to init class D: %d\n",
+                                ret);
+        }
+
         ret = snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_aic3x, &aic3x_dai, 1);
         return ret;
+
+err_gpio:
+        if (gpio_is_valid(aic3x->gpio_reset) &&
+            !aic3x_is_shared_reset(aic3x))
+                gpio_free(aic3x->gpio_reset);
+err:
+        return ret;
 }
 
 static int aic3x_i2c_remove(struct i2c_client *client)
 {
+        struct aic3x_priv *aic3x = i2c_get_clientdata(client);
+
         snd_soc_unregister_codec(&client->dev);
+        if (gpio_is_valid(aic3x->gpio_reset) &&
+            !aic3x_is_shared_reset(aic3x)) {
+                gpio_set_value(aic3x->gpio_reset, 0);
+                gpio_free(aic3x->gpio_reset);
+        }
         return 0;
 }
 
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index c58bee8346ce..998555f2a8aa 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -30,6 +30,7 @@
 #include <sound/tpa6130a2-plat.h>
 #include <sound/soc.h>
 #include <sound/tlv.h>
+#include <linux/of_gpio.h>
 
 #include "tpa6130a2.h"
 
@@ -364,30 +365,33 @@ static int tpa6130a2_probe(struct i2c_client *client,
 {
         struct device *dev;
         struct tpa6130a2_data *data;
-        struct tpa6130a2_platform_data *pdata;
+        struct tpa6130a2_platform_data *pdata = client->dev.platform_data;
+        struct device_node *np = client->dev.of_node;
         const char *regulator;
         int ret;
 
         dev = &client->dev;
 
-        if (client->dev.platform_data == NULL) {
-                dev_err(dev, "Platform data not set\n");
-                dump_stack();
-                return -ENODEV;
-        }
-
         data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
         if (data == NULL) {
                 dev_err(dev, "Can not allocate memory\n");
                 return -ENOMEM;
         }
 
+        if (pdata) {
+                data->power_gpio = pdata->power_gpio;
+        } else if (np) {
+                data->power_gpio = of_get_named_gpio(np, "power-gpio", 0);
+        } else {
+                dev_err(dev, "Platform data not set\n");
+                dump_stack();
+                return -ENODEV;
+        }
+
         tpa6130a2_client = client;
 
         i2c_set_clientdata(tpa6130a2_client, data);
 
-        pdata = client->dev.platform_data;
-        data->power_gpio = pdata->power_gpio;
         data->id = id->driver_data;
 
         mutex_init(&data->mutex);
@@ -466,10 +470,20 @@ static const struct i2c_device_id tpa6130a2_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tpa6130a2_id);
 
+#if IS_ENABLED(CONFIG_OF)
+static const struct of_device_id tpa6130a2_of_match[] = {
+        { .compatible = "ti,tpa6130a2", },
+        { .compatible = "ti,tpa6140a2" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, tpa6130a2_of_match);
+#endif
+
 static struct i2c_driver tpa6130a2_i2c_driver = {
         .driver = {
                 .name = "tpa6130a2",
                 .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(tpa6130a2_of_match),
         },
         .probe = tpa6130a2_probe,
         .remove = tpa6130a2_remove,
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 1e3884d6b3fb..dfc51bb425da 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -46,13 +46,7 @@
 /* TWL4030 PMBR1 Register GPIO6 mux bits */
 #define TWL4030_GPIO6_PWM0_MUTE(value)  ((value & 0x03) << 2)
 
-/* Shadow register used by the audio driver */
-#define TWL4030_REG_SW_SHADOW           0x4A
-#define TWL4030_CACHEREGNUM     (TWL4030_REG_SW_SHADOW + 1)
-
-/* TWL4030_REG_SW_SHADOW (0x4A) Fields */
-#define TWL4030_HFL_EN                  0x01
-#define TWL4030_HFR_EN                  0x02
+#define TWL4030_CACHEREGNUM     (TWL4030_REG_MISC_SET_2 + 1)
 
 /*
  * twl4030 register cache & default register settings
@@ -132,7 +126,6 @@ static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = {
         0x00, /* REG_VIBRA_PWM_SET      (0x47)  */
         0x00, /* REG_ANAMIC_GAIN        (0x48)  */
         0x00, /* REG_MISC_SET_2         (0x49)  */
-        0x00, /* REG_SW_SHADOW          (0x4A)  - Shadow, non HW register */
 };
 
 /* codec private data */
@@ -198,42 +191,41 @@ static int twl4030_write(struct snd_soc_codec *codec,
         int write_to_reg = 0;
 
         twl4030_write_reg_cache(codec, reg, value);
-        if (likely(reg < TWL4030_REG_SW_SHADOW)) {
-                /* Decide if the given register can be written */
-                switch (reg) {
-                case TWL4030_REG_EAR_CTL:
-                        if (twl4030->earpiece_enabled)
-                                write_to_reg = 1;
-                        break;
-                case TWL4030_REG_PREDL_CTL:
-                        if (twl4030->predrivel_enabled)
-                                write_to_reg = 1;
-                        break;
-                case TWL4030_REG_PREDR_CTL:
-                        if (twl4030->predriver_enabled)
-                                write_to_reg = 1;
-                        break;
-                case TWL4030_REG_PRECKL_CTL:
-                        if (twl4030->carkitl_enabled)
-                                write_to_reg = 1;
-                        break;
-                case TWL4030_REG_PRECKR_CTL:
-                        if (twl4030->carkitr_enabled)
-                                write_to_reg = 1;
-                        break;
-                case TWL4030_REG_HS_GAIN_SET:
-                        if (twl4030->hsl_enabled || twl4030->hsr_enabled)
-                                write_to_reg = 1;
-                        break;
-                default:
-                        /* All other register can be written */
+        /* Decide if the given register can be written */
+        switch (reg) {
+        case TWL4030_REG_EAR_CTL:
+                if (twl4030->earpiece_enabled)
                         write_to_reg = 1;
-                        break;
-                }
-                if (write_to_reg)
-                        return twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
-                                                    value, reg);
+                break;
+        case TWL4030_REG_PREDL_CTL:
+                if (twl4030->predrivel_enabled)
+                        write_to_reg = 1;
+                break;
+        case TWL4030_REG_PREDR_CTL:
+                if (twl4030->predriver_enabled)
+                        write_to_reg = 1;
+                break;
+        case TWL4030_REG_PRECKL_CTL:
+                if (twl4030->carkitl_enabled)
+                        write_to_reg = 1;
+                break;
+        case TWL4030_REG_PRECKR_CTL:
+                if (twl4030->carkitr_enabled)
+                        write_to_reg = 1;
+                break;
+        case TWL4030_REG_HS_GAIN_SET:
+                if (twl4030->hsl_enabled || twl4030->hsr_enabled)
+                        write_to_reg = 1;
+                break;
+        default:
+                /* All other register can be written */
+                write_to_reg = 1;
+                break;
         }
+        if (write_to_reg)
+                return twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
+                                            value, reg);
+
         return 0;
 }
 
@@ -532,7 +524,7 @@ SOC_DAPM_ENUM("Route", twl4030_handsfreel_enum);
 
 /* Handsfree Left virtual mute */
 static const struct snd_kcontrol_new twl4030_dapm_handsfreelmute_control =
-        SOC_DAPM_SINGLE("Switch", TWL4030_REG_SW_SHADOW, 0, 1, 0);
+        SOC_DAPM_SINGLE_VIRT("Switch", 1);
 
 /* Handsfree Right */
 static const char *twl4030_handsfreer_texts[] =
@@ -548,7 +540,7 @@ SOC_DAPM_ENUM("Route", twl4030_handsfreer_enum);
 
 /* Handsfree Right virtual mute */
 static const struct snd_kcontrol_new twl4030_dapm_handsfreermute_control =
-        SOC_DAPM_SINGLE("Switch", TWL4030_REG_SW_SHADOW, 1, 1, 0);
+        SOC_DAPM_SINGLE_VIRT("Switch", 1);
 
 /* Vibra */
 /* Vibra audio path selection */
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 3c79dbb6c323..f2f4bcb2ff71 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -54,12 +54,7 @@ enum twl6040_dai_id {
 #define TWL6040_OUTHF_0dB 0x03
 #define TWL6040_OUTHF_M52dB 0x1D
 
-/* Shadow register used by the driver */
-#define TWL6040_REG_SW_SHADOW   0x2F
-#define TWL6040_CACHEREGNUM     (TWL6040_REG_SW_SHADOW + 1)
-
-/* TWL6040_REG_SW_SHADOW (0x2F) fields */
-#define TWL6040_EAR_PATH_ENABLE 0x01
+#define TWL6040_CACHEREGNUM     (TWL6040_REG_STATUS + 1)
 
 struct twl6040_jack_data {
         struct snd_soc_jack *jack;
@@ -135,8 +130,6 @@ static const u8 twl6040_reg[TWL6040_CACHEREGNUM] = {
         0x00, /* REG_HFOTRIM    0x2C    */
         0x09, /* REG_ACCCTL     0x2D    */
         0x00, /* REG_STATUS     0x2E (ro) */
-
-        0x00, /* REG_SW_SHADOW  0x2F - Shadow, non HW register */
 };
 
 /* List of registers to be restored after power up */
@@ -220,12 +213,8 @@ static int twl6040_read_reg_volatile(struct snd_soc_codec *codec,
         if (reg >= TWL6040_CACHEREGNUM)
                 return -EIO;
 
-        if (likely(reg < TWL6040_REG_SW_SHADOW)) {
-                value = twl6040_reg_read(twl6040, reg);
-                twl6040_write_reg_cache(codec, reg, value);
-        } else {
-                value = twl6040_read_reg_cache(codec, reg);
-        }
+        value = twl6040_reg_read(twl6040, reg);
+        twl6040_write_reg_cache(codec, reg, value);
 
         return value;
 }
@@ -246,7 +235,7 @@ static bool twl6040_is_path_unmuted(struct snd_soc_codec *codec,
                 return priv->dl2_unmuted;
         default:
                 return 1;
-        };
+        }
 }
 
 /*
@@ -261,8 +250,7 @@ static int twl6040_write(struct snd_soc_codec *codec,
                 return -EIO;
 
         twl6040_write_reg_cache(codec, reg, value);
-        if (likely(reg < TWL6040_REG_SW_SHADOW) &&
-            twl6040_is_path_unmuted(codec, reg))
+        if (twl6040_is_path_unmuted(codec, reg))
                 return twl6040_reg_write(twl6040, reg, value);
         else
                 return 0;
@@ -555,7 +543,7 @@ static const struct snd_kcontrol_new hfr_mux_controls =
         SOC_DAPM_ENUM("Route", twl6040_hf_enum[1]);
 
 static const struct snd_kcontrol_new ep_path_enable_control =
-        SOC_DAPM_SINGLE("Switch", TWL6040_REG_SW_SHADOW, 0, 1, 0);
+        SOC_DAPM_SINGLE_VIRT("Switch", 1);
 
 static const struct snd_kcontrol_new auxl_switch_control =
         SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFLCTL, 6, 1, 0);
@@ -1100,7 +1088,7 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id i
                 break;
         default:
                 break;
-        };
+        }
 }
 
 static int twl6040_digital_mute(struct snd_soc_dai *dai, int mute)
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 8bbddc151aa8..a08e8bf6d07c 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -685,13 +685,13 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("EQ3", ARIZONA_EQ3MIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("EQ4", ARIZONA_EQ4MIX_INPUT_1_SOURCE),
 
-SND_SOC_BYTES_MASK("EQ1 Coefficeints", ARIZONA_EQ1_1, 21,
+SND_SOC_BYTES_MASK("EQ1 Coefficients", ARIZONA_EQ1_1, 21,
                    ARIZONA_EQ1_ENA_MASK),
-SND_SOC_BYTES_MASK("EQ2 Coefficeints", ARIZONA_EQ2_1, 21,
+SND_SOC_BYTES_MASK("EQ2 Coefficients", ARIZONA_EQ2_1, 21,
                    ARIZONA_EQ2_ENA_MASK),
-SND_SOC_BYTES_MASK("EQ3 Coefficeints", ARIZONA_EQ3_1, 21,
+SND_SOC_BYTES_MASK("EQ3 Coefficients", ARIZONA_EQ3_1, 21,
                    ARIZONA_EQ3_ENA_MASK),
-SND_SOC_BYTES_MASK("EQ4 Coefficeints", ARIZONA_EQ4_1, 21,
+SND_SOC_BYTES_MASK("EQ4 Coefficients", ARIZONA_EQ4_1, 21,
                    ARIZONA_EQ4_ENA_MASK),
 
 SOC_SINGLE_TLV("EQ1 B1 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B1_GAIN_SHIFT,
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index bbd64384ca1c..b67ba33546d6 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -101,13 +101,13 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("EQ3", ARIZONA_EQ3MIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("EQ4", ARIZONA_EQ4MIX_INPUT_1_SOURCE),
 
-SND_SOC_BYTES_MASK("EQ1 Coefficeints", ARIZONA_EQ1_1, 21,
+SND_SOC_BYTES_MASK("EQ1 Coefficients", ARIZONA_EQ1_1, 21,
                    ARIZONA_EQ1_ENA_MASK),
-SND_SOC_BYTES_MASK("EQ2 Coefficeints", ARIZONA_EQ2_1, 21,
+SND_SOC_BYTES_MASK("EQ2 Coefficients", ARIZONA_EQ2_1, 21,
                    ARIZONA_EQ2_ENA_MASK),
-SND_SOC_BYTES_MASK("EQ3 Coefficeints", ARIZONA_EQ3_1, 21,
+SND_SOC_BYTES_MASK("EQ3 Coefficients", ARIZONA_EQ3_1, 21,
                    ARIZONA_EQ3_ENA_MASK),
-SND_SOC_BYTES_MASK("EQ4 Coefficeints", ARIZONA_EQ4_1, 21,
+SND_SOC_BYTES_MASK("EQ4 Coefficients", ARIZONA_EQ4_1, 21,
                    ARIZONA_EQ4_ENA_MASK),
 
 SOC_SINGLE_TLV("EQ1 B1 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B1_GAIN_SHIFT,
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index d2a092850283..48dc7d2fee36 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -32,13 +32,6 @@
 
 #include "wm8400.h"
 
-/* Fake register for internal state */
-#define WM8400_INTDRIVBITS      (WM8400_REGISTER_COUNT + 1)
-#define WM8400_INMIXL_PWR                       0
-#define WM8400_AINLMUX_PWR                      1
-#define WM8400_INMIXR_PWR                       2
-#define WM8400_AINRMUX_PWR                      3
-
 static struct regulator_bulk_data power[] = {
         {
                 .supply = "I2S1VDD",
@@ -74,32 +67,6 @@ struct wm8400_priv {
         int fll_in, fll_out;
 };
 
-static inline unsigned int wm8400_read(struct snd_soc_codec *codec,
-                                       unsigned int reg)
-{
-        struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec);
-
-        if (reg == WM8400_INTDRIVBITS)
-                return wm8400->fake_register;
-        else
-                return wm8400_reg_read(wm8400->wm8400, reg);
-}
-
-/*
- * write to the wm8400 register space
- */
-static int wm8400_write(struct snd_soc_codec *codec, unsigned int reg,
-        unsigned int value)
-{
-        struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec);
-
-        if (reg == WM8400_INTDRIVBITS) {
-                wm8400->fake_register = value;
-                return 0;
-        } else
-                return wm8400_set_bits(wm8400->wm8400, reg, 0xffff, value);
-}
-
 static void wm8400_codec_reset(struct snd_soc_codec *codec)
 {
         struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec);
@@ -352,32 +319,6 @@ SOC_SINGLE("RIN34 Mute Switch", WM8400_RIGHT_LINE_INPUT_3_4_VOLUME,
  * _DAPM_ Controls
  */
 
-static int inmixer_event (struct snd_soc_dapm_widget *w,
-        struct snd_kcontrol *kcontrol, int event)
-{
-        u16 reg, fakepower;
-
-        reg = snd_soc_read(w->codec, WM8400_POWER_MANAGEMENT_2);
-        fakepower = snd_soc_read(w->codec, WM8400_INTDRIVBITS);
-
-        if (fakepower & ((1 << WM8400_INMIXL_PWR) |
-                (1 << WM8400_AINLMUX_PWR))) {
-                reg |= WM8400_AINL_ENA;
-        } else {
-                reg &= ~WM8400_AINL_ENA;
-        }
-
-        if (fakepower & ((1 << WM8400_INMIXR_PWR) |
-                (1 << WM8400_AINRMUX_PWR))) {
-                reg |= WM8400_AINR_ENA;
-        } else {
-                reg &= ~WM8400_AINR_ENA;
-        }
-        snd_soc_write(w->codec, WM8400_POWER_MANAGEMENT_2, reg);
-
-        return 0;
-}
-
 static int outmixer_event (struct snd_soc_dapm_widget *w,
         struct snd_kcontrol * kcontrol, int event)
 {
@@ -658,27 +599,26 @@ SND_SOC_DAPM_MIXER("RIN34 PGA", WM8400_POWER_MANAGEMENT_2,
                    0, &wm8400_dapm_rin34_pga_controls[0],
                    ARRAY_SIZE(wm8400_dapm_rin34_pga_controls)),
 
+SND_SOC_DAPM_SUPPLY("INL", WM8400_POWER_MANAGEMENT_2, WM8400_AINL_ENA_SHIFT,
+                    0, NULL, 0),
+SND_SOC_DAPM_SUPPLY("INR", WM8400_POWER_MANAGEMENT_2, WM8400_AINR_ENA_SHIFT,
+                    0, NULL, 0),
+
 /* INMIXL */
-SND_SOC_DAPM_MIXER_E("INMIXL", WM8400_INTDRIVBITS, WM8400_INMIXL_PWR, 0,
+SND_SOC_DAPM_MIXER("INMIXL", SND_SOC_NOPM, 0, 0,
         &wm8400_dapm_inmixl_controls[0],
-        ARRAY_SIZE(wm8400_dapm_inmixl_controls),
-        inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+        ARRAY_SIZE(wm8400_dapm_inmixl_controls)),
 
 /* AINLMUX */
-SND_SOC_DAPM_MUX_E("AILNMUX", WM8400_INTDRIVBITS, WM8400_AINLMUX_PWR, 0,
-        &wm8400_dapm_ainlmux_controls, inmixer_event,
-        SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_MUX("AILNMUX", SND_SOC_NOPM, 0, 0, &wm8400_dapm_ainlmux_controls),
 
 /* INMIXR */
-SND_SOC_DAPM_MIXER_E("INMIXR", WM8400_INTDRIVBITS, WM8400_INMIXR_PWR, 0,
+SND_SOC_DAPM_MIXER("INMIXR", SND_SOC_NOPM, 0, 0,
         &wm8400_dapm_inmixr_controls[0],
-        ARRAY_SIZE(wm8400_dapm_inmixr_controls),
-        inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+        ARRAY_SIZE(wm8400_dapm_inmixr_controls)),
 
 /* AINRMUX */
-SND_SOC_DAPM_MUX_E("AIRNMUX", WM8400_INTDRIVBITS, WM8400_AINRMUX_PWR, 0,
-        &wm8400_dapm_ainrmux_controls, inmixer_event,
-        SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_MUX("AIRNMUX", SND_SOC_NOPM, 0, 0, &wm8400_dapm_ainrmux_controls),
 
 /* Output Side */
 /* DACs */
@@ -789,11 +729,13 @@ static const struct snd_soc_dapm_route wm8400_dapm_routes[] = {
         {"LIN34 PGA", "LIN3 Switch", "LIN3"},
         {"LIN34 PGA", "LIN4 Switch", "LIN4/RXN"},
         /* INMIXL */
+        {"INMIXL", NULL, "INL"},
         {"INMIXL", "Record Left Volume", "LOMIX"},
         {"INMIXL", "LIN2 Volume", "LIN2"},
         {"INMIXL", "LINPGA12 Switch", "LIN12 PGA"},
         {"INMIXL", "LINPGA34 Switch", "LIN34 PGA"},
         /* AILNMUX */
+        {"AILNMUX", NULL, "INL"},
         {"AILNMUX", "INMIXL Mix", "INMIXL"},
         {"AILNMUX", "DIFFINL Mix", "LIN12 PGA"},
         {"AILNMUX", "DIFFINL Mix", "LIN34 PGA"},
@@ -808,12 +750,14 @@ static const struct snd_soc_dapm_route wm8400_dapm_routes[] = {
         /* RIN34 PGA */
         {"RIN34 PGA", "RIN3 Switch", "RIN3"},
         {"RIN34 PGA", "RIN4 Switch", "RIN4/RXP"},
-        /* INMIXL */
+        /* INMIXR */
+        {"INMIXR", NULL, "INR"},
         {"INMIXR", "Record Right Volume", "ROMIX"},
         {"INMIXR", "RIN2 Volume", "RIN2"},
         {"INMIXR", "RINPGA12 Switch", "RIN12 PGA"},
         {"INMIXR", "RINPGA34 Switch", "RIN34 PGA"},
         /* AIRNMUX */
+        {"AIRNMUX", NULL, "INR"},
         {"AIRNMUX", "INMIXR Mix", "INMIXR"},
         {"AIRNMUX", "DIFFINR Mix", "RIN12 PGA"},
         {"AIRNMUX", "DIFFINR Mix", "RIN34 PGA"},
@@ -1365,9 +1309,12 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)
                 return -ENOMEM;
 
         snd_soc_codec_set_drvdata(codec, priv);
-        codec->control_data = priv->wm8400 = wm8400;
+        priv->wm8400 = wm8400;
+        codec->control_data = wm8400->regmap;
         priv->codec = codec;
 
+        snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP);
+
         ret = devm_regulator_bulk_get(wm8400->dev,
                                  ARRAY_SIZE(power), &power[0]);
         if (ret != 0) {
@@ -1414,8 +1361,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8400 = {
         .remove =       wm8400_codec_remove,
         .suspend =      wm8400_suspend,
         .resume =       wm8400_resume,
-        .read = snd_soc_read,
-        .write = wm8400_write,
         .set_bias_level = wm8400_set_bias_level,
 
         .controls = wm8400_snd_controls,
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 11d80f3b6137..2bf9ee7c5407 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3242,7 +3242,7 @@ static void wm8962_free_beep(struct snd_soc_codec *codec)
 }
 #endif
 
-static void wm8962_set_gpio_mode(struct snd_soc_codec *codec, int gpio)
+static void wm8962_set_gpio_mode(struct wm8962_priv *wm8962, int gpio)
 {
         int mask = 0;
         int val = 0;
@@ -3263,8 +3263,8 @@ static void wm8962_set_gpio_mode(struct snd_soc_codec *codec, int gpio)
         }
 
         if (mask)
-                snd_soc_update_bits(codec, WM8962_ANALOGUE_CLOCKING1,
-                                    mask, val);
+                regmap_update_bits(wm8962->regmap, WM8962_ANALOGUE_CLOCKING1,
+                                   mask, val);
 }
 
 #ifdef CONFIG_GPIOLIB
@@ -3276,7 +3276,6 @@ static inline struct wm8962_priv *gpio_to_wm8962(struct gpio_chip *chip)
 static int wm8962_gpio_request(struct gpio_chip *chip, unsigned offset)
 {
         struct wm8962_priv *wm8962 = gpio_to_wm8962(chip);
-        struct snd_soc_codec *codec = wm8962->codec;
 
         /* The WM8962 GPIOs aren't linearly numbered.  For simplicity
          * we export linear numbers and error out if the unsupported
@@ -3292,7 +3291,7 @@ static int wm8962_gpio_request(struct gpio_chip *chip, unsigned offset)
                 return -EINVAL;
         }
 
-        wm8962_set_gpio_mode(codec, offset + 1);
+        wm8962_set_gpio_mode(wm8962, offset + 1);
 
         return 0;
 }
@@ -3376,8 +3375,7 @@ static int wm8962_probe(struct snd_soc_codec *codec)
 {
         int ret;
         struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
-        struct wm8962_pdata *pdata = &wm8962->pdata;
-        int i, trigger, irq_pol;
+        int i;
         bool dmicclk, dmicdat;
 
         wm8962->codec = codec;
@@ -3409,75 +3407,6 @@ static int wm8962_probe(struct snd_soc_codec *codec)
                 }
         }
 
-        /* SYSCLK defaults to on; make sure it is off so we can safely
-         * write to registers if the device is declocked.
-         */
-        snd_soc_update_bits(codec, WM8962_CLOCKING2, WM8962_SYSCLK_ENA, 0);
-
-        /* Ensure we have soft control over all registers */
-        snd_soc_update_bits(codec, WM8962_CLOCKING2,
-                            WM8962_CLKREG_OVD, WM8962_CLKREG_OVD);
-
-        /* Ensure that the oscillator and PLLs are disabled */
-        snd_soc_update_bits(codec, WM8962_PLL2,
-                            WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA,
-                            0);
-
-        /* Apply static configuration for GPIOs */
-        for (i = 0; i < ARRAY_SIZE(pdata->gpio_init); i++)
-                if (pdata->gpio_init[i]) {
-                        wm8962_set_gpio_mode(codec, i + 1);
-                        snd_soc_write(codec, 0x200 + i,
-                                        pdata->gpio_init[i] & 0xffff);
-                }
-
-
-        /* Put the speakers into mono mode? */
-        if (pdata->spk_mono)
-                snd_soc_update_bits(codec, WM8962_CLASS_D_CONTROL_2,
-                                WM8962_SPK_MONO_MASK, WM8962_SPK_MONO);
-
-        /* Micbias setup, detection enable and detection
-         * threasholds. */
-        if (pdata->mic_cfg)
-                snd_soc_update_bits(codec, WM8962_ADDITIONAL_CONTROL_4,
-                                    WM8962_MICDET_ENA |
-                                    WM8962_MICDET_THR_MASK |
-                                    WM8962_MICSHORT_THR_MASK |
-                                    WM8962_MICBIAS_LVL,
-                                    pdata->mic_cfg);
-
-        /* Latch volume update bits */
-        snd_soc_update_bits(codec, WM8962_LEFT_INPUT_VOLUME,
-                            WM8962_IN_VU, WM8962_IN_VU);
-        snd_soc_update_bits(codec, WM8962_RIGHT_INPUT_VOLUME,
-                            WM8962_IN_VU, WM8962_IN_VU);
-        snd_soc_update_bits(codec, WM8962_LEFT_ADC_VOLUME,
-                            WM8962_ADC_VU, WM8962_ADC_VU);
-        snd_soc_update_bits(codec, WM8962_RIGHT_ADC_VOLUME,
-                            WM8962_ADC_VU, WM8962_ADC_VU);
-        snd_soc_update_bits(codec, WM8962_LEFT_DAC_VOLUME,
-                            WM8962_DAC_VU, WM8962_DAC_VU);
-        snd_soc_update_bits(codec, WM8962_RIGHT_DAC_VOLUME,
-                            WM8962_DAC_VU, WM8962_DAC_VU);
-        snd_soc_update_bits(codec, WM8962_SPKOUTL_VOLUME,
-                            WM8962_SPKOUT_VU, WM8962_SPKOUT_VU);
-        snd_soc_update_bits(codec, WM8962_SPKOUTR_VOLUME,
-                            WM8962_SPKOUT_VU, WM8962_SPKOUT_VU);
-        snd_soc_update_bits(codec, WM8962_HPOUTL_VOLUME,
-                            WM8962_HPOUT_VU, WM8962_HPOUT_VU);
-        snd_soc_update_bits(codec, WM8962_HPOUTR_VOLUME,
-                            WM8962_HPOUT_VU, WM8962_HPOUT_VU);
-
-        /* Stereo control for EQ */
-        snd_soc_update_bits(codec, WM8962_EQ1, WM8962_EQ_SHARED_COEFF, 0);
-
-        /* Don't debouce interrupts so we don't need SYSCLK */
-        snd_soc_update_bits(codec, WM8962_IRQ_DEBOUNCE,
-                            WM8962_FLL_LOCK_DB | WM8962_PLL3_LOCK_DB |
-                            WM8962_PLL2_LOCK_DB | WM8962_TEMP_SHUT_DB,
-                            0);
-
         wm8962_add_widgets(codec);
 
         /* Save boards having to disable DMIC when not in use */
@@ -3506,36 +3435,6 @@ static int wm8962_probe(struct snd_soc_codec *codec)
         wm8962_init_beep(codec);
         wm8962_init_gpio(codec);
 
-        if (wm8962->irq) {
-                if (pdata->irq_active_low) {
-                        trigger = IRQF_TRIGGER_LOW;
-                        irq_pol = WM8962_IRQ_POL;
-                } else {
-                        trigger = IRQF_TRIGGER_HIGH;
-                        irq_pol = 0;
-                }
-
-                snd_soc_update_bits(codec, WM8962_INTERRUPT_CONTROL,
-                                    WM8962_IRQ_POL, irq_pol);
-
-                ret = request_threaded_irq(wm8962->irq, NULL, wm8962_irq,
-                                           trigger | IRQF_ONESHOT,
-                                           "wm8962", codec->dev);
-                if (ret != 0) {
-                        dev_err(codec->dev, "Failed to request IRQ %d: %d\n",
-                                wm8962->irq, ret);
-                        wm8962->irq = 0;
-                        /* Non-fatal */
-                } else {
-                        /* Enable some IRQs by default */
-                        snd_soc_update_bits(codec,
-                                            WM8962_INTERRUPT_STATUS_2_MASK,
-                                            WM8962_FLL_LOCK_EINT |
-                                            WM8962_TEMP_SHUT_EINT |
-                                            WM8962_FIFOS_ERR_EINT, 0);
-                }
-        }
-
         return 0;
 }
 
@@ -3544,9 +3443,6 @@ static int wm8962_remove(struct snd_soc_codec *codec)
         struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
         int i;
 
-        if (wm8962->irq)
-                free_irq(wm8962->irq, codec);
-
         cancel_delayed_work_sync(&wm8962->mic_work);
 
         wm8962_free_gpio(codec);
@@ -3619,7 +3515,7 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
         struct wm8962_pdata *pdata = dev_get_platdata(&i2c->dev);
         struct wm8962_priv *wm8962;
         unsigned int reg;
-        int ret, i;
+        int ret, i, irq_pol, trigger;
 
         wm8962 = devm_kzalloc(&i2c->dev, sizeof(struct wm8962_priv),
                               GFP_KERNEL);
@@ -3704,6 +3600,77 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
                 goto err_enable;
         }
 
+        /* SYSCLK defaults to on; make sure it is off so we can safely
+         * write to registers if the device is declocked.
+         */
+        regmap_update_bits(wm8962->regmap, WM8962_CLOCKING2,
+                           WM8962_SYSCLK_ENA, 0);
+
+        /* Ensure we have soft control over all registers */
+        regmap_update_bits(wm8962->regmap, WM8962_CLOCKING2,
+                           WM8962_CLKREG_OVD, WM8962_CLKREG_OVD);
+
+        /* Ensure that the oscillator and PLLs are disabled */
+        regmap_update_bits(wm8962->regmap, WM8962_PLL2,
+                           WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA,
+                           0);
+
+        /* Apply static configuration for GPIOs */
+        for (i = 0; i < ARRAY_SIZE(pdata->gpio_init); i++)
+                if (pdata->gpio_init[i]) {
+                        wm8962_set_gpio_mode(wm8962, i + 1);
+                        regmap_write(wm8962->regmap, 0x200 + i,
+                                     pdata->gpio_init[i] & 0xffff);
+                }
+
+
+        /* Put the speakers into mono mode? */
+        if (pdata->spk_mono)
+                regmap_update_bits(wm8962->regmap, WM8962_CLASS_D_CONTROL_2,
+                                   WM8962_SPK_MONO_MASK, WM8962_SPK_MONO);
+
+        /* Micbias setup, detection enable and detection
+         * threasholds. */
+        if (pdata->mic_cfg)
+                regmap_update_bits(wm8962->regmap, WM8962_ADDITIONAL_CONTROL_4,
+                                   WM8962_MICDET_ENA |
+                                   WM8962_MICDET_THR_MASK |
+                                   WM8962_MICSHORT_THR_MASK |
+                                   WM8962_MICBIAS_LVL,
+                                   pdata->mic_cfg);
+
+        /* Latch volume update bits */
+        regmap_update_bits(wm8962->regmap, WM8962_LEFT_INPUT_VOLUME,
+                           WM8962_IN_VU, WM8962_IN_VU);
+        regmap_update_bits(wm8962->regmap, WM8962_RIGHT_INPUT_VOLUME,
+                           WM8962_IN_VU, WM8962_IN_VU);
+        regmap_update_bits(wm8962->regmap, WM8962_LEFT_ADC_VOLUME,
+                           WM8962_ADC_VU, WM8962_ADC_VU);
+        regmap_update_bits(wm8962->regmap, WM8962_RIGHT_ADC_VOLUME,
+                           WM8962_ADC_VU, WM8962_ADC_VU);
+        regmap_update_bits(wm8962->regmap, WM8962_LEFT_DAC_VOLUME,
+                           WM8962_DAC_VU, WM8962_DAC_VU);
+        regmap_update_bits(wm8962->regmap, WM8962_RIGHT_DAC_VOLUME,
+                           WM8962_DAC_VU, WM8962_DAC_VU);
+        regmap_update_bits(wm8962->regmap, WM8962_SPKOUTL_VOLUME,
+                           WM8962_SPKOUT_VU, WM8962_SPKOUT_VU);
+        regmap_update_bits(wm8962->regmap, WM8962_SPKOUTR_VOLUME,
+                           WM8962_SPKOUT_VU, WM8962_SPKOUT_VU);
+        regmap_update_bits(wm8962->regmap, WM8962_HPOUTL_VOLUME,
+                           WM8962_HPOUT_VU, WM8962_HPOUT_VU);
+        regmap_update_bits(wm8962->regmap, WM8962_HPOUTR_VOLUME,
+                           WM8962_HPOUT_VU, WM8962_HPOUT_VU);
+
+        /* Stereo control for EQ */
+        regmap_update_bits(wm8962->regmap, WM8962_EQ1,
+                           WM8962_EQ_SHARED_COEFF, 0);
+
+        /* Don't debouce interrupts so we don't need SYSCLK */
+        regmap_update_bits(wm8962->regmap, WM8962_IRQ_DEBOUNCE,
+                           WM8962_FLL_LOCK_DB | WM8962_PLL3_LOCK_DB |
+                           WM8962_PLL2_LOCK_DB | WM8962_TEMP_SHUT_DB,
+                           0);
+
         if (wm8962->pdata.in4_dc_measure) {
                 ret = regmap_register_patch(wm8962->regmap,
                                             wm8962_dc_measure,
@@ -3714,6 +3681,37 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
                                 ret);
         }
 
+        if (wm8962->irq) {
+                if (pdata->irq_active_low) {
+                        trigger = IRQF_TRIGGER_LOW;
+                        irq_pol = WM8962_IRQ_POL;
+                } else {
+                        trigger = IRQF_TRIGGER_HIGH;
+                        irq_pol = 0;
+                }
+
+                regmap_update_bits(wm8962->regmap, WM8962_INTERRUPT_CONTROL,
+                                   WM8962_IRQ_POL, irq_pol);
+
+                ret = devm_request_threaded_irq(&i2c->dev, wm8962->irq, NULL,
+                                                wm8962_irq,
+                                                trigger | IRQF_ONESHOT,
+                                                "wm8962", &i2c->dev);
+                if (ret != 0) {
+                        dev_err(&i2c->dev, "Failed to request IRQ %d: %d\n",
+                                wm8962->irq, ret);
+                        wm8962->irq = 0;
+                        /* Non-fatal */
+                } else {
+                        /* Enable some IRQs by default */
+                        regmap_update_bits(wm8962->regmap,
+                                           WM8962_INTERRUPT_STATUS_2_MASK,
+                                           WM8962_FLL_LOCK_EINT |
+                                           WM8962_TEMP_SHUT_EINT |
+                                           WM8962_FIFOS_ERR_EINT, 0);
+                }
+        }
+
         pm_runtime_enable(&i2c->dev);
         pm_request_idle(&i2c->dev);
 
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 6ec3de3efa4f..1392bb3c9254 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -170,13 +170,13 @@ ARIZONA_MIXER_CONTROLS("EQ2", ARIZONA_EQ2MIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("EQ3", ARIZONA_EQ3MIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("EQ4", ARIZONA_EQ4MIX_INPUT_1_SOURCE),
 
-SND_SOC_BYTES_MASK("EQ1 Coefficeints", ARIZONA_EQ1_1, 21,
+SND_SOC_BYTES_MASK("EQ1 Coefficients", ARIZONA_EQ1_1, 21,
                    ARIZONA_EQ1_ENA_MASK),
-SND_SOC_BYTES_MASK("EQ2 Coefficeints", ARIZONA_EQ2_1, 21,
+SND_SOC_BYTES_MASK("EQ2 Coefficients", ARIZONA_EQ2_1, 21,
                    ARIZONA_EQ2_ENA_MASK),
-SND_SOC_BYTES_MASK("EQ3 Coefficeints", ARIZONA_EQ3_1, 21,
+SND_SOC_BYTES_MASK("EQ3 Coefficients", ARIZONA_EQ3_1, 21,
                    ARIZONA_EQ3_ENA_MASK),
-SND_SOC_BYTES_MASK("EQ4 Coefficeints", ARIZONA_EQ4_1, 21,
+SND_SOC_BYTES_MASK("EQ4 Coefficients", ARIZONA_EQ4_1, 21,
                    ARIZONA_EQ4_ENA_MASK),
 
 SOC_SINGLE_TLV("EQ1 B1 Volume", ARIZONA_EQ1_1, ARIZONA_EQ1_B1_GAIN_SHIFT,
@@ -887,7 +887,7 @@ static const struct snd_soc_dapm_route wm8997_dapm_routes[] = {
         ARIZONA_MIXER_ROUTES("Mic Mute Mixer", "Mic"),
 
         ARIZONA_MUX_ROUTES("ISRC1INT1", "ISRC1INT1"),
-        ARIZONA_MUX_ROUTES("ISRC1INT2", "ISRC2INT2"),
+        ARIZONA_MUX_ROUTES("ISRC1INT2", "ISRC1INT2"),
 
         ARIZONA_MUX_ROUTES("ISRC1DEC1", "ISRC1DEC1"),
         ARIZONA_MUX_ROUTES("ISRC1DEC2", "ISRC1DEC2"),
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 8b50e5958de5..01daf655e20b 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -530,6 +530,7 @@ static int hp_supply_event(struct snd_soc_dapm_widget *w,
                                 hubs->hp_startup_mode);
                         break;
                 }
+                break;
 
         case SND_SOC_DAPM_PRE_PMD:
                 snd_soc_update_bits(codec, WM8993_CHARGE_PUMP_1,
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index c82f89c9475b..95970f5db3ec 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -1,9 +1,10 @@
 config SND_DAVINCI_SOC
-        tristate "SoC Audio for the TI DAVINCI chip"
-        depends on ARCH_DAVINCI
+        tristate "SoC Audio for the TI DAVINCI or AM33XX chip"
+        depends on ARCH_DAVINCI || SOC_AM33XX
         help
+          Platform driver for daVinci or AM33xx
           Say Y or M if you want to add support for codecs attached to
-          the DAVINCI AC97 or I2S interface. You will also need
+          the DAVINCI AC97, I2S, or McASP interface. You will also need
           to select the audio interfaces to support below.
 
 config SND_DAVINCI_SOC_I2S
@@ -15,6 +16,17 @@ config SND_DAVINCI_SOC_MCASP
 config SND_DAVINCI_SOC_VCIF
         tristate
 
+config SND_AM33XX_SOC_EVM
+        tristate "SoC Audio for the AM33XX chip based boards"
+        depends on SND_DAVINCI_SOC && SOC_AM33XX
+        select SND_SOC_TLV320AIC3X
+        select SND_DAVINCI_SOC_MCASP
+        help
+          Say Y or M if you want to add support for SoC audio on AM33XX
+          boards using McASP and TLV320AIC3X codec. For example AM335X-EVM,
+          AM335X-EVMSK, and BeagelBone with AudioCape boards have this
+          setup.
+
 config SND_DAVINCI_SOC_EVM
         tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"
         depends on SND_DAVINCI_SOC
diff --git a/sound/soc/davinci/Makefile b/sound/soc/davinci/Makefile
index a396ab6d6d5e..bc81e79fc301 100644
--- a/sound/soc/davinci/Makefile
+++ b/sound/soc/davinci/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_SND_DAVINCI_SOC_VCIF) += snd-soc-davinci-vcif.o
 snd-soc-evm-objs := davinci-evm.o
 
 obj-$(CONFIG_SND_DAVINCI_SOC_EVM) += snd-soc-evm.o
+obj-$(CONFIG_SND_AM33XX_SOC_EVM) += snd-soc-evm.o
 obj-$(CONFIG_SND_DM6467_SOC_EVM) += snd-soc-evm.o
 obj-$(CONFIG_SND_DA830_SOC_EVM) += snd-soc-evm.o
 obj-$(CONFIG_SND_DA850_SOC_EVM) += snd-soc-evm.o
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index fd7c45b9ed5a..623eb5e7c089 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/platform_data/edma.h>
 #include <linux/i2c.h>
+#include <linux/of_platform.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
@@ -23,10 +24,16 @@
 #include <asm/dma.h>
 #include <asm/mach-types.h>
 
+#include <linux/edma.h>
+
 #include "davinci-pcm.h"
 #include "davinci-i2s.h"
 #include "davinci-mcasp.h"
 
+struct snd_soc_card_drvdata_davinci {
+        unsigned sysclk;
+};
+
 #define AUDIO_FORMAT (SND_SOC_DAIFMT_DSP_B | \
                 SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_IB_NF)
 static int evm_hw_params(struct snd_pcm_substream *substream,
@@ -35,27 +42,11 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_card *soc_card = codec->card;
         int ret = 0;
-        unsigned sysclk;
-
-        /* ASP1 on DM355 EVM is clocked by an external oscillator */
-        if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm() ||
-            machine_is_davinci_dm365_evm())
-                sysclk = 27000000;
-
-        /* ASP0 in DM6446 EVM is clocked by U55, as configured by
-         * board-dm644x-evm.c using GPIOs from U18.  There are six
-         * options; here we "know" we use a 48 KHz sample rate.
-         */
-        else if (machine_is_davinci_evm())
-                sysclk = 12288000;
-
-        else if (machine_is_davinci_da830_evm() ||
-                                machine_is_davinci_da850_evm())
-                sysclk = 24576000;
-
-        else
-                return -EINVAL;
+        unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)
+                           snd_soc_card_get_drvdata(soc_card))->sysclk;
 
         /* set codec DAI configuration */
         ret = snd_soc_dai_set_fmt(codec_dai, AUDIO_FORMAT);
@@ -133,13 +124,22 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
+        struct device_node *np = codec->card->dev->of_node;
+        int ret;
 
         /* Add davinci-evm specific widgets */
         snd_soc_dapm_new_controls(dapm, aic3x_dapm_widgets,
                                   ARRAY_SIZE(aic3x_dapm_widgets));
 
-        /* Set up davinci-evm specific audio path audio_map */
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
+        if (np) {
+                ret = snd_soc_of_parse_audio_routing(codec->card,
+                                                        "ti,audio-routing");
+                if (ret)
+                        return ret;
+        } else {
+                /* Set up davinci-evm specific audio path audio_map */
+                snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
+        }
 
         /* not connected */
         snd_soc_dapm_disable_pin(dapm, "MONO_LOUT");
@@ -243,35 +243,65 @@ static struct snd_soc_dai_link da850_evm_dai = {
 };
 
 /* davinci dm6446 evm audio machine driver */
+/*
+ * ASP0 in DM6446 EVM is clocked by U55, as configured by
+ * board-dm644x-evm.c using GPIOs from U18.  There are six
+ * options; here we "know" we use a 48 KHz sample rate.
+ */
+static struct snd_soc_card_drvdata_davinci dm6446_snd_soc_card_drvdata = {
+        .sysclk = 12288000,
+};
+
 static struct snd_soc_card dm6446_snd_soc_card_evm = {
         .name = "DaVinci DM6446 EVM",
         .owner = THIS_MODULE,
         .dai_link = &dm6446_evm_dai,
         .num_links = 1,
+        .drvdata = &dm6446_snd_soc_card_drvdata,
 };
 
 /* davinci dm355 evm audio machine driver */
+/* ASP1 on DM355 EVM is clocked by an external oscillator */
+static struct snd_soc_card_drvdata_davinci dm355_snd_soc_card_drvdata = {
+        .sysclk = 27000000,
+};
+
 static struct snd_soc_card dm355_snd_soc_card_evm = {
         .name = "DaVinci DM355 EVM",
         .owner = THIS_MODULE,
         .dai_link = &dm355_evm_dai,
         .num_links = 1,
+        .drvdata = &dm355_snd_soc_card_drvdata,
 };
 
 /* davinci dm365 evm audio machine driver */
+static struct snd_soc_card_drvdata_davinci dm365_snd_soc_card_drvdata = {
+        .sysclk = 27000000,
+};
+
 static struct snd_soc_card dm365_snd_soc_card_evm = {
         .name = "DaVinci DM365 EVM",
         .owner = THIS_MODULE,
         .dai_link = &dm365_evm_dai,
         .num_links = 1,
+        .drvdata = &dm365_snd_soc_card_drvdata,
 };
 
 /* davinci dm6467 evm audio machine driver */
+static struct snd_soc_card_drvdata_davinci dm6467_snd_soc_card_drvdata = {
+        .sysclk = 27000000,
+};
+
 static struct snd_soc_card dm6467_snd_soc_card_evm = {
         .name = "DaVinci DM6467 EVM",
         .owner = THIS_MODULE,
         .dai_link = dm6467_evm_dai,
         .num_links = ARRAY_SIZE(dm6467_evm_dai),
+        .drvdata = &dm6467_snd_soc_card_drvdata,
+};
+
+static struct snd_soc_card_drvdata_davinci da830_snd_soc_card_drvdata = {
+        .sysclk = 24576000,
 };
 
 static struct snd_soc_card da830_snd_soc_card = {
@@ -279,6 +309,11 @@ static struct snd_soc_card da830_snd_soc_card = {
         .owner = THIS_MODULE,
         .dai_link = &da830_evm_dai,
         .num_links = 1,
+        .drvdata = &da830_snd_soc_card_drvdata,
+};
+
+static struct snd_soc_card_drvdata_davinci da850_snd_soc_card_drvdata = {
+        .sysclk = 24576000,
 };
 
 static struct snd_soc_card da850_snd_soc_card = {
@@ -286,8 +321,101 @@ static struct snd_soc_card da850_snd_soc_card = {
         .owner = THIS_MODULE,
         .dai_link = &da850_evm_dai,
         .num_links = 1,
+        .drvdata = &da850_snd_soc_card_drvdata,
+};
+
+#if defined(CONFIG_OF)
+
+/*
+ * The struct is used as place holder. It will be completely
+ * filled with data from dt node.
+ */
+static struct snd_soc_dai_link evm_dai_tlv320aic3x = {
+        .name           = "TLV320AIC3X",
+        .stream_name    = "AIC3X",
+        .codec_dai_name = "tlv320aic3x-hifi",
+        .ops            = &evm_ops,
+        .init           = evm_aic3x_init,
+};
+
+static const struct of_device_id davinci_evm_dt_ids[] = {
+        {
+                .compatible = "ti,da830-evm-audio",
+                .data = (void *) &evm_dai_tlv320aic3x,
+        },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, davinci_evm_dt_ids);
+
+/* davinci evm audio machine driver */
+static struct snd_soc_card evm_soc_card = {
+        .owner = THIS_MODULE,
+        .num_links = 1,
 };
 
+static int davinci_evm_probe(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        const struct of_device_id *match =
+                of_match_device(of_match_ptr(davinci_evm_dt_ids), &pdev->dev);
+        struct snd_soc_dai_link *dai = (struct snd_soc_dai_link *) match->data;
+        struct snd_soc_card_drvdata_davinci *drvdata = NULL;
+        int ret = 0;
+
+        evm_soc_card.dai_link = dai;
+
+        dai->codec_of_node = of_parse_phandle(np, "ti,audio-codec", 0);
+        if (!dai->codec_of_node)
+                return -EINVAL;
+
+        dai->cpu_of_node = of_parse_phandle(np, "ti,mcasp-controller", 0);
+        if (!dai->cpu_of_node)
+                return -EINVAL;
+
+        dai->platform_of_node = dai->cpu_of_node;
+
+        evm_soc_card.dev = &pdev->dev;
+        ret = snd_soc_of_parse_card_name(&evm_soc_card, "ti,model");
+        if (ret)
+                return ret;
+
+        drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
+        if (!drvdata)
+                return -ENOMEM;
+
+        ret = of_property_read_u32(np, "ti,codec-clock-rate", &drvdata->sysclk);
+        if (ret < 0)
+                return -EINVAL;
+
+        snd_soc_card_set_drvdata(&evm_soc_card, drvdata);
+        ret = devm_snd_soc_register_card(&pdev->dev, &evm_soc_card);
+
+        if (ret)
+                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+
+        return ret;
+}
+
+static int davinci_evm_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_card(card);
+
+        return 0;
+}
+
+static struct platform_driver davinci_evm_driver = {
+        .probe          = davinci_evm_probe,
+        .remove         = davinci_evm_remove,
+        .driver         = {
+                .name   = "davinci_evm",
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(davinci_evm_dt_ids),
+        },
+};
+#endif
+
 static struct platform_device *evm_snd_device;
 
 static int __init evm_init(void)
@@ -296,6 +424,15 @@ static int __init evm_init(void)
         int index;
         int ret;
 
+        /*
+         * If dtb is there, the devices will be created dynamically.
+         * Only register platfrom driver structure.
+         */
+#if defined(CONFIG_OF)
+        if (of_have_populated_dt())
+                return platform_driver_register(&davinci_evm_driver);
+#endif
+
         if (machine_is_davinci_evm()) {
                 evm_snd_dev_data = &dm6446_snd_soc_card_evm;
                 index = 0;
@@ -331,6 +468,13 @@ static int __init evm_init(void)
 
 static void __exit evm_exit(void)
 {
+#if defined(CONFIG_OF)
+        if (of_have_populated_dt()) {
+                platform_driver_unregister(&davinci_evm_driver);
+                return;
+        }
+#endif
+
         platform_device_unregister(evm_snd_device);
 }
 
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 32ddb7fe5034..71e14bb3a8cd 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1001,18 +1001,40 @@ static const struct snd_soc_component_driver davinci_mcasp_component = {
         .name           = "davinci-mcasp",
 };
 
+/* Some HW specific values and defaults. The rest is filled in from DT. */
+static struct snd_platform_data dm646x_mcasp_pdata = {
+        .tx_dma_offset = 0x400,
+        .rx_dma_offset = 0x400,
+        .asp_chan_q = EVENTQ_0,
+        .version = MCASP_VERSION_1,
+};
+
+static struct snd_platform_data da830_mcasp_pdata = {
+        .tx_dma_offset = 0x2000,
+        .rx_dma_offset = 0x2000,
+        .asp_chan_q = EVENTQ_0,
+        .version = MCASP_VERSION_2,
+};
+
+static struct snd_platform_data omap2_mcasp_pdata = {
+        .tx_dma_offset = 0,
+        .rx_dma_offset = 0,
+        .asp_chan_q = EVENTQ_0,
+        .version = MCASP_VERSION_3,
+};
+
 static const struct of_device_id mcasp_dt_ids[] = {
         {
                 .compatible = "ti,dm646x-mcasp-audio",
-                .data = (void *)MCASP_VERSION_1,
+                .data = &dm646x_mcasp_pdata,
         },
         {
                 .compatible = "ti,da830-mcasp-audio",
-                .data = (void *)MCASP_VERSION_2,
+                .data = &da830_mcasp_pdata,
         },
         {
-                .compatible = "ti,omap2-mcasp-audio",
-                .data = (void *)MCASP_VERSION_3,
+                .compatible = "ti,am33xx-mcasp-audio",
+                .data = &omap2_mcasp_pdata,
         },
         { /* sentinel */ }
 };
@@ -1025,9 +1047,9 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
         struct snd_platform_data *pdata = NULL;
         const struct of_device_id *match =
                         of_match_device(mcasp_dt_ids, &pdev->dev);
+        struct of_phandle_args dma_spec;
 
         const u32 *of_serial_dir32;
-        u8 *of_serial_dir;
         u32 val;
         int i, ret = 0;
 
@@ -1035,20 +1057,13 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
                 pdata = pdev->dev.platform_data;
                 return pdata;
         } else if (match) {
-                pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-                if (!pdata) {
-                        ret = -ENOMEM;
-                        goto nodata;
-                }
+                pdata = (struct snd_platform_data *) match->data;
         } else {
                 /* control shouldn't reach here. something is wrong */
                 ret = -EINVAL;
                 goto nodata;
         }
 
-        if (match->data)
-                pdata->version = (u8)((int)match->data);
-
         ret = of_property_read_u32(np, "op-mode", &val);
         if (ret >= 0)
                 pdata->op_mode = val;
@@ -1065,35 +1080,46 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
                 pdata->tdm_slots = val;
         }
 
-        ret = of_property_read_u32(np, "num-serializer", &val);
-        if (ret >= 0)
-                pdata->num_serializer = val;
-
         of_serial_dir32 = of_get_property(np, "serial-dir", &val);
         val /= sizeof(u32);
-        if (val != pdata->num_serializer) {
-                dev_err(&pdev->dev,
-                                "num-serializer(%d) != serial-dir size(%d)\n",
-                                pdata->num_serializer, val);
-                ret = -EINVAL;
-                goto nodata;
-        }
-
         if (of_serial_dir32) {
-                of_serial_dir = devm_kzalloc(&pdev->dev,
-                                                (sizeof(*of_serial_dir) * val),
-                                                GFP_KERNEL);
+                u8 *of_serial_dir = devm_kzalloc(&pdev->dev,
+                                                 (sizeof(*of_serial_dir) * val),
+                                                 GFP_KERNEL);
                 if (!of_serial_dir) {
                         ret = -ENOMEM;
                         goto nodata;
                 }
 
-                for (i = 0; i < pdata->num_serializer; i++)
+                for (i = 0; i < val; i++)
                         of_serial_dir[i] = be32_to_cpup(&of_serial_dir32[i]);
 
+                pdata->num_serializer = val;
                 pdata->serial_dir = of_serial_dir;
         }
 
+        ret = of_property_match_string(np, "dma-names", "tx");
+        if (ret < 0)
+                goto nodata;
+
+        ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells", ret,
+                                         &dma_spec);
+        if (ret < 0)
+                goto nodata;
+
+        pdata->tx_dma_channel = dma_spec.args[0];
+
+        ret = of_property_match_string(np, "dma-names", "rx");
+        if (ret < 0)
+                goto nodata;
+
+        ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells", ret,
+                                         &dma_spec);
+        if (ret < 0)
+                goto nodata;
+
+        pdata->rx_dma_channel = dma_spec.args[0];
+
         ret = of_property_read_u32(np, "tx-num-evt", &val);
         if (ret >= 0)
                 pdata->txnumevt = val;
@@ -1124,7 +1150,7 @@ nodata:
 static int davinci_mcasp_probe(struct platform_device *pdev)
 {
         struct davinci_pcm_dma_params *dma_data;
-        struct resource *mem, *ioarea, *res;
+        struct resource *mem, *ioarea, *res, *dat;
         struct snd_platform_data *pdata;
         struct davinci_audio_dev *dev;
         int ret;
@@ -1145,10 +1171,15 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
         if (!mem) {
-                dev_err(&pdev->dev, "no mem resource?\n");
-                return -ENODEV;
+                dev_warn(dev->dev,
+                         "\"mpu\" mem resource not found, using index 0\n");
+                mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+                if (!mem) {
+                        dev_err(&pdev->dev, "no mem resource?\n");
+                        return -ENODEV;
+                }
         }
 
         ioarea = devm_request_mem_region(&pdev->dev, mem->start,
@@ -1182,40 +1213,36 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
         dev->rxnumevt = pdata->rxnumevt;
         dev->dev = &pdev->dev;
 
+        dat = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dat");
+        if (!dat)
+                dat = mem;
+
         dma_data = &dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK];
         dma_data->asp_chan_q = pdata->asp_chan_q;
         dma_data->ram_chan_q = pdata->ram_chan_q;
         dma_data->sram_pool = pdata->sram_pool;
         dma_data->sram_size = pdata->sram_size_playback;
-        dma_data->dma_addr = (dma_addr_t) (pdata->tx_dma_offset +
-                                                        mem->start);
+        dma_data->dma_addr = dat->start + pdata->tx_dma_offset;
 
-        /* first TX, then RX */
         res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "no DMA resource\n");
-                ret = -ENODEV;
-                goto err_release_clk;
-        }
-
-        dma_data->channel = res->start;
+        if (res)
+                dma_data->channel = res->start;
+        else
+                dma_data->channel = pdata->tx_dma_channel;
 
         dma_data = &dev->dma_params[SNDRV_PCM_STREAM_CAPTURE];
         dma_data->asp_chan_q = pdata->asp_chan_q;
         dma_data->ram_chan_q = pdata->ram_chan_q;
         dma_data->sram_pool = pdata->sram_pool;
         dma_data->sram_size = pdata->sram_size_capture;
-        dma_data->dma_addr = (dma_addr_t)(pdata->rx_dma_offset +
-                                                        mem->start);
+        dma_data->dma_addr = dat->start + pdata->rx_dma_offset;
 
         res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
-        if (!res) {
-                dev_err(&pdev->dev, "no DMA resource\n");
-                ret = -ENODEV;
-                goto err_release_clk;
-        }
+        if (res)
+                dma_data->channel = res->start;
+        else
+                dma_data->channel = pdata->rx_dma_channel;
 
-        dma_data->channel = res->start;
         dev_set_drvdata(&pdev->dev, dev);
         ret = snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,
                                          &davinci_mcasp_dai[pdata->op_mode], 1);
@@ -1251,12 +1278,51 @@ static int davinci_mcasp_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int davinci_mcasp_suspend(struct device *dev)
+{
+        struct davinci_audio_dev *a = dev_get_drvdata(dev);
+        void __iomem *base = a->base;
+
+        a->context.txfmtctl = mcasp_get_reg(base + DAVINCI_MCASP_TXFMCTL_REG);
+        a->context.rxfmtctl = mcasp_get_reg(base + DAVINCI_MCASP_RXFMCTL_REG);
+        a->context.txfmt = mcasp_get_reg(base + DAVINCI_MCASP_TXFMT_REG);
+        a->context.rxfmt = mcasp_get_reg(base + DAVINCI_MCASP_RXFMT_REG);
+        a->context.aclkxctl = mcasp_get_reg(base + DAVINCI_MCASP_ACLKXCTL_REG);
+        a->context.aclkrctl = mcasp_get_reg(base + DAVINCI_MCASP_ACLKRCTL_REG);
+        a->context.pdir = mcasp_get_reg(base + DAVINCI_MCASP_PDIR_REG);
+
+        return 0;
+}
+
+static int davinci_mcasp_resume(struct device *dev)
+{
+        struct davinci_audio_dev *a = dev_get_drvdata(dev);
+        void __iomem *base = a->base;
+
+        mcasp_set_reg(base + DAVINCI_MCASP_TXFMCTL_REG, a->context.txfmtctl);
+        mcasp_set_reg(base + DAVINCI_MCASP_RXFMCTL_REG, a->context.rxfmtctl);
+        mcasp_set_reg(base + DAVINCI_MCASP_TXFMT_REG, a->context.txfmt);
+        mcasp_set_reg(base + DAVINCI_MCASP_RXFMT_REG, a->context.rxfmt);
+        mcasp_set_reg(base + DAVINCI_MCASP_ACLKXCTL_REG, a->context.aclkxctl);
+        mcasp_set_reg(base + DAVINCI_MCASP_ACLKRCTL_REG, a->context.aclkrctl);
+        mcasp_set_reg(base + DAVINCI_MCASP_PDIR_REG, a->context.pdir);
+
+        return 0;
+}
+#endif
+
+SIMPLE_DEV_PM_OPS(davinci_mcasp_pm_ops,
+                  davinci_mcasp_suspend,
+                  davinci_mcasp_resume);
+
 static struct platform_driver davinci_mcasp_driver = {
         .probe          = davinci_mcasp_probe,
         .remove         = davinci_mcasp_remove,
         .driver         = {
                 .name   = "davinci-mcasp",
                 .owner  = THIS_MODULE,
+                .pm     = &davinci_mcasp_pm_ops,
                 .of_match_table = mcasp_dt_ids,
         },
 };
@@ -1266,4 +1332,3 @@ module_platform_driver(davinci_mcasp_driver);
 MODULE_AUTHOR("Steve Chen");
 MODULE_DESCRIPTION("TI DAVINCI McASP SoC Interface");
 MODULE_LICENSE("GPL");
-
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index a9ac0c11da71..a2e27e1c32f3 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -43,6 +43,18 @@ struct davinci_audio_dev {
         /* McASP FIFO related */
         u8      txnumevt;
         u8      rxnumevt;
+
+#ifdef CONFIG_PM_SLEEP
+        struct {
+                u32     txfmtctl;
+                u32     rxfmtctl;
+                u32     txfmt;
+                u32     rxfmt;
+                u32     aclkxctl;
+                u32     aclkrctl;
+                u32     pdir;
+        } context;
+#endif
 };
 
 #endif  /* DAVINCI_MCASP_H */
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 3920c3e849ce..ff1f34766ee3 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -963,7 +963,7 @@ static bool fsl_spdif_readable_reg(struct device *dev, unsigned int reg)
                 return true;
         default:
                 return false;
-        };
+        }
 }
 
 static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg)
@@ -982,7 +982,7 @@ static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg)
                 return true;
         default:
                 return false;
-        };
+        }
 }
 
 static const struct regmap_config fsl_spdif_regmap_config = {
@@ -1172,23 +1172,16 @@ static int fsl_spdif_probe(struct platform_device *pdev)
         /* Register with ASoC */
         dev_set_drvdata(&pdev->dev, spdif_priv);
 
-        ret = snd_soc_register_component(&pdev->dev, &fsl_spdif_component,
-                                         &spdif_priv->cpu_dai_drv, 1);
+        ret = devm_snd_soc_register_component(&pdev->dev, &fsl_spdif_component,
+                                              &spdif_priv->cpu_dai_drv, 1);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
                 return ret;
         }
 
         ret = imx_pcm_dma_init(pdev);
-        if (ret) {
+        if (ret)
                 dev_err(&pdev->dev, "imx_pcm_dma_init failed: %d\n", ret);
-                goto error_component;
-        }
-
-        return ret;
-
-error_component:
-        snd_soc_unregister_component(&pdev->dev);
 
         return ret;
 }
@@ -1196,7 +1189,6 @@ error_component:
 static int fsl_spdif_remove(struct platform_device *pdev)
 {
         imx_pcm_dma_exit(pdev);
-        snd_soc_unregister_component(&pdev->dev);
 
         return 0;
 }
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index c6b743978d5e..35e277379b86 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -469,19 +469,12 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
                          * parameters, then the second stream may be
                          * constrained to the wrong sample rate or size.
                          */
-                        if (!first_runtime->sample_bits) {
-                                dev_err(substream->pcm->card->dev,
-                                        "set sample size in %s stream first\n",
-                                        substream->stream ==
-                                        SNDRV_PCM_STREAM_PLAYBACK
-                                        ? "capture" : "playback");
-                                return -EAGAIN;
-                        }
-
-                        snd_pcm_hw_constraint_minmax(substream->runtime,
-                                SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
+                        if (first_runtime->sample_bits) {
+                                snd_pcm_hw_constraint_minmax(substream->runtime,
+                                                SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
                                 first_runtime->sample_bits,
                                 first_runtime->sample_bits);
+                        }
                 }
 
                 ssi_private->second_stream = substream;
@@ -748,7 +741,7 @@ static void fsl_ssi_ac97_init(void)
         fsl_ssi_setup(fsl_ac97_data);
 }
 
-void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
+static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
                 unsigned short val)
 {
         struct ccsr_ssi *ssi = fsl_ac97_data->ssi;
@@ -770,7 +763,7 @@ void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
         udelay(100);
 }
 
-unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
+static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97,
                 unsigned short reg)
 {
         struct ccsr_ssi *ssi = fsl_ac97_data->ssi;
@@ -936,7 +929,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         ssi_private->ssi_phys = res.start;
 
         ssi_private->irq = irq_of_parse_and_map(np, 0);
-        if (ssi_private->irq == NO_IRQ) {
+        if (!ssi_private->irq) {
                 dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
                 return -ENXIO;
         }
@@ -1135,7 +1128,6 @@ static int fsl_ssi_remove(struct platform_device *pdev)
         if (ssi_private->ssi_on_imx)
                 imx_pcm_dma_exit(pdev);
         snd_soc_unregister_component(&pdev->dev);
-        dev_set_drvdata(&pdev->dev, NULL);
         device_remove_file(&pdev->dev, &ssi_private->dev_attr);
         if (ssi_private->ssi_on_imx)
                 clk_disable_unprepare(ssi_private->clk);
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index d3bf71a0ec56..ac869931d7f1 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -66,13 +66,10 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos)
 {
         ssize_t ret;
-        char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        char *buf;
         int port = (int)file->private_data;
         u32 pdcr, ptcr;
 
-        if (!buf)
-                return -ENOMEM;
-
         if (audmux_clk) {
                 ret = clk_prepare_enable(audmux_clk);
                 if (ret)
@@ -85,6 +82,10 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
         if (audmux_clk)
                 clk_disable_unprepare(audmux_clk);
 
+        buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
         ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
                        pdcr, ptcr);
 
diff --git a/sound/soc/fsl/imx-mc13783.c b/sound/soc/fsl/imx-mc13783.c
index a3d60d4bea4c..79cee782dbbf 100644
--- a/sound/soc/fsl/imx-mc13783.c
+++ b/sound/soc/fsl/imx-mc13783.c
@@ -112,7 +112,7 @@ static int imx_mc13783_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        if (machine_is_mx31_3ds()) {
+        if (machine_is_mx31_3ds() || machine_is_mx31moboard()) {
                 imx_audmux_v2_configure_port(MX31_AUDMUX_PORT4_SSI_PINS_4,
                         IMX_AUDMUX_V2_PTCR_SYN,
                         IMX_AUDMUX_V2_PDCR_RXDSEL(MX31_AUDMUX_PORT1_SSI0) |
@@ -160,6 +160,7 @@ static struct platform_driver imx_mc13783_audio_driver = {
         .driver = {
                 .name = "imx_mc13783",
                 .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
         },
         .probe = imx_mc13783_probe,
         .remove = imx_mc13783_remove
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index ca1be1d9dcf0..f2beae78969f 100644
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -159,7 +159,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
         data->card.dapm_widgets = imx_sgtl5000_dapm_widgets;
         data->card.num_dapm_widgets = ARRAY_SIZE(imx_sgtl5000_dapm_widgets);
 
-        ret = snd_soc_register_card(&data->card);
+        ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
         if (ret) {
                 dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
                 goto fail;
@@ -186,7 +186,6 @@ static int imx_sgtl5000_remove(struct platform_device *pdev)
 {
         struct imx_sgtl5000_data *data = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_card(&data->card);
         clk_put(data->codec_clk);
 
         return 0;
@@ -202,6 +201,7 @@ static struct platform_driver imx_sgtl5000_driver = {
         .driver = {
                 .name = "imx-sgtl5000",
                 .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
                 .of_match_table = imx_sgtl5000_dt_ids,
         },
         .probe = imx_sgtl5000_probe,
diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c
index 816013b0ebba..8499d5292f08 100644
--- a/sound/soc/fsl/imx-spdif.c
+++ b/sound/soc/fsl/imx-spdif.c
@@ -87,7 +87,7 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
         if (ret)
                 goto error_dir;
 
-        ret = snd_soc_register_card(&data->card);
+        ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
         if (ret) {
                 dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);
                 goto error_dir;
@@ -119,8 +119,6 @@ static int imx_spdif_audio_remove(struct platform_device *pdev)
         if (data->txdev)
                 platform_device_unregister(data->txdev);
 
-        snd_soc_unregister_card(&data->card);
-
         return 0;
 }
 
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index f58bcd85c07f..f5f248c91c16 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -600,22 +600,19 @@ static int imx_ssi_probe(struct platform_device *pdev)
         ssi->fiq_params.dma_params_rx = &ssi->dma_params_rx;
         ssi->fiq_params.dma_params_tx = &ssi->dma_params_tx;
 
-        ret = imx_pcm_fiq_init(pdev, &ssi->fiq_params);
-        if (ret)
-                goto failed_pcm_fiq;
+        ssi->fiq_init = imx_pcm_fiq_init(pdev, &ssi->fiq_params);
+        ssi->dma_init = imx_pcm_dma_init(pdev);
 
-        ret = imx_pcm_dma_init(pdev);
-        if (ret)
-                goto failed_pcm_dma;
+        if (ssi->fiq_init && ssi->dma_init) {
+                ret = ssi->fiq_init;
+                goto failed_pcm;
+        }
 
         return 0;
 
-failed_pcm_dma:
-        imx_pcm_fiq_exit(pdev);
-failed_pcm_fiq:
+failed_pcm:
         snd_soc_unregister_component(&pdev->dev);
 failed_register:
-        release_mem_region(res->start, resource_size(res));
         clk_disable_unprepare(ssi->clk);
 failed_clk:
         snd_soc_set_ac97_ops(NULL);
@@ -625,18 +622,19 @@ failed_clk:
 
 static int imx_ssi_remove(struct platform_device *pdev)
 {
-        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         struct imx_ssi *ssi = platform_get_drvdata(pdev);
 
-        imx_pcm_dma_exit(pdev);
-        imx_pcm_fiq_exit(pdev);
+        if (!ssi->dma_init)
+                imx_pcm_dma_exit(pdev);
+
+        if (!ssi->fiq_init)
+                imx_pcm_fiq_exit(pdev);
 
         snd_soc_unregister_component(&pdev->dev);
 
         if (ssi->flags & IMX_SSI_USE_AC97)
                 ac97_ssi = NULL;
 
-        release_mem_region(res->start, resource_size(res));
         clk_disable_unprepare(ssi->clk);
         snd_soc_set_ac97_ops(NULL);
 
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h
index fb1616ba8c59..560c40fc9ebb 100644
--- a/sound/soc/fsl/imx-ssi.h
+++ b/sound/soc/fsl/imx-ssi.h
@@ -211,6 +211,8 @@ struct imx_ssi {
         struct imx_dma_data filter_data_rx;
         struct imx_pcm_fiq_params fiq_params;
 
+        int fiq_init;
+        int dma_init;
         int enabled;
 };
 
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index 722afe69169e..72064e995687 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -266,7 +266,7 @@ static int imx_wm8962_probe(struct platform_device *pdev)
         data->card.late_probe = imx_wm8962_late_probe;
         data->card.set_bias_level = imx_wm8962_set_bias_level;
 
-        ret = snd_soc_register_card(&data->card);
+        ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
         if (ret) {
                 dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
                 goto clk_fail;
@@ -296,7 +296,6 @@ static int imx_wm8962_remove(struct platform_device *pdev)
 
         if (!IS_ERR(data->codec_clk))
                 clk_disable_unprepare(data->codec_clk);
-        snd_soc_unregister_card(&data->card);
 
         return 0;
 }
@@ -311,6 +310,7 @@ static struct platform_driver imx_wm8962_driver = {
         .driver = {
                 .name = "imx-wm8962",
                 .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
                 .of_match_table = imx_wm8962_dt_ids,
         },
         .probe = imx_wm8962_probe,
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 8c49147db84c..b2fbb7075a6c 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -27,6 +27,11 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
         if (!ret && daifmt)
                 ret = snd_soc_dai_set_fmt(dai, daifmt);
 
+        if (ret == -ENOTSUPP) {
+                dev_dbg(dai->dev, "ASoC: set_fmt is not supported\n");
+                ret = 0;
+        }
+
         if (!ret && set->sysclk)
                 ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);
 
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index b238434f92b0..55d0d9d3a9fd 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -29,9 +29,7 @@
 #define KIRKWOOD_FORMATS \
         (SNDRV_PCM_FMTBIT_S16_LE | \
          SNDRV_PCM_FMTBIT_S24_LE | \
-         SNDRV_PCM_FMTBIT_S32_LE | \
-         SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE | \
-         SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_BE)
+         SNDRV_PCM_FMTBIT_S32_LE)
 
 static struct kirkwood_dma_data *kirkwood_priv(struct snd_pcm_substream *subs)
 {
@@ -161,7 +159,7 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
                  * Enable Error interrupts. We're only ack'ing them but
                  * it's useful for diagnostics
                  */
-                writel((unsigned long)-1, priv->io + KIRKWOOD_ERR_MASK);
+                writel((unsigned int)-1, priv->io + KIRKWOOD_ERR_MASK);
         }
 
         dram = mv_mbus_dram_info();
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 0f3d73d4ef48..9ec38d15df9e 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -103,7 +103,7 @@ static void kirkwood_set_rate(struct snd_soc_dai *dai,
 {
         uint32_t clks_ctrl;
 
-        if (rate == 44100 || rate == 48000 || rate == 96000) {
+        if (IS_ERR(priv->extclk)) {
                 /* use internal dco for the supported rates
                  * defined in kirkwood_i2s_dai */
                 dev_dbg(dai->dev, "%s: dco set rate = %lu\n",
@@ -160,9 +160,11 @@ static int kirkwood_i2s_hw_params(struct snd_pcm_substream *substream,
         case SNDRV_PCM_FORMAT_S16_LE:
                 i2s_value |= KIRKWOOD_I2S_CTL_SIZE_16;
                 ctl_play = KIRKWOOD_PLAYCTL_SIZE_16_C |
-                           KIRKWOOD_PLAYCTL_I2S_EN;
+                           KIRKWOOD_PLAYCTL_I2S_EN |
+                           KIRKWOOD_PLAYCTL_SPDIF_EN;
                 ctl_rec = KIRKWOOD_RECCTL_SIZE_16_C |
-                          KIRKWOOD_RECCTL_I2S_EN;
+                          KIRKWOOD_RECCTL_I2S_EN |
+                          KIRKWOOD_RECCTL_SPDIF_EN;
                 break;
         /*
          * doesn't work... S20_3LE != kirkwood 20bit format ?
@@ -178,9 +180,11 @@ static int kirkwood_i2s_hw_params(struct snd_pcm_substream *substream,
         case SNDRV_PCM_FORMAT_S24_LE:
                 i2s_value |= KIRKWOOD_I2S_CTL_SIZE_24;
                 ctl_play = KIRKWOOD_PLAYCTL_SIZE_24 |
-                           KIRKWOOD_PLAYCTL_I2S_EN;
+                           KIRKWOOD_PLAYCTL_I2S_EN |
+                           KIRKWOOD_PLAYCTL_SPDIF_EN;
                 ctl_rec = KIRKWOOD_RECCTL_SIZE_24 |
-                          KIRKWOOD_RECCTL_I2S_EN;
+                          KIRKWOOD_RECCTL_I2S_EN |
+                          KIRKWOOD_RECCTL_SPDIF_EN;
                 break;
         case SNDRV_PCM_FORMAT_S32_LE:
                 i2s_value |= KIRKWOOD_I2S_CTL_SIZE_32;
@@ -240,6 +244,11 @@ static int kirkwood_i2s_play_trigger(struct snd_pcm_substream *substream,
                                    ctl);
         }
 
+        if (dai->id == 0)
+                ctl &= ~KIRKWOOD_PLAYCTL_SPDIF_EN;      /* i2s */
+        else
+                ctl &= ~KIRKWOOD_PLAYCTL_I2S_EN;        /* spdif */
+
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
                 /* configure */
@@ -258,7 +267,8 @@ static int kirkwood_i2s_play_trigger(struct snd_pcm_substream *substream,
 
         case SNDRV_PCM_TRIGGER_STOP:
                 /* stop audio, disable interrupts */
-                ctl |= KIRKWOOD_PLAYCTL_PAUSE | KIRKWOOD_PLAYCTL_I2S_MUTE;
+                ctl |= KIRKWOOD_PLAYCTL_PAUSE | KIRKWOOD_PLAYCTL_I2S_MUTE |
+                                KIRKWOOD_PLAYCTL_SPDIF_MUTE;
                 writel(ctl, priv->io + KIRKWOOD_PLAYCTL);
 
                 value = readl(priv->io + KIRKWOOD_INT_MASK);
@@ -272,13 +282,15 @@ static int kirkwood_i2s_play_trigger(struct snd_pcm_substream *substream,
 
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
         case SNDRV_PCM_TRIGGER_SUSPEND:
-                ctl |= KIRKWOOD_PLAYCTL_PAUSE | KIRKWOOD_PLAYCTL_I2S_MUTE;
+                ctl |= KIRKWOOD_PLAYCTL_PAUSE | KIRKWOOD_PLAYCTL_I2S_MUTE |
+                                KIRKWOOD_PLAYCTL_SPDIF_MUTE;
                 writel(ctl, priv->io + KIRKWOOD_PLAYCTL);
                 break;
 
         case SNDRV_PCM_TRIGGER_RESUME:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                ctl &= ~(KIRKWOOD_PLAYCTL_PAUSE | KIRKWOOD_PLAYCTL_I2S_MUTE);
+                ctl &= ~(KIRKWOOD_PLAYCTL_PAUSE | KIRKWOOD_PLAYCTL_I2S_MUTE |
+                                KIRKWOOD_PLAYCTL_SPDIF_MUTE);
                 writel(ctl, priv->io + KIRKWOOD_PLAYCTL);
                 break;
 
@@ -301,7 +313,13 @@ static int kirkwood_i2s_rec_trigger(struct snd_pcm_substream *substream,
         case SNDRV_PCM_TRIGGER_START:
                 /* configure */
                 ctl = priv->ctl_rec;
-                value = ctl & ~KIRKWOOD_RECCTL_I2S_EN;
+                if (dai->id == 0)
+                        ctl &= ~KIRKWOOD_RECCTL_SPDIF_EN;       /* i2s */
+                else
+                        ctl &= ~KIRKWOOD_RECCTL_I2S_EN;         /* spdif */
+
+                value = ctl & ~(KIRKWOOD_RECCTL_I2S_EN |
+                                KIRKWOOD_RECCTL_SPDIF_EN);
                 writel(value, priv->io + KIRKWOOD_RECCTL);
 
                 /* enable interrupts */
@@ -361,9 +379,8 @@ static int kirkwood_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
         return 0;
 }
 
-static int kirkwood_i2s_probe(struct snd_soc_dai *dai)
+static int kirkwood_i2s_init(struct kirkwood_dma_data *priv)
 {
-        struct kirkwood_dma_data *priv = snd_soc_dai_get_drvdata(dai);
         unsigned long value;
         unsigned int reg_data;
 
@@ -404,9 +421,10 @@ static const struct snd_soc_dai_ops kirkwood_i2s_dai_ops = {
         .set_fmt        = kirkwood_i2s_set_fmt,
 };
 
-
-static struct snd_soc_dai_driver kirkwood_i2s_dai = {
-        .probe = kirkwood_i2s_probe,
+static struct snd_soc_dai_driver kirkwood_i2s_dai[2] = {
+    {
+        .name = "i2s",
+        .id = 0,
         .playback = {
                 .channels_min = 1,
                 .channels_max = 2,
@@ -422,10 +440,53 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai = {
                 .formats = KIRKWOOD_I2S_FORMATS,
         },
         .ops = &kirkwood_i2s_dai_ops,
+    },
+    {
+        .name = "spdif",
+        .id = 1,
+        .playback = {
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
+                                SNDRV_PCM_RATE_96000,
+                .formats = KIRKWOOD_I2S_FORMATS,
+        },
+        .capture = {
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
+                                SNDRV_PCM_RATE_96000,
+                .formats = KIRKWOOD_I2S_FORMATS,
+        },
+        .ops = &kirkwood_i2s_dai_ops,
+    },
 };
 
-static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk = {
-        .probe = kirkwood_i2s_probe,
+static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk[2] = {
+    {
+        .name = "i2s",
+        .id = 0,
+        .playback = {
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_8000_192000 |
+                         SNDRV_PCM_RATE_CONTINUOUS |
+                         SNDRV_PCM_RATE_KNOT,
+                .formats = KIRKWOOD_I2S_FORMATS,
+        },
+        .capture = {
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_8000_192000 |
+                         SNDRV_PCM_RATE_CONTINUOUS |
+                         SNDRV_PCM_RATE_KNOT,
+                .formats = KIRKWOOD_I2S_FORMATS,
+        },
+        .ops = &kirkwood_i2s_dai_ops,
+    },
+    {
+        .name = "spdif",
+        .id = 1,
         .playback = {
                 .channels_min = 1,
                 .channels_max = 2,
@@ -443,6 +504,7 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk = {
                 .formats = KIRKWOOD_I2S_FORMATS,
         },
         .ops = &kirkwood_i2s_dai_ops,
+    },
 };
 
 static const struct snd_soc_component_driver kirkwood_i2s_component = {
@@ -452,7 +514,7 @@ static const struct snd_soc_component_driver kirkwood_i2s_component = {
 static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
 {
         struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data;
-        struct snd_soc_dai_driver *soc_dai = &kirkwood_i2s_dai;
+        struct snd_soc_dai_driver *soc_dai = kirkwood_i2s_dai;
         struct kirkwood_dma_data *priv;
         struct resource *mem;
         struct device_node *np = pdev->dev.of_node;
@@ -496,7 +558,10 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
                 return err;
 
         priv->extclk = devm_clk_get(&pdev->dev, "extclk");
-        if (!IS_ERR(priv->extclk)) {
+        if (IS_ERR(priv->extclk)) {
+                if (PTR_ERR(priv->extclk) == -EPROBE_DEFER)
+                        return -EPROBE_DEFER;
+        } else {
                 if (priv->extclk == priv->clk) {
                         devm_clk_put(&pdev->dev, priv->extclk);
                         priv->extclk = ERR_PTR(-EINVAL);
@@ -521,7 +586,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
         }
 
         err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component,
-                                         soc_dai, 1);
+                                         soc_dai, 2);
         if (err) {
                 dev_err(&pdev->dev, "snd_soc_register_component failed\n");
                 goto err_component;
@@ -532,6 +597,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "snd_soc_register_platform failed\n");
                 goto err_platform;
         }
+
+        kirkwood_i2s_init(priv);
+
         return 0;
  err_platform:
         snd_soc_unregister_component(&pdev->dev);
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c
index 025be0e97164..65f2a5b9ec3b 100644
--- a/sound/soc/kirkwood/kirkwood-openrd.c
+++ b/sound/soc/kirkwood/kirkwood-openrd.c
@@ -52,7 +52,7 @@ static struct snd_soc_dai_link openrd_client_dai[] = {
 {
         .name = "CS42L51",
         .stream_name = "CS42L51 HiFi",
-        .cpu_dai_name = "mvebu-audio",
+        .cpu_dai_name = "i2s",
         .platform_name = "mvebu-audio",
         .codec_dai_name = "cs42l51-hifi",
         .codec_name = "cs42l51-codec.0-004a",
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
index 27545b0c4856..d213832b0c72 100644
--- a/sound/soc/kirkwood/kirkwood-t5325.c
+++ b/sound/soc/kirkwood/kirkwood-t5325.c
@@ -68,7 +68,7 @@ static struct snd_soc_dai_link t5325_dai[] = {
 {
         .name = "ALC5621",
         .stream_name = "ALC5621 HiFi",
-        .cpu_dai_name = "mvebu-audio",
+        .cpu_dai_name = "i2s",
         .platform_name = "mvebu-audio",
         .codec_dai_name = "alc5621-hifi",
         .codec_name = "alc562x-codec.0-001a",
diff --git a/sound/soc/kirkwood/kirkwood.h b/sound/soc/kirkwood/kirkwood.h
index f8e1ccc1c58c..bf23afbba1d7 100644
--- a/sound/soc/kirkwood/kirkwood.h
+++ b/sound/soc/kirkwood/kirkwood.h
@@ -123,8 +123,8 @@
 /* need to find where they come from               */
 #define KIRKWOOD_SND_MIN_PERIODS                8
 #define KIRKWOOD_SND_MAX_PERIODS                16
-#define KIRKWOOD_SND_MIN_PERIOD_BYTES           0x4000
-#define KIRKWOOD_SND_MAX_PERIOD_BYTES           0x4000
+#define KIRKWOOD_SND_MIN_PERIOD_BYTES           0x800
+#define KIRKWOOD_SND_MAX_PERIOD_BYTES           0x8000
 #define KIRKWOOD_SND_MAX_BUFFER_BYTES           (KIRKWOOD_SND_MAX_PERIOD_BYTES \
                                                  * KIRKWOOD_SND_MAX_PERIODS)
 
diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
index ee363845759e..d3d4c32434f7 100644
--- a/sound/soc/mid-x86/mfld_machine.c
+++ b/sound/soc/mid-x86/mfld_machine.c
@@ -400,7 +400,7 @@ static int snd_mfld_mc_probe(struct platform_device *pdev)
         }
         /* register the soc card */
         snd_soc_card_mfld.dev = &pdev->dev;
-        ret_val = snd_soc_register_card(&snd_soc_card_mfld);
+        ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_mfld);
         if (ret_val) {
                 pr_debug("snd_soc_register_card failed %d\n", ret_val);
                 return ret_val;
@@ -410,20 +410,12 @@ static int snd_mfld_mc_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int snd_mfld_mc_remove(struct platform_device *pdev)
-{
-        pr_debug("snd_mfld_mc_remove called\n");
-        snd_soc_unregister_card(&snd_soc_card_mfld);
-        return 0;
-}
-
 static struct platform_driver snd_mfld_mc_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = "msic_audio",
         },
         .probe = snd_mfld_mc_probe,
-        .remove = snd_mfld_mc_remove,
 };
 
 module_platform_driver(snd_mfld_mc_driver);
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index b56b8a0e8deb..54e622acac33 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -494,6 +494,7 @@ static int mxs_saif_trigger(struct snd_pcm_substream *substream, int cmd,
         struct mxs_saif *saif = snd_soc_dai_get_drvdata(cpu_dai);
         struct mxs_saif *master_saif;
         u32 delay;
+        int ret;
 
         master_saif = mxs_saif_get_master(saif);
         if (!master_saif)
@@ -503,23 +504,37 @@ static int mxs_saif_trigger(struct snd_pcm_substream *substream, int cmd,
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                if (saif->state == MXS_SAIF_STATE_RUNNING)
+                        return 0;
+
                 dev_dbg(cpu_dai->dev, "start\n");
 
-                clk_enable(master_saif->clk);
-                if (!master_saif->mclk_in_use)
-                        __raw_writel(BM_SAIF_CTRL_RUN,
-                                master_saif->base + SAIF_CTRL + MXS_SET_ADDR);
+                ret = clk_enable(master_saif->clk);
+                if (ret) {
+                        dev_err(saif->dev, "Failed to enable master clock\n");
+                        return ret;
+                }
 
                 /*
                  * If the saif's master is not himself, we also need to enable
                  * itself clk for its internal basic logic to work.
                  */
                 if (saif != master_saif) {
-                        clk_enable(saif->clk);
+                        ret = clk_enable(saif->clk);
+                        if (ret) {
+                                dev_err(saif->dev, "Failed to enable master clock\n");
+                                clk_disable(master_saif->clk);
+                                return ret;
+                        }
+
                         __raw_writel(BM_SAIF_CTRL_RUN,
                                 saif->base + SAIF_CTRL + MXS_SET_ADDR);
                 }
 
+                if (!master_saif->mclk_in_use)
+                        __raw_writel(BM_SAIF_CTRL_RUN,
+                                master_saif->base + SAIF_CTRL + MXS_SET_ADDR);
+
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                         /*
                          * write data to saif data register to trigger
@@ -543,6 +558,7 @@ static int mxs_saif_trigger(struct snd_pcm_substream *substream, int cmd,
                 }
 
                 master_saif->ongoing = 1;
+                saif->state = MXS_SAIF_STATE_RUNNING;
 
                 dev_dbg(saif->dev, "CTRL 0x%x STAT 0x%x\n",
                         __raw_readl(saif->base + SAIF_CTRL),
@@ -555,6 +571,9 @@ static int mxs_saif_trigger(struct snd_pcm_substream *substream, int cmd,
         case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                if (saif->state == MXS_SAIF_STATE_STOPPED)
+                        return 0;
+
                 dev_dbg(cpu_dai->dev, "stop\n");
 
                 /* wait a while for the current sample to complete */
@@ -575,6 +594,7 @@ static int mxs_saif_trigger(struct snd_pcm_substream *substream, int cmd,
                 }
 
                 master_saif->ongoing = 0;
+                saif->state = MXS_SAIF_STATE_STOPPED;
 
                 break;
         default:
@@ -768,8 +788,8 @@ static int mxs_saif_probe(struct platform_device *pdev)
                         dev_warn(&pdev->dev, "failed to init clocks\n");
         }
 
-        ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
-                                         &mxs_saif_dai, 1);
+        ret = devm_snd_soc_register_component(&pdev->dev, &mxs_saif_component,
+                                              &mxs_saif_dai, 1);
         if (ret) {
                 dev_err(&pdev->dev, "register DAI failed\n");
                 return ret;
@@ -778,21 +798,15 @@ static int mxs_saif_probe(struct platform_device *pdev)
         ret = mxs_pcm_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
-                goto failed_pdev_alloc;
+                return ret;
         }
 
         return 0;
-
-failed_pdev_alloc:
-        snd_soc_unregister_component(&pdev->dev);
-
-        return ret;
 }
 
 static int mxs_saif_remove(struct platform_device *pdev)
 {
         mxs_pcm_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
 
         return 0;
 }
diff --git a/sound/soc/mxs/mxs-saif.h b/sound/soc/mxs/mxs-saif.h
index 53eaa4bf0e27..fbaf7badfdfb 100644
--- a/sound/soc/mxs/mxs-saif.h
+++ b/sound/soc/mxs/mxs-saif.h
@@ -124,6 +124,11 @@ struct mxs_saif {
 
         u32 fifo_underrun;
         u32 fifo_overrun;
+
+        enum {
+                MXS_SAIF_STATE_STOPPED,
+                MXS_SAIF_STATE_RUNNING,
+        } state;
 };
 
 extern int mxs_saif_put_mclk(unsigned int saif_id);
diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c
index 4bb273786ff3..61822cc53bd3 100644
--- a/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@ -122,14 +122,12 @@ static struct snd_soc_card mxs_sgtl5000 = {
         .num_links      = ARRAY_SIZE(mxs_sgtl5000_dai),
 };
 
-static int mxs_sgtl5000_probe_dt(struct platform_device *pdev)
+static int mxs_sgtl5000_probe(struct platform_device *pdev)
 {
+        struct snd_soc_card *card = &mxs_sgtl5000;
+        int ret, i;
         struct device_node *np = pdev->dev.of_node;
         struct device_node *saif_np[2], *codec_np;
-        int i;
-
-        if (!np)
-                return 1; /* no device tree */
 
         saif_np[0] = of_parse_phandle(np, "saif-controllers", 0);
         saif_np[1] = of_parse_phandle(np, "saif-controllers", 1);
@@ -152,18 +150,6 @@ static int mxs_sgtl5000_probe_dt(struct platform_device *pdev)
         of_node_put(saif_np[0]);
         of_node_put(saif_np[1]);
 
-        return 0;
-}
-
-static int mxs_sgtl5000_probe(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = &mxs_sgtl5000;
-        int ret;
-
-        ret = mxs_sgtl5000_probe_dt(pdev);
-        if (ret < 0)
-                return ret;
-
         /*
          * Set an init clock(11.28Mhz) for sgtl5000 initialization(i2c r/w).
          * The Sgtl5000 sysclk is derived from saif0 mclk and it's range
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index daa78a0095fa..4a07f7179690 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -1,6 +1,6 @@
 config SND_OMAP_SOC
         tristate "SoC Audio for the Texas Instruments OMAP chips"
-        depends on (ARCH_OMAP && DMA_OMAP) || (ARCH_ARM && COMPILE_TEST)
+        depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST)
         select SND_DMAENGINE_PCM
 
 config SND_OMAP_SOC_DMIC
@@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810
 
 config SND_OMAP_SOC_RX51
         tristate "SoC Audio support for Nokia RX-51"
-        depends on SND_OMAP_SOC && ARCH_ARM && (MACH_NOKIA_RX51 || COMPILE_TEST)
+        depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 || COMPILE_TEST)
         select SND_OMAP_SOC_MCBSP
         select SND_SOC_TLV320AIC3X
         select SND_SOC_TPA6130A2
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 90d2a7cd2563..cd9ee167959d 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -490,14 +490,9 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
 
         mcpdm->dev = &pdev->dev;
 
-        return snd_soc_register_component(&pdev->dev, &omap_mcpdm_component,
-                                          &omap_mcpdm_dai, 1);
-}
-
-static int asoc_mcpdm_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_component(&pdev->dev);
-        return 0;
+        return devm_snd_soc_register_component(&pdev->dev,
+                                               &omap_mcpdm_component,
+                                               &omap_mcpdm_dai, 1);
 }
 
 static const struct of_device_id omap_mcpdm_of_match[] = {
@@ -514,7 +509,6 @@ static struct platform_driver asoc_mcpdm_driver = {
         },
 
         .probe  = asoc_mcpdm_probe,
-        .remove = asoc_mcpdm_remove,
 };
 
 module_platform_driver(asoc_mcpdm_driver);
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index 2a9324f794d8..6a8d6b5f160d 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -338,9 +338,9 @@ static int omap_twl4030_probe(struct platform_device *pdev)
         }
 
         snd_soc_card_set_drvdata(card, priv);
-        ret = snd_soc_register_card(card);
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
         if (ret) {
-                dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
+                dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n",
                         ret);
                 return ret;
         }
@@ -357,7 +357,6 @@ static int omap_twl4030_remove(struct platform_device *pdev)
                 snd_soc_jack_free_gpios(&priv->hs_jack,
                                         ARRAY_SIZE(hs_jack_gpios),
                                         hs_jack_gpios);
-        snd_soc_unregister_card(card);
 
         return 0;
 }
diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
index 5b7d969f89a9..08acdc236bf8 100644
--- a/sound/soc/pxa/brownstone.c
+++ b/sound/soc/pxa/brownstone.c
@@ -163,6 +163,7 @@ static struct platform_driver mmp_driver = {
         .driver         = {
                 .name   = "brownstone-audio",
                 .owner  = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = brownstone_probe,
         .remove         = brownstone_remove,
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index f4cce1e80112..1853d41034bf 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -329,6 +329,7 @@ static struct platform_driver corgi_driver = {
         .driver         = {
                 .name   = "corgi-audio",
                 .owner  = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = corgi_probe,
         .remove         = corgi_remove,
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c
index 70d799b13f0d..44b5c09d296b 100644
--- a/sound/soc/pxa/e740_wm9705.c
+++ b/sound/soc/pxa/e740_wm9705.c
@@ -178,6 +178,7 @@ static struct platform_driver e740_driver = {
         .driver         = {
                 .name   = "e740-audio",
                 .owner  = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = e740_probe,
         .remove         = e740_remove,
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index f94d2ab51351..c34e447eb991 100644
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -160,6 +160,7 @@ static struct platform_driver e750_driver = {
         .driver         = {
                 .name   = "e750-audio",
                 .owner  = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = e750_probe,
         .remove         = e750_remove,
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 8768a640dd71..3137f800b43f 100644
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@ -150,6 +150,7 @@ static struct platform_driver e800_driver = {
         .driver         = {
                 .name   = "e800-audio",
                 .owner  = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = e800_probe,
         .remove         = e800_remove,
diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c
index eef1f7b7b38e..fd2f4eda1fd3 100644
--- a/sound/soc/pxa/imote2.c
+++ b/sound/soc/pxa/imote2.c
@@ -91,6 +91,7 @@ static struct platform_driver imote2_driver = {
         .driver         = {
                 .name   = "imote2-audio",
                 .owner  = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = imote2_probe,
         .remove         = imote2_remove,
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index bbea7780eac6..160c5245448f 100644
--- a/sound/soc/pxa/mioa701_wm9713.c
+++ b/sound/soc/pxa/mioa701_wm9713.c
@@ -215,6 +215,7 @@ static struct platform_driver mioa701_wm9713_driver = {
         .driver         = {
                 .name           = "mioa701-wm9713",
                 .owner          = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
 };
 
diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c
index 41752a5fe3b0..5bf5f1f7cac5 100644
--- a/sound/soc/pxa/mmp-sspa.c
+++ b/sound/soc/pxa/mmp-sspa.c
@@ -455,8 +455,8 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev)
         priv->dai_fmt = (unsigned int) -1;
         platform_set_drvdata(pdev, priv);
 
-        return snd_soc_register_component(&pdev->dev, &mmp_sspa_component,
-                                          &mmp_sspa_dai, 1);
+        return devm_snd_soc_register_component(&pdev->dev, &mmp_sspa_component,
+                                               &mmp_sspa_dai, 1);
 }
 
 static int asoc_mmp_sspa_remove(struct platform_device *pdev)
@@ -466,7 +466,6 @@ static int asoc_mmp_sspa_remove(struct platform_device *pdev)
         clk_disable(priv->audio_clk);
         clk_put(priv->audio_clk);
         clk_put(priv->sysclk);
-        snd_soc_unregister_component(&pdev->dev);
         return 0;
 }
 
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index e1ffcdd9a649..3284c4b901cb 100644
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -181,6 +181,7 @@ static struct platform_driver palm27x_wm9712_driver = {
         .driver         = {
                 .name           = "palm27x-asoc",
                 .owner          = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
 };
 
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index fafe46355c31..c93e138d8dc3 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -303,6 +303,7 @@ static struct platform_driver poodle_driver = {
         .driver         = {
                 .name   = "poodle-audio",
                 .owner  = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = poodle_probe,
         .remove         = poodle_remove,
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index f1059d999de6..ae956e3f4b9d 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -89,33 +89,6 @@ static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_mic_mono_in = {
         .filter_data    = &pxa2xx_ac97_pcm_aux_mic_mono_req,
 };
 
-#ifdef CONFIG_PM
-static int pxa2xx_ac97_suspend(struct snd_soc_dai *dai)
-{
-        return pxa2xx_ac97_hw_suspend();
-}
-
-static int pxa2xx_ac97_resume(struct snd_soc_dai *dai)
-{
-        return pxa2xx_ac97_hw_resume();
-}
-
-#else
-#define pxa2xx_ac97_suspend     NULL
-#define pxa2xx_ac97_resume      NULL
-#endif
-
-static int pxa2xx_ac97_probe(struct snd_soc_dai *dai)
-{
-        return pxa2xx_ac97_hw_probe(to_platform_device(dai->dev));
-}
-
-static int pxa2xx_ac97_remove(struct snd_soc_dai *dai)
-{
-        pxa2xx_ac97_hw_remove(to_platform_device(dai->dev));
-        return 0;
-}
-
 static int pxa2xx_ac97_hw_params(struct snd_pcm_substream *substream,
                                  struct snd_pcm_hw_params *params,
                                  struct snd_soc_dai *cpu_dai)
@@ -185,10 +158,6 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = {
 {
         .name = "pxa2xx-ac97",
         .ac97_control = 1,
-        .probe = pxa2xx_ac97_probe,
-        .remove = pxa2xx_ac97_remove,
-        .suspend = pxa2xx_ac97_suspend,
-        .resume = pxa2xx_ac97_resume,
         .playback = {
                 .stream_name = "AC97 Playback",
                 .channels_min = 2,
@@ -246,6 +215,12 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
                 return -ENXIO;
         }
 
+        ret = pxa2xx_ac97_hw_probe(pdev);
+        if (ret) {
+                dev_err(&pdev->dev, "PXA2xx AC97 hw probe error (%d)\n", ret);
+                return ret;
+        }
+
         ret = snd_soc_set_ac97_ops(&pxa2xx_ac97_ops);
         if (ret != 0)
                 return ret;
@@ -262,15 +237,34 @@ static int pxa2xx_ac97_dev_remove(struct platform_device *pdev)
 {
         snd_soc_unregister_component(&pdev->dev);
         snd_soc_set_ac97_ops(NULL);
+        pxa2xx_ac97_hw_remove(pdev);
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int pxa2xx_ac97_dev_suspend(struct device *dev)
+{
+        return pxa2xx_ac97_hw_suspend();
+}
+
+static int pxa2xx_ac97_dev_resume(struct device *dev)
+{
+        return pxa2xx_ac97_hw_resume();
+}
+
+static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops,
+                pxa2xx_ac97_dev_suspend, pxa2xx_ac97_dev_resume);
+#endif
+
 static struct platform_driver pxa2xx_ac97_driver = {
         .probe          = pxa2xx_ac97_dev_probe,
         .remove         = pxa2xx_ac97_dev_remove,
         .driver         = {
                 .name   = "pxa2xx-ac97",
                 .owner  = THIS_MODULE,
+#ifdef CONFIG_PM_SLEEP
+                .pm     = &pxa2xx_ac97_pm_ops,
+#endif
         },
 };
 
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index a3fe19123f07..1d9c2ed223bc 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -275,6 +275,7 @@ static struct platform_driver tosa_driver = {
         .driver         = {
                 .name   = "tosa-audio",
                 .owner  = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = tosa_probe,
         .remove         = tosa_remove,
diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c
index 13c9ee0cb83b..0b535b570622 100644
--- a/sound/soc/pxa/ttc-dkb.c
+++ b/sound/soc/pxa/ttc-dkb.c
@@ -160,6 +160,7 @@ static struct platform_driver ttc_dkb_driver = {
         .driver         = {
                 .name   = "ttc-dkb-audio",
                 .owner  = THIS_MODULE,
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = ttc_dkb_probe,
         .remove         = ttc_dkb_remove,
diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
index 29e246803626..84f5d8b76679 100644
--- a/sound/soc/samsung/bells.c
+++ b/sound/soc/samsung/bells.c
@@ -356,6 +356,7 @@ static struct snd_soc_dapm_widget bells_widgets[] = {
 
 static struct snd_soc_dapm_route bells_routes[] = {
         { "Sub CLK_SYS", NULL, "OPCLK" },
+        { "CLKIN", NULL, "OPCLK" },
 
         { "DMIC", NULL, "MICBIAS2" },
         { "IN2L", NULL, "DMIC" },
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 3e08b6c0f7ba..2c4d2505a19e 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1055,7 +1055,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
         i2s->i2s_dai_drv.ops = &samsung_i2s_dai_ops;
         i2s->i2s_dai_drv.suspend = i2s_suspend;
         i2s->i2s_dai_drv.resume = i2s_resume;
-        i2s->i2s_dai_drv.playback.channels_min = 2;
+        i2s->i2s_dai_drv.playback.channels_min = 1;
         i2s->i2s_dai_drv.playback.channels_max = 2;
         i2s->i2s_dai_drv.playback.rates = SAMSUNG_I2S_RATES;
         i2s->i2s_dai_drv.playback.formats = SAMSUNG_I2S_FMTS;
@@ -1138,9 +1138,9 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev, "Unable to get drvdata\n");
                         return -EFAULT;
                 }
-                snd_soc_register_component(&sec_dai->pdev->dev,
-                                           &samsung_i2s_component,
-                                           &sec_dai->i2s_dai_drv, 1);
+                devm_snd_soc_register_component(&sec_dai->pdev->dev,
+                                                &samsung_i2s_component,
+                                                &sec_dai->i2s_dai_drv, 1);
                 samsung_asoc_dma_platform_register(&pdev->dev);
                 return 0;
         }
@@ -1253,8 +1253,9 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component,
-                                   &pri_dai->i2s_dai_drv, 1);
+        devm_snd_soc_register_component(&pri_dai->pdev->dev,
+                                        &samsung_i2s_component,
+                                        &pri_dai->i2s_dai_drv, 1);
 
         pm_runtime_enable(&pdev->dev);
 
@@ -1289,7 +1290,6 @@ static int samsung_i2s_remove(struct platform_device *pdev)
         i2s->sec_dai = NULL;
 
         samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
 
         return 0;
 }
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index 5fd7a05a9b9e..b072bd107b31 100644
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -9,6 +9,7 @@
 
 #include "../codecs/wm8994.h"
 #include <sound/pcm_params.h>
+#include <sound/soc.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -193,7 +194,7 @@ static int smdk_audio_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, board);
 
-        ret = snd_soc_register_card(card);
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
 
         if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret);
@@ -201,23 +202,14 @@ static int smdk_audio_probe(struct platform_device *pdev)
         return ret;
 }
 
-static int smdk_audio_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-        snd_soc_unregister_card(card);
-
-        return 0;
-}
-
 static struct platform_driver smdk_audio_driver = {
         .driver         = {
                 .name   = "smdk-audio-wm8894",
                 .owner  = THIS_MODULE,
                 .of_match_table = of_match_ptr(samsung_wm8994_of_match),
+                .pm     = &snd_soc_pm_ops,
         },
         .probe          = smdk_audio_probe,
-        .remove         = smdk_audio_remove,
 };
 
 module_platform_driver(smdk_audio_driver);
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index d80deb7ccf13..9430097979a5 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -8,7 +8,6 @@
  * for more details.
  */
 #include <linux/sh_clk.h>
-#include <mach/clock.h>
 #include "rsnd.h"
 
 #define CLKA    0
@@ -22,6 +21,7 @@ struct rsnd_adg {
 
         int rate_of_441khz_div_6;
         int rate_of_48khz_div_6;
+        u32 ckr;
 };
 
 #define for_each_rsnd_clk(pos, adg, i)          \
@@ -116,6 +116,11 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate)
 
 found_clock:
 
+        /* see rsnd_adg_ssi_clk_init() */
+        rsnd_mod_bset(mod, SSICKR, 0x00FF0000, adg->ckr);
+        rsnd_mod_write(mod, BRRA,  0x00000002); /* 1/6 */
+        rsnd_mod_write(mod, BRRB,  0x00000002); /* 1/6 */
+
         /*
          * This "mod" = "ssi" here.
          * we can get "ssi id" from mod
@@ -182,9 +187,7 @@ static void rsnd_adg_ssi_clk_init(struct rsnd_priv *priv, struct rsnd_adg *adg)
                 }
         }
 
-        rsnd_priv_bset(priv, SSICKR, 0x00FF0000, ckr);
-        rsnd_priv_write(priv, BRRA,  0x00000002); /* 1/6 */
-        rsnd_priv_write(priv, BRRB,  0x00000002); /* 1/6 */
+        adg->ckr = ckr;
 }
 
 int rsnd_adg_probe(struct platform_device *pdev,
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index a35706028514..b234ed663073 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -103,54 +103,9 @@
  *      rsnd_platform functions
  */
 #define rsnd_platform_call(priv, dai, func, param...)   \
-        (!(priv->info->func) ? -ENODEV :                \
+        (!(priv->info->func) ? 0 :              \
          priv->info->func(param))
 
-
-/*
- *      basic function
- */
-u32 rsnd_read(struct rsnd_priv *priv,
-              struct rsnd_mod *mod, enum rsnd_reg reg)
-{
-        void __iomem *base = rsnd_gen_reg_get(priv, mod, reg);
-
-        BUG_ON(!base);
-
-        return ioread32(base);
-}
-
-void rsnd_write(struct rsnd_priv *priv,
-                struct rsnd_mod *mod,
-                enum rsnd_reg reg, u32 data)
-{
-        void __iomem *base = rsnd_gen_reg_get(priv, mod, reg);
-        struct device *dev = rsnd_priv_to_dev(priv);
-
-        BUG_ON(!base);
-
-        dev_dbg(dev, "w %p : %08x\n", base, data);
-
-        iowrite32(data, base);
-}
-
-void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod,
-               enum rsnd_reg reg, u32 mask, u32 data)
-{
-        void __iomem *base = rsnd_gen_reg_get(priv, mod, reg);
-        struct device *dev = rsnd_priv_to_dev(priv);
-        u32 val;
-
-        BUG_ON(!base);
-
-        val = ioread32(base);
-        val &= ~mask;
-        val |= data & mask;
-        iowrite32(val, base);
-
-        dev_dbg(dev, "s %p : %08x\n", base, val);
-}
-
 /*
  *      rsnd_mod functions
  */
@@ -363,6 +318,9 @@ int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai)
 
 struct rsnd_dai *rsnd_dai_get(struct rsnd_priv *priv, int id)
 {
+        if ((id < 0) || (id >= rsnd_dai_nr(priv)))
+                return NULL;
+
         return priv->rdai + id;
 }
 
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index babb203b43b7..61212ee97c28 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -11,6 +11,11 @@
 #include "rsnd.h"
 
 struct rsnd_gen_ops {
+        int (*probe)(struct platform_device *pdev,
+                     struct rcar_snd_info *info,
+                     struct rsnd_priv *priv);
+        void (*remove)(struct platform_device *pdev,
+                      struct rsnd_priv *priv);
         int (*path_init)(struct rsnd_priv *priv,
                          struct rsnd_dai *rdai,
                          struct rsnd_dai_stream *io);
@@ -19,21 +24,97 @@ struct rsnd_gen_ops {
                          struct rsnd_dai_stream *io);
 };
 
-struct rsnd_gen_reg_map {
-        int index;      /* -1 : not supported */
-        u32 offset_id;  /* offset of ssi0, ssi1, ssi2... */
-        u32 offset_adr; /* offset of SSICR, SSISR, ... */
-};
-
 struct rsnd_gen {
         void __iomem *base[RSND_BASE_MAX];
 
-        struct rsnd_gen_reg_map reg_map[RSND_REG_MAX];
         struct rsnd_gen_ops *ops;
+
+        struct regmap *regmap;
+        struct regmap_field *regs[RSND_REG_MAX];
 };
 
 #define rsnd_priv_to_gen(p)     ((struct rsnd_gen *)(p)->gen)
 
+#define RSND_REG_SET(gen, id, reg_id, offset, _id_offset, _id_size)     \
+        [id] = {                                                        \
+                .reg = (unsigned int)gen->base[reg_id] + offset,        \
+                .lsb = 0,                                               \
+                .msb = 31,                                              \
+                .id_size = _id_size,                                    \
+                .id_offset = _id_offset,                                \
+        }
+
+/*
+ *              basic function
+ */
+static int rsnd_regmap_write32(void *context, const void *_data, size_t count)
+{
+        struct rsnd_priv *priv = context;
+        struct device *dev = rsnd_priv_to_dev(priv);
+        u32 *data = (u32 *)_data;
+        u32 val = data[1];
+        void __iomem *reg = (void *)data[0];
+
+        iowrite32(val, reg);
+
+        dev_dbg(dev, "w %p : %08x\n", reg, val);
+
+        return 0;
+}
+
+static int rsnd_regmap_read32(void *context,
+                              const void *_data, size_t reg_size,
+                              void *_val, size_t val_size)
+{
+        struct rsnd_priv *priv = context;
+        struct device *dev = rsnd_priv_to_dev(priv);
+        u32 *data = (u32 *)_data;
+        u32 *val = (u32 *)_val;
+        void __iomem *reg = (void *)data[0];
+
+        *val = ioread32(reg);
+
+        dev_dbg(dev, "r %p : %08x\n", reg, *val);
+
+        return 0;
+}
+
+static struct regmap_bus rsnd_regmap_bus = {
+        .write                          = rsnd_regmap_write32,
+        .read                           = rsnd_regmap_read32,
+        .reg_format_endian_default      = REGMAP_ENDIAN_NATIVE,
+        .val_format_endian_default      = REGMAP_ENDIAN_NATIVE,
+};
+
+u32 rsnd_read(struct rsnd_priv *priv,
+              struct rsnd_mod *mod, enum rsnd_reg reg)
+{
+        struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
+        u32 val;
+
+        regmap_fields_read(gen->regs[reg], rsnd_mod_id(mod), &val);
+
+        return val;
+}
+
+void rsnd_write(struct rsnd_priv *priv,
+                struct rsnd_mod *mod,
+                enum rsnd_reg reg, u32 data)
+{
+        struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
+
+        regmap_fields_write(gen->regs[reg], rsnd_mod_id(mod), data);
+}
+
+void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod,
+               enum rsnd_reg reg, u32 mask, u32 data)
+{
+        struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
+
+        regmap_fields_update_bits(gen->regs[reg], rsnd_mod_id(mod),
+                                  mask, data);
+}
+
 /*
  *              Gen2
  *              will be filled in the future
@@ -98,44 +179,64 @@ static int rsnd_gen1_path_exit(struct rsnd_priv *priv,
         return ret;
 }
 
-static struct rsnd_gen_ops rsnd_gen1_ops = {
-        .path_init      = rsnd_gen1_path_init,
-        .path_exit      = rsnd_gen1_path_exit,
-};
+/* single address mapping */
+#define RSND_GEN1_S_REG(gen, reg, id, offset)   \
+        RSND_REG_SET(gen, RSND_REG_##id, RSND_GEN1_##reg, offset, 0, 9)
 
-#define RSND_GEN1_REG_MAP(g, s, i, oi, oa)                              \
-        do {                                                            \
-                (g)->reg_map[RSND_REG_##i].index  = RSND_GEN1_##s;      \
-                (g)->reg_map[RSND_REG_##i].offset_id = oi;              \
-                (g)->reg_map[RSND_REG_##i].offset_adr = oa;             \
-        } while (0)
+/* multi address mapping */
+#define RSND_GEN1_M_REG(gen, reg, id, offset, _id_offset)       \
+        RSND_REG_SET(gen, RSND_REG_##id, RSND_GEN1_##reg, offset, _id_offset, 9)
 
-static void rsnd_gen1_reg_map_init(struct rsnd_gen *gen)
+static int rsnd_gen1_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen)
 {
-        RSND_GEN1_REG_MAP(gen, SRU,     SRC_ROUTE_SEL,  0x0,    0x00);
-        RSND_GEN1_REG_MAP(gen, SRU,     SRC_TMG_SEL0,   0x0,    0x08);
-        RSND_GEN1_REG_MAP(gen, SRU,     SRC_TMG_SEL1,   0x0,    0x0c);
-        RSND_GEN1_REG_MAP(gen, SRU,     SRC_TMG_SEL2,   0x0,    0x10);
-        RSND_GEN1_REG_MAP(gen, SRU,     SRC_CTRL,       0x0,    0xc0);
-        RSND_GEN1_REG_MAP(gen, SRU,     SSI_MODE0,      0x0,    0xD0);
-        RSND_GEN1_REG_MAP(gen, SRU,     SSI_MODE1,      0x0,    0xD4);
-        RSND_GEN1_REG_MAP(gen, SRU,     BUSIF_MODE,     0x4,    0x20);
-        RSND_GEN1_REG_MAP(gen, SRU,     BUSIF_ADINR,    0x40,   0x214);
-
-        RSND_GEN1_REG_MAP(gen, ADG,     BRRA,           0x0,    0x00);
-        RSND_GEN1_REG_MAP(gen, ADG,     BRRB,           0x0,    0x04);
-        RSND_GEN1_REG_MAP(gen, ADG,     SSICKR,         0x0,    0x08);
-        RSND_GEN1_REG_MAP(gen, ADG,     AUDIO_CLK_SEL0, 0x0,    0x0c);
-        RSND_GEN1_REG_MAP(gen, ADG,     AUDIO_CLK_SEL1, 0x0,    0x10);
-        RSND_GEN1_REG_MAP(gen, ADG,     AUDIO_CLK_SEL3, 0x0,    0x18);
-        RSND_GEN1_REG_MAP(gen, ADG,     AUDIO_CLK_SEL4, 0x0,    0x1c);
-        RSND_GEN1_REG_MAP(gen, ADG,     AUDIO_CLK_SEL5, 0x0,    0x20);
-
-        RSND_GEN1_REG_MAP(gen, SSI,     SSICR,          0x40,   0x00);
-        RSND_GEN1_REG_MAP(gen, SSI,     SSISR,          0x40,   0x04);
-        RSND_GEN1_REG_MAP(gen, SSI,     SSITDR,         0x40,   0x08);
-        RSND_GEN1_REG_MAP(gen, SSI,     SSIRDR,         0x40,   0x0c);
-        RSND_GEN1_REG_MAP(gen, SSI,     SSIWSR,         0x40,   0x20);
+        int i;
+        struct device *dev = rsnd_priv_to_dev(priv);
+        struct regmap_config regc;
+        struct reg_field regf[RSND_REG_MAX] = {
+                RSND_GEN1_S_REG(gen, SRU,       SRC_ROUTE_SEL,  0x00),
+                RSND_GEN1_S_REG(gen, SRU,       SRC_TMG_SEL0,   0x08),
+                RSND_GEN1_S_REG(gen, SRU,       SRC_TMG_SEL1,   0x0c),
+                RSND_GEN1_S_REG(gen, SRU,       SRC_TMG_SEL2,   0x10),
+                RSND_GEN1_S_REG(gen, SRU,       SRC_CTRL,       0xc0),
+                RSND_GEN1_S_REG(gen, SRU,       SSI_MODE0,      0xD0),
+                RSND_GEN1_S_REG(gen, SRU,       SSI_MODE1,      0xD4),
+                RSND_GEN1_M_REG(gen, SRU,       BUSIF_MODE,     0x20,   0x4),
+                RSND_GEN1_M_REG(gen, SRU,       BUSIF_ADINR,    0x214,  0x40),
+
+                RSND_GEN1_S_REG(gen, ADG,       BRRA,           0x00),
+                RSND_GEN1_S_REG(gen, ADG,       BRRB,           0x04),
+                RSND_GEN1_S_REG(gen, ADG,       SSICKR,         0x08),
+                RSND_GEN1_S_REG(gen, ADG,       AUDIO_CLK_SEL0, 0x0c),
+                RSND_GEN1_S_REG(gen, ADG,       AUDIO_CLK_SEL1, 0x10),
+                RSND_GEN1_S_REG(gen, ADG,       AUDIO_CLK_SEL3, 0x18),
+                RSND_GEN1_S_REG(gen, ADG,       AUDIO_CLK_SEL4, 0x1c),
+                RSND_GEN1_S_REG(gen, ADG,       AUDIO_CLK_SEL5, 0x20),
+
+                RSND_GEN1_M_REG(gen, SSI,       SSICR,          0x00,   0x40),
+                RSND_GEN1_M_REG(gen, SSI,       SSISR,          0x04,   0x40),
+                RSND_GEN1_M_REG(gen, SSI,       SSITDR,         0x08,   0x40),
+                RSND_GEN1_M_REG(gen, SSI,       SSIRDR,         0x0c,   0x40),
+                RSND_GEN1_M_REG(gen, SSI,       SSIWSR,         0x20,   0x40),
+        };
+
+        memset(&regc, 0, sizeof(regc));
+        regc.reg_bits = 32;
+        regc.val_bits = 32;
+
+        gen->regmap = devm_regmap_init(dev, &rsnd_regmap_bus, priv, &regc);
+        if (IS_ERR(gen->regmap)) {
+                dev_err(dev, "regmap error %ld\n", PTR_ERR(gen->regmap));
+                return PTR_ERR(gen->regmap);
+        }
+
+        for (i = 0; i < RSND_REG_MAX; i++) {
+                gen->regs[i] = devm_regmap_field_alloc(dev, gen->regmap, regf[i]);
+                if (IS_ERR(gen->regs[i]))
+                        return PTR_ERR(gen->regs[i]);
+
+        }
+
+        return 0;
 }
 
 static int rsnd_gen1_probe(struct platform_device *pdev,
@@ -147,6 +248,7 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
         struct resource *sru_res;
         struct resource *adg_res;
         struct resource *ssi_res;
+        int ret;
 
         /*
          * map address
@@ -163,8 +265,9 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
             IS_ERR(gen->base[RSND_GEN1_SSI]))
                 return -ENODEV;
 
-        gen->ops = &rsnd_gen1_ops;
-        rsnd_gen1_reg_map_init(gen);
+        ret = rsnd_gen1_regmap_init(priv, gen);
+        if (ret < 0)
+                return ret;
 
         dev_dbg(dev, "Gen1 device probed\n");
         dev_dbg(dev, "SRU : %08x => %p\n",      sru_res->start,
@@ -183,6 +286,13 @@ static void rsnd_gen1_remove(struct platform_device *pdev,
 {
 }
 
+static struct rsnd_gen_ops rsnd_gen1_ops = {
+        .probe          = rsnd_gen1_probe,
+        .remove         = rsnd_gen1_remove,
+        .path_init      = rsnd_gen1_path_init,
+        .path_exit      = rsnd_gen1_path_exit,
+};
+
 /*
  *              Gen
  */
@@ -204,46 +314,12 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv,
         return gen->ops->path_exit(priv, rdai, io);
 }
 
-void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
-                               struct rsnd_mod *mod,
-                               enum rsnd_reg reg)
-{
-        struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
-        struct device *dev = rsnd_priv_to_dev(priv);
-        int index;
-        u32 offset_id, offset_adr;
-
-        if (reg >= RSND_REG_MAX) {
-                dev_err(dev, "rsnd_reg reg error\n");
-                return NULL;
-        }
-
-        index           = gen->reg_map[reg].index;
-        offset_id       = gen->reg_map[reg].offset_id;
-        offset_adr      = gen->reg_map[reg].offset_adr;
-
-        if (index < 0) {
-                dev_err(dev, "unsupported reg access %d\n", reg);
-                return NULL;
-        }
-
-        if (offset_id && mod)
-                offset_id *= rsnd_mod_id(mod);
-
-        /*
-         * index/offset were set on gen1/gen2
-         */
-
-        return gen->base[index] + offset_id + offset_adr;
-}
-
 int rsnd_gen_probe(struct platform_device *pdev,
                    struct rcar_snd_info *info,
                    struct rsnd_priv *priv)
 {
         struct device *dev = rsnd_priv_to_dev(priv);
         struct rsnd_gen *gen;
-        int i;
 
         gen = devm_kzalloc(dev, sizeof(*gen), GFP_KERNEL);
         if (!gen) {
@@ -251,30 +327,23 @@ int rsnd_gen_probe(struct platform_device *pdev,
                 return -ENOMEM;
         }
 
-        priv->gen = gen;
-
-        /*
-         * see
-         *      rsnd_reg_get()
-         *      rsnd_gen_probe()
-         */
-        for (i = 0; i < RSND_REG_MAX; i++)
-                gen->reg_map[i].index = -1;
-
-        /*
-         *      init each module
-         */
         if (rsnd_is_gen1(priv))
-                return rsnd_gen1_probe(pdev, info, priv);
+                gen->ops = &rsnd_gen1_ops;
 
-        dev_err(dev, "unknown generation R-Car sound device\n");
+        if (!gen->ops) {
+                dev_err(dev, "unknown generation R-Car sound device\n");
+                return -ENODEV;
+        }
 
-        return -ENODEV;
+        priv->gen = gen;
+
+        return gen->ops->probe(pdev, info, priv);
 }
 
 void rsnd_gen_remove(struct platform_device *pdev,
                      struct rsnd_priv *priv)
 {
-        if (rsnd_is_gen1(priv))
-                rsnd_gen1_remove(pdev, priv);
+        struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
+
+        gen->ops->remove(pdev, priv);
 }
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 9cc6986a8cfb..9e463e50e7e6 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -78,10 +78,6 @@ struct rsnd_dai_stream;
 #define rsnd_mod_bset(m, r, s, d) \
         rsnd_bset(rsnd_mod_to_priv(m), m, RSND_REG_##r, s, d)
 
-#define rsnd_priv_read(p, r)            rsnd_read(p, NULL, RSND_REG_##r)
-#define rsnd_priv_write(p, r, d)        rsnd_write(p, NULL, RSND_REG_##r, d)
-#define rsnd_priv_bset(p, r, s, d)      rsnd_bset(p, NULL, RSND_REG_##r, s, d)
-
 u32 rsnd_read(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg);
 void rsnd_write(struct rsnd_priv *priv, struct rsnd_mod *mod,
                 enum rsnd_reg reg, u32 data);
@@ -220,8 +216,8 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv,
 void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
                                struct rsnd_mod *mod,
                                enum rsnd_reg reg);
-#define rsnd_is_gen1(s)         ((s)->info->flags & RSND_GEN1)
-#define rsnd_is_gen2(s)         ((s)->info->flags & RSND_GEN2)
+#define rsnd_is_gen1(s)         (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1)
+#define rsnd_is_gen2(s)         (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2)
 
 /*
  *      R-Car ADG
@@ -285,6 +281,7 @@ int rsnd_scu_probe(struct platform_device *pdev,
 void rsnd_scu_remove(struct platform_device *pdev,
                      struct rsnd_priv *priv);
 struct rsnd_mod *rsnd_scu_mod_get(struct rsnd_priv *priv, int id);
+bool rsnd_scu_hpbif_is_enable(struct rsnd_mod *mod);
 #define rsnd_scu_nr(priv) ((priv)->scu_nr)
 
 /*
diff --git a/sound/soc/sh/rcar/scu.c b/sound/soc/sh/rcar/scu.c
index 2df2e9150b89..1ab1bce6be7f 100644
--- a/sound/soc/sh/rcar/scu.c
+++ b/sound/soc/sh/rcar/scu.c
@@ -146,20 +146,26 @@ static int rsnd_scu_set_hpbif(struct rsnd_priv *priv,
         return 0;
 }
 
+bool rsnd_scu_hpbif_is_enable(struct rsnd_mod *mod)
+{
+        struct rsnd_scu *scu = rsnd_mod_to_scu(mod);
+        u32 flags = rsnd_scu_mode_flags(scu);
+
+        return !!(flags & RSND_SCU_USE_HPBIF);
+}
+
 static int rsnd_scu_start(struct rsnd_mod *mod,
                           struct rsnd_dai *rdai,
                           struct rsnd_dai_stream *io)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rsnd_scu *scu = rsnd_mod_to_scu(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
-        u32 flags = rsnd_scu_mode_flags(scu);
         int ret;
 
         /*
          * SCU will be used if it has RSND_SCU_USE_HPBIF flags
          */
-        if (!(flags & RSND_SCU_USE_HPBIF)) {
+        if (!rsnd_scu_hpbif_is_enable(mod)) {
                 /* it use PIO transter */
                 dev_dbg(dev, "%s%d is not used\n",
                         rsnd_mod_name(mod), rsnd_mod_id(mod));
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index fae26d3f79d2..b71cf9d7dd3f 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -101,29 +101,30 @@ struct rsnd_ssiu {
 #define rsnd_ssi_to_ssiu(ssi)\
         (((struct rsnd_ssiu *)((ssi) - rsnd_mod_id(&(ssi)->mod))) - 1)
 
-static void rsnd_ssi_mode_init(struct rsnd_priv *priv,
-                               struct rsnd_ssiu *ssiu)
+static void rsnd_ssi_mode_set(struct rsnd_priv *priv,
+                              struct rsnd_dai *rdai,
+                              struct rsnd_ssi *ssi)
 {
         struct device *dev = rsnd_priv_to_dev(priv);
-        struct rsnd_ssi *ssi;
+        struct rsnd_mod *scu;
+        struct rsnd_ssiu *ssiu = rsnd_ssi_to_ssiu(ssi);
+        int id = rsnd_mod_id(&ssi->mod);
         u32 flags;
         u32 val;
-        int i;
+
+        scu   = rsnd_scu_mod_get(priv, rsnd_mod_id(&ssi->mod));
 
         /*
          * SSI_MODE0
          */
-        ssiu->ssi_mode0 = 0;
-        for_each_rsnd_ssi(ssi, priv, i) {
-                flags = rsnd_ssi_mode_flags(ssi);
-
-                /* see also BUSIF_MODE */
-                if (!(flags & RSND_SSI_DEPENDENT)) {
-                        ssiu->ssi_mode0 |= (1 << i);
-                        dev_dbg(dev, "SSI%d uses INDEPENDENT mode\n", i);
-                } else {
-                        dev_dbg(dev, "SSI%d uses DEPENDENT mode\n", i);
-                }
+
+        /* see also BUSIF_MODE */
+        if (rsnd_scu_hpbif_is_enable(scu)) {
+                ssiu->ssi_mode0 &= ~(1 << id);
+                dev_dbg(dev, "SSI%d uses DEPENDENT mode\n", id);
+        } else {
+                ssiu->ssi_mode0 |= (1 << id);
+                dev_dbg(dev, "SSI%d uses INDEPENDENT mode\n", id);
         }
 
         /*
@@ -132,7 +133,7 @@ static void rsnd_ssi_mode_init(struct rsnd_priv *priv,
 #define ssi_parent_set(p, sync, adg, ext)               \
         do {                                            \
                 ssi->parent = ssiu->ssi + p;            \
-                if (flags & RSND_SSI_CLK_FROM_ADG)      \
+                if (rsnd_rdai_is_clk_master(rdai))      \
                         val = adg;                      \
                 else                                    \
                         val = ext;                      \
@@ -140,15 +141,11 @@ static void rsnd_ssi_mode_init(struct rsnd_priv *priv,
                         val |= sync;                    \
         } while (0)
 
-        ssiu->ssi_mode1 = 0;
-        for_each_rsnd_ssi(ssi, priv, i) {
-                flags = rsnd_ssi_mode_flags(ssi);
-
-                if (!(flags & RSND_SSI_CLK_PIN_SHARE))
-                        continue;
+        flags = rsnd_ssi_mode_flags(ssi);
+        if (flags & RSND_SSI_CLK_PIN_SHARE) {
 
                 val = 0;
-                switch (i) {
+                switch (id) {
                 case 1:
                         ssi_parent_set(0, (1 << 4), (0x2 << 0), (0x1 << 0));
                         break;
@@ -165,11 +162,6 @@ static void rsnd_ssi_mode_init(struct rsnd_priv *priv,
 
                 ssiu->ssi_mode1 |= val;
         }
-}
-
-static void rsnd_ssi_mode_set(struct rsnd_ssi *ssi)
-{
-        struct rsnd_ssiu *ssiu = rsnd_ssi_to_ssiu(ssi);
 
         rsnd_mod_write(&ssi->mod, SSI_MODE0, ssiu->ssi_mode0);
         rsnd_mod_write(&ssi->mod, SSI_MODE1, ssiu->ssi_mode1);
@@ -379,7 +371,7 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
         ssi->cr_own     = cr;
         ssi->err        = -1; /* ignore 1st error */
 
-        rsnd_ssi_mode_set(ssi);
+        rsnd_ssi_mode_set(priv, rdai, ssi);
 
         dev_dbg(dev, "%s.%d init\n", rsnd_mod_name(mod), rsnd_mod_id(mod));
 
@@ -706,8 +698,6 @@ int rsnd_ssi_probe(struct platform_device *pdev,
                 rsnd_mod_init(priv, &ssi->mod, ops, i);
         }
 
-        rsnd_ssi_mode_init(priv, ssiu);
-
         dev_dbg(dev, "ssi probed\n");
 
         return 0;
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index e72f55428f0b..1b6663f45b34 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -11,12 +11,9 @@
  *  option) any later version.
  */
 
-#include <linux/i2c.h>
-#include <linux/spi/spi.h>
 #include <sound/soc.h>
-#include <linux/bitmap.h>
-#include <linux/rbtree.h>
 #include <linux/export.h>
+#include <linux/slab.h>
 
 #include <trace/events/asoc.h>
 
@@ -66,126 +63,42 @@ static unsigned int snd_soc_get_cache_val(const void *base, unsigned int idx,
         return -1;
 }
 
-static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
+int snd_soc_cache_init(struct snd_soc_codec *codec)
 {
-        int i;
-        int ret;
-        const struct snd_soc_codec_driver *codec_drv;
-        unsigned int val;
+        const struct snd_soc_codec_driver *codec_drv = codec->driver;
+        size_t reg_size;
 
-        codec_drv = codec->driver;
-        for (i = 0; i < codec_drv->reg_cache_size; ++i) {
-                ret = snd_soc_cache_read(codec, i, &val);
-                if (ret)
-                        return ret;
-                if (codec->reg_def_copy)
-                        if (snd_soc_get_cache_val(codec->reg_def_copy,
-                                                  i, codec_drv->reg_word_size) == val)
-                                continue;
+        reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;
 
-                WARN_ON(!snd_soc_codec_writable_register(codec, i));
-
-                ret = snd_soc_write(codec, i, val);
-                if (ret)
-                        return ret;
-                dev_dbg(codec->dev, "ASoC: Synced register %#x, value = %#x\n",
-                        i, val);
-        }
-        return 0;
-}
-
-static int snd_soc_flat_cache_write(struct snd_soc_codec *codec,
-                                    unsigned int reg, unsigned int value)
-{
-        snd_soc_set_cache_val(codec->reg_cache, reg, value,
-                              codec->driver->reg_word_size);
-        return 0;
-}
-
-static int snd_soc_flat_cache_read(struct snd_soc_codec *codec,
-                                   unsigned int reg, unsigned int *value)
-{
-        *value = snd_soc_get_cache_val(codec->reg_cache, reg,
-                                       codec->driver->reg_word_size);
-        return 0;
-}
+        mutex_init(&codec->cache_rw_mutex);
 
-static int snd_soc_flat_cache_exit(struct snd_soc_codec *codec)
-{
-        if (!codec->reg_cache)
-                return 0;
-        kfree(codec->reg_cache);
-        codec->reg_cache = NULL;
-        return 0;
-}
+        dev_dbg(codec->dev, "ASoC: Initializing cache for %s codec\n",
+                                codec->name);
 
-static int snd_soc_flat_cache_init(struct snd_soc_codec *codec)
-{
-        if (codec->reg_def_copy)
-                codec->reg_cache = kmemdup(codec->reg_def_copy,
-                                           codec->reg_size, GFP_KERNEL);
+        if (codec_drv->reg_cache_default)
+                codec->reg_cache = kmemdup(codec_drv->reg_cache_default,
+                                           reg_size, GFP_KERNEL);
         else
-                codec->reg_cache = kzalloc(codec->reg_size, GFP_KERNEL);
+                codec->reg_cache = kzalloc(reg_size, GFP_KERNEL);
         if (!codec->reg_cache)
                 return -ENOMEM;
 
         return 0;
 }
 
-/* an array of all supported compression types */
-static const struct snd_soc_cache_ops cache_types[] = {
-        /* Flat *must* be the first entry for fallback */
-        {
-                .id = SND_SOC_FLAT_COMPRESSION,
-                .name = "flat",
-                .init = snd_soc_flat_cache_init,
-                .exit = snd_soc_flat_cache_exit,
-                .read = snd_soc_flat_cache_read,
-                .write = snd_soc_flat_cache_write,
-                .sync = snd_soc_flat_cache_sync
-        },
-};
-
-int snd_soc_cache_init(struct snd_soc_codec *codec)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(cache_types); ++i)
-                if (cache_types[i].id == codec->compress_type)
-                        break;
-
-        /* Fall back to flat compression */
-        if (i == ARRAY_SIZE(cache_types)) {
-                dev_warn(codec->dev, "ASoC: Could not match compress type: %d\n",
-                         codec->compress_type);
-                i = 0;
-        }
-
-        mutex_init(&codec->cache_rw_mutex);
-        codec->cache_ops = &cache_types[i];
-
-        if (codec->cache_ops->init) {
-                if (codec->cache_ops->name)
-                        dev_dbg(codec->dev, "ASoC: Initializing %s cache for %s codec\n",
-                                codec->cache_ops->name, codec->name);
-                return codec->cache_ops->init(codec);
-        }
-        return -ENOSYS;
-}
-
 /*
  * NOTE: keep in mind that this function might be called
  * multiple times.
  */
 int snd_soc_cache_exit(struct snd_soc_codec *codec)
 {
-        if (codec->cache_ops && codec->cache_ops->exit) {
-                if (codec->cache_ops->name)
-                        dev_dbg(codec->dev, "ASoC: Destroying %s cache for %s codec\n",
-                                codec->cache_ops->name, codec->name);
-                return codec->cache_ops->exit(codec);
-        }
-        return -ENOSYS;
+        dev_dbg(codec->dev, "ASoC: Destroying cache for %s codec\n",
+                        codec->name);
+        if (!codec->reg_cache)
+                return 0;
+        kfree(codec->reg_cache);
+        codec->reg_cache = NULL;
+        return 0;
 }
 
 /**
@@ -198,18 +111,15 @@ int snd_soc_cache_exit(struct snd_soc_codec *codec)
 int snd_soc_cache_read(struct snd_soc_codec *codec,
                        unsigned int reg, unsigned int *value)
 {
-        int ret;
+        if (!value)
+                return -EINVAL;
 
         mutex_lock(&codec->cache_rw_mutex);
-
-        if (value && codec->cache_ops && codec->cache_ops->read) {
-                ret = codec->cache_ops->read(codec, reg, value);
-                mutex_unlock(&codec->cache_rw_mutex);
-                return ret;
-        }
-
+        *value = snd_soc_get_cache_val(codec->reg_cache, reg,
+                                       codec->driver->reg_word_size);
         mutex_unlock(&codec->cache_rw_mutex);
-        return -ENOSYS;
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_cache_read);
 
@@ -223,20 +133,42 @@ EXPORT_SYMBOL_GPL(snd_soc_cache_read);
 int snd_soc_cache_write(struct snd_soc_codec *codec,
                         unsigned int reg, unsigned int value)
 {
+        mutex_lock(&codec->cache_rw_mutex);
+        snd_soc_set_cache_val(codec->reg_cache, reg, value,
+                              codec->driver->reg_word_size);
+        mutex_unlock(&codec->cache_rw_mutex);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_cache_write);
+
+static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
+{
+        int i;
         int ret;
+        const struct snd_soc_codec_driver *codec_drv;
+        unsigned int val;
 
-        mutex_lock(&codec->cache_rw_mutex);
+        codec_drv = codec->driver;
+        for (i = 0; i < codec_drv->reg_cache_size; ++i) {
+                ret = snd_soc_cache_read(codec, i, &val);
+                if (ret)
+                        return ret;
+                if (codec_drv->reg_cache_default)
+                        if (snd_soc_get_cache_val(codec_drv->reg_cache_default,
+                                                  i, codec_drv->reg_word_size) == val)
+                                continue;
 
-        if (codec->cache_ops && codec->cache_ops->write) {
-                ret = codec->cache_ops->write(codec, reg, value);
-                mutex_unlock(&codec->cache_rw_mutex);
-                return ret;
-        }
+                WARN_ON(!snd_soc_codec_writable_register(codec, i));
 
-        mutex_unlock(&codec->cache_rw_mutex);
-        return -ENOSYS;
+                ret = snd_soc_write(codec, i, val);
+                if (ret)
+                        return ret;
+                dev_dbg(codec->dev, "ASoC: Synced register %#x, value = %#x\n",
+                        i, val);
+        }
+        return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_cache_write);
 
 /**
  * snd_soc_cache_sync: Sync the register cache with the hardware.
@@ -249,92 +181,19 @@ EXPORT_SYMBOL_GPL(snd_soc_cache_write);
  */
 int snd_soc_cache_sync(struct snd_soc_codec *codec)
 {
+        const char *name = "flat";
         int ret;
-        const char *name;
 
-        if (!codec->cache_sync) {
+        if (!codec->cache_sync)
                 return 0;
-        }
-
-        if (!codec->cache_ops || !codec->cache_ops->sync)
-                return -ENOSYS;
 
-        if (codec->cache_ops->name)
-                name = codec->cache_ops->name;
-        else
-                name = "unknown";
-
-        if (codec->cache_ops->name)
-                dev_dbg(codec->dev, "ASoC: Syncing %s cache for %s codec\n",
-                        codec->cache_ops->name, codec->name);
+        dev_dbg(codec->dev, "ASoC: Syncing cache for %s codec\n",
+                codec->name);
         trace_snd_soc_cache_sync(codec, name, "start");
-        ret = codec->cache_ops->sync(codec);
+        ret = snd_soc_flat_cache_sync(codec);
         if (!ret)
                 codec->cache_sync = 0;
         trace_snd_soc_cache_sync(codec, name, "end");
         return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_cache_sync);
-
-static int snd_soc_get_reg_access_index(struct snd_soc_codec *codec,
-                                        unsigned int reg)
-{
-        const struct snd_soc_codec_driver *codec_drv;
-        unsigned int min, max, index;
-
-        codec_drv = codec->driver;
-        min = 0;
-        max = codec_drv->reg_access_size - 1;
-        do {
-                index = (min + max) / 2;
-                if (codec_drv->reg_access_default[index].reg == reg)
-                        return index;
-                if (codec_drv->reg_access_default[index].reg < reg)
-                        min = index + 1;
-                else
-                        max = index;
-        } while (min <= max);
-        return -1;
-}
-
-int snd_soc_default_volatile_register(struct snd_soc_codec *codec,
-                                      unsigned int reg)
-{
-        int index;
-
-        if (reg >= codec->driver->reg_cache_size)
-                return 1;
-        index = snd_soc_get_reg_access_index(codec, reg);
-        if (index < 0)
-                return 0;
-        return codec->driver->reg_access_default[index].vol;
-}
-EXPORT_SYMBOL_GPL(snd_soc_default_volatile_register);
-
-int snd_soc_default_readable_register(struct snd_soc_codec *codec,
-                                      unsigned int reg)
-{
-        int index;
-
-        if (reg >= codec->driver->reg_cache_size)
-                return 1;
-        index = snd_soc_get_reg_access_index(codec, reg);
-        if (index < 0)
-                return 0;
-        return codec->driver->reg_access_default[index].read;
-}
-EXPORT_SYMBOL_GPL(snd_soc_default_readable_register);
-
-int snd_soc_default_writable_register(struct snd_soc_codec *codec,
-                                      unsigned int reg)
-{
-        int index;
-
-        if (reg >= codec->driver->reg_cache_size)
-                return 1;
-        index = snd_soc_get_reg_access_index(codec, reg);
-        if (index < 0)
-                return 0;
-        return codec->driver->reg_access_default[index].write;
-}
-EXPORT_SYMBOL_GPL(snd_soc_default_writable_register);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1a38be0d0ca8..afc3fa8b7470 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1589,17 +1589,13 @@ static void soc_remove_aux_dev(struct snd_soc_card *card, int num)
                 soc_remove_codec(codec);
 }
 
-static int snd_soc_init_codec_cache(struct snd_soc_codec *codec,
-                                    enum snd_soc_compress_type compress_type)
+static int snd_soc_init_codec_cache(struct snd_soc_codec *codec)
 {
         int ret;
 
         if (codec->cache_init)
                 return 0;
 
-        /* override the compress_type if necessary */
-        if (compress_type && codec->compress_type != compress_type)
-                codec->compress_type = compress_type;
         ret = snd_soc_cache_init(codec);
         if (ret < 0) {
                 dev_err(codec->dev,
@@ -1614,8 +1610,6 @@ static int snd_soc_init_codec_cache(struct snd_soc_codec *codec,
 static int snd_soc_instantiate_card(struct snd_soc_card *card)
 {
         struct snd_soc_codec *codec;
-        struct snd_soc_codec_conf *codec_conf;
-        enum snd_soc_compress_type compress_type;
         struct snd_soc_dai_link *dai_link;
         int ret, i, order, dai_fmt;
 
@@ -1639,19 +1633,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
         list_for_each_entry(codec, &codec_list, list) {
                 if (codec->cache_init)
                         continue;
-                /* by default we don't override the compress_type */
-                compress_type = 0;
-                /* check to see if we need to override the compress_type */
-                for (i = 0; i < card->num_configs; ++i) {
-                        codec_conf = &card->codec_conf[i];
-                        if (!strcmp(codec->name, codec_conf->dev_name)) {
-                                compress_type = codec_conf->compress_type;
-                                if (compress_type && compress_type
-                                    != codec->compress_type)
-                                        break;
-                        }
-                }
-                ret = snd_soc_init_codec_cache(codec, compress_type);
+                ret = snd_soc_init_codec_cache(codec);
                 if (ret < 0)
                         goto base_error;
         }
@@ -2297,13 +2279,6 @@ unsigned int snd_soc_write(struct snd_soc_codec *codec,
 }
 EXPORT_SYMBOL_GPL(snd_soc_write);
 
-unsigned int snd_soc_bulk_write_raw(struct snd_soc_codec *codec,
-                                    unsigned int reg, const void *data, size_t len)
-{
-        return codec->bulk_write_raw(codec, reg, data, len);
-}
-EXPORT_SYMBOL_GPL(snd_soc_bulk_write_raw);
-
 /**
  * snd_soc_update_bits - update codec register bits
  * @codec: audio codec
@@ -3576,6 +3551,22 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source,
 EXPORT_SYMBOL_GPL(snd_soc_codec_set_pll);
 
 /**
+ * snd_soc_dai_set_bclk_ratio - configure BCLK to sample rate ratio.
+ * @dai: DAI
+ * @ratio Ratio of BCLK to Sample rate.
+ *
+ * Configures the DAI for a preset BCLK to sample rate ratio.
+ */
+int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
+{
+        if (dai->driver && dai->driver->ops->set_bclk_ratio)
+                return dai->driver->ops->set_bclk_ratio(dai, ratio);
+        else
+                return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_ratio);
+
+/**
  * snd_soc_dai_set_fmt - configure DAI hardware audio format.
  * @dai: DAI
  * @fmt: SND_SOC_DAIFMT_ format value.
@@ -4020,6 +4011,113 @@ static void snd_soc_unregister_dais(struct device *dev, size_t count)
 }
 
 /**
+ * snd_soc_register_component - Register a component with the ASoC core
+ *
+ */
+static int
+__snd_soc_register_component(struct device *dev,
+                             struct snd_soc_component *cmpnt,
+                             const struct snd_soc_component_driver *cmpnt_drv,
+                             struct snd_soc_dai_driver *dai_drv,
+                             int num_dai, bool allow_single_dai)
+{
+        int ret;
+
+        dev_dbg(dev, "component register %s\n", dev_name(dev));
+
+        if (!cmpnt) {
+                dev_err(dev, "ASoC: Failed to connecting component\n");
+                return -ENOMEM;
+        }
+
+        cmpnt->name = fmt_single_name(dev, &cmpnt->id);
+        if (!cmpnt->name) {
+                dev_err(dev, "ASoC: Failed to simplifying name\n");
+                return -ENOMEM;
+        }
+
+        cmpnt->dev      = dev;
+        cmpnt->driver   = cmpnt_drv;
+        cmpnt->dai_drv  = dai_drv;
+        cmpnt->num_dai  = num_dai;
+
+        /*
+         * snd_soc_register_dai()  uses fmt_single_name(), and
+         * snd_soc_register_dais() uses fmt_multiple_name()
+         * for dai->name which is used for name based matching
+         *
+         * this function is used from cpu/codec.
+         * allow_single_dai flag can ignore "codec" driver reworking
+         * since it had been used snd_soc_register_dais(),
+         */
+        if ((1 == num_dai) && allow_single_dai)
+                ret = snd_soc_register_dai(dev, dai_drv);
+        else
+                ret = snd_soc_register_dais(dev, dai_drv, num_dai);
+        if (ret < 0) {
+                dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret);
+                goto error_component_name;
+        }
+
+        mutex_lock(&client_mutex);
+        list_add(&cmpnt->list, &component_list);
+        mutex_unlock(&client_mutex);
+
+        dev_dbg(cmpnt->dev, "ASoC: Registered component '%s'\n", cmpnt->name);
+
+        return ret;
+
+error_component_name:
+        kfree(cmpnt->name);
+
+        return ret;
+}
+
+int snd_soc_register_component(struct device *dev,
+                               const struct snd_soc_component_driver *cmpnt_drv,
+                               struct snd_soc_dai_driver *dai_drv,
+                               int num_dai)
+{
+        struct snd_soc_component *cmpnt;
+
+        cmpnt = devm_kzalloc(dev, sizeof(*cmpnt), GFP_KERNEL);
+        if (!cmpnt) {
+                dev_err(dev, "ASoC: Failed to allocate memory\n");
+                return -ENOMEM;
+        }
+
+        return __snd_soc_register_component(dev, cmpnt, cmpnt_drv,
+                                            dai_drv, num_dai, true);
+}
+EXPORT_SYMBOL_GPL(snd_soc_register_component);
+
+/**
+ * snd_soc_unregister_component - Unregister a component from the ASoC core
+ *
+ */
+void snd_soc_unregister_component(struct device *dev)
+{
+        struct snd_soc_component *cmpnt;
+
+        list_for_each_entry(cmpnt, &component_list, list) {
+                if (dev == cmpnt->dev)
+                        goto found;
+        }
+        return;
+
+found:
+        snd_soc_unregister_dais(dev, cmpnt->num_dai);
+
+        mutex_lock(&client_mutex);
+        list_del(&cmpnt->list);
+        mutex_unlock(&client_mutex);
+
+        dev_dbg(dev, "ASoC: Unregistered component '%s'\n", cmpnt->name);
+        kfree(cmpnt->name);
+}
+EXPORT_SYMBOL_GPL(snd_soc_unregister_component);
+
+/**
  * snd_soc_add_platform - Add a platform to the ASoC core
  * @dev: The parent device for the platform
  * @platform: The platform to add
@@ -4165,7 +4263,6 @@ int snd_soc_register_codec(struct device *dev,
                            struct snd_soc_dai_driver *dai_drv,
                            int num_dai)
 {
-        size_t reg_size;
         struct snd_soc_codec *codec;
         int ret, i;
 
@@ -4182,11 +4279,6 @@ int snd_soc_register_codec(struct device *dev,
                 goto fail_codec;
         }
 
-        if (codec_drv->compress_type)
-                codec->compress_type = codec_drv->compress_type;
-        else
-                codec->compress_type = SND_SOC_FLAT_COMPRESSION;
-
         codec->write = codec_drv->write;
         codec->read = codec_drv->read;
         codec->volatile_register = codec_drv->volatile_register;
@@ -4203,35 +4295,6 @@ int snd_soc_register_codec(struct device *dev,
         codec->num_dai = num_dai;
         mutex_init(&codec->mutex);
 
-        /* allocate CODEC register cache */
-        if (codec_drv->reg_cache_size && codec_drv->reg_word_size) {
-                reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;
-                codec->reg_size = reg_size;
-                /* it is necessary to make a copy of the default register cache
-                 * because in the case of using a compression type that requires
-                 * the default register cache to be marked as the
-                 * kernel might have freed the array by the time we initialize
-                 * the cache.
-                 */
-                if (codec_drv->reg_cache_default) {
-                        codec->reg_def_copy = kmemdup(codec_drv->reg_cache_default,
-                                                      reg_size, GFP_KERNEL);
-                        if (!codec->reg_def_copy) {
-                                ret = -ENOMEM;
-                                goto fail_codec_name;
-                        }
-                }
-        }
-
-        if (codec_drv->reg_access_size && codec_drv->reg_access_default) {
-                if (!codec->volatile_register)
-                        codec->volatile_register = snd_soc_default_volatile_register;
-                if (!codec->readable_register)
-                        codec->readable_register = snd_soc_default_readable_register;
-                if (!codec->writable_register)
-                        codec->writable_register = snd_soc_default_writable_register;
-        }
-
         for (i = 0; i < num_dai; i++) {
                 fixup_codec_formats(&dai_drv[i].playback);
                 fixup_codec_formats(&dai_drv[i].capture);
@@ -4241,10 +4304,12 @@ int snd_soc_register_codec(struct device *dev,
         list_add(&codec->list, &codec_list);
         mutex_unlock(&client_mutex);
 
-        /* register any DAIs */
-        ret = snd_soc_register_dais(dev, dai_drv, num_dai);
+        /* register component */
+        ret = __snd_soc_register_component(dev, &codec->component,
+                                           &codec_drv->component_driver,
+                                           dai_drv, num_dai, false);
         if (ret < 0) {
-                dev_err(codec->dev, "ASoC: Failed to regster DAIs: %d\n", ret);
+                dev_err(codec->dev, "ASoC: Failed to regster component: %d\n", ret);
                 goto fail_codec_name;
         }
 
@@ -4279,7 +4344,7 @@ void snd_soc_unregister_codec(struct device *dev)
         return;
 
 found:
-        snd_soc_unregister_dais(dev, codec->num_dai);
+        snd_soc_unregister_component(dev);
 
         mutex_lock(&client_mutex);
         list_del(&codec->list);
@@ -4288,98 +4353,11 @@ found:
         dev_dbg(codec->dev, "ASoC: Unregistered codec '%s'\n", codec->name);
 
         snd_soc_cache_exit(codec);
-        kfree(codec->reg_def_copy);
         kfree(codec->name);
         kfree(codec);
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);
 
-
-/**
- * snd_soc_register_component - Register a component with the ASoC core
- *
- */
-int snd_soc_register_component(struct device *dev,
-                         const struct snd_soc_component_driver *cmpnt_drv,
-                         struct snd_soc_dai_driver *dai_drv,
-                         int num_dai)
-{
-        struct snd_soc_component *cmpnt;
-        int ret;
-
-        dev_dbg(dev, "component register %s\n", dev_name(dev));
-
-        cmpnt = devm_kzalloc(dev, sizeof(*cmpnt), GFP_KERNEL);
-        if (!cmpnt) {
-                dev_err(dev, "ASoC: Failed to allocate memory\n");
-                return -ENOMEM;
-        }
-
-        cmpnt->name = fmt_single_name(dev, &cmpnt->id);
-        if (!cmpnt->name) {
-                dev_err(dev, "ASoC: Failed to simplifying name\n");
-                return -ENOMEM;
-        }
-
-        cmpnt->dev      = dev;
-        cmpnt->driver   = cmpnt_drv;
-        cmpnt->num_dai  = num_dai;
-
-        /*
-         * snd_soc_register_dai()  uses fmt_single_name(), and
-         * snd_soc_register_dais() uses fmt_multiple_name()
-         * for dai->name which is used for name based matching
-         */
-        if (1 == num_dai)
-                ret = snd_soc_register_dai(dev, dai_drv);
-        else
-                ret = snd_soc_register_dais(dev, dai_drv, num_dai);
-        if (ret < 0) {
-                dev_err(dev, "ASoC: Failed to regster DAIs: %d\n", ret);
-                goto error_component_name;
-        }
-
-        mutex_lock(&client_mutex);
-        list_add(&cmpnt->list, &component_list);
-        mutex_unlock(&client_mutex);
-
-        dev_dbg(cmpnt->dev, "ASoC: Registered component '%s'\n", cmpnt->name);
-
-        return ret;
-
-error_component_name:
-        kfree(cmpnt->name);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(snd_soc_register_component);
-
-/**
- * snd_soc_unregister_component - Unregister a component from the ASoC core
- *
- */
-void snd_soc_unregister_component(struct device *dev)
-{
-        struct snd_soc_component *cmpnt;
-
-        list_for_each_entry(cmpnt, &component_list, list) {
-                if (dev == cmpnt->dev)
-                        goto found;
-        }
-        return;
-
-found:
-        snd_soc_unregister_dais(dev, cmpnt->num_dai);
-
-        mutex_lock(&client_mutex);
-        list_del(&cmpnt->list);
-        mutex_unlock(&client_mutex);
-
-        dev_dbg(dev, "ASoC: Unregistered component '%s'\n", cmpnt->name);
-        kfree(cmpnt->name);
-}
-EXPORT_SYMBOL_GPL(snd_soc_unregister_component);
-
 /* Retrieve a card's name from device tree */
 int snd_soc_of_parse_card_name(struct snd_soc_card *card,
                                const char *propname)
@@ -4567,6 +4545,60 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(snd_soc_of_parse_daifmt);
 
+int snd_soc_of_get_dai_name(struct device_node *of_node,
+                            const char **dai_name)
+{
+        struct snd_soc_component *pos;
+        struct of_phandle_args args;
+        int ret;
+
+        ret = of_parse_phandle_with_args(of_node, "sound-dai",
+                                         "#sound-dai-cells", 0, &args);
+        if (ret)
+                return ret;
+
+        ret = -EPROBE_DEFER;
+
+        mutex_lock(&client_mutex);
+        list_for_each_entry(pos, &component_list, list) {
+                if (pos->dev->of_node != args.np)
+                        continue;
+
+                if (pos->driver->of_xlate_dai_name) {
+                        ret = pos->driver->of_xlate_dai_name(pos, &args, dai_name);
+                } else {
+                        int id = -1;
+
+                        switch (args.args_count) {
+                        case 0:
+                                id = 0; /* same as dai_drv[0] */
+                                break;
+                        case 1:
+                                id = args.args[0];
+                                break;
+                        default:
+                                /* not supported */
+                                break;
+                        }
+
+                        if (id < 0 || id >= pos->num_dai) {
+                                ret = -EINVAL;
+                        } else {
+                                *dai_name = pos->dai_drv[id].name;
+                                ret = 0;
+                        }
+                }
+
+                break;
+        }
+        mutex_unlock(&client_mutex);
+
+        of_node_put(args.np);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_of_get_dai_name);
+
 static int __init snd_soc_init(void)
 {
 #ifdef CONFIG_DEBUG_FS
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index c17c14c394df..cc36caaf6443 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -59,31 +59,31 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
 /* dapm power sequences - make this per codec in the future */
 static int dapm_up_seq[] = {
         [snd_soc_dapm_pre] = 0,
-        [snd_soc_dapm_supply] = 1,
         [snd_soc_dapm_regulator_supply] = 1,
         [snd_soc_dapm_clock_supply] = 1,
-        [snd_soc_dapm_micbias] = 2,
+        [snd_soc_dapm_supply] = 2,
+        [snd_soc_dapm_micbias] = 3,
         [snd_soc_dapm_dai_link] = 2,
-        [snd_soc_dapm_dai_in] = 3,
-        [snd_soc_dapm_dai_out] = 3,
-        [snd_soc_dapm_aif_in] = 3,
-        [snd_soc_dapm_aif_out] = 3,
-        [snd_soc_dapm_mic] = 4,
-        [snd_soc_dapm_mux] = 5,
-        [snd_soc_dapm_virt_mux] = 5,
-        [snd_soc_dapm_value_mux] = 5,
-        [snd_soc_dapm_dac] = 6,
-        [snd_soc_dapm_switch] = 7,
-        [snd_soc_dapm_mixer] = 7,
-        [snd_soc_dapm_mixer_named_ctl] = 7,
-        [snd_soc_dapm_pga] = 8,
-        [snd_soc_dapm_adc] = 9,
-        [snd_soc_dapm_out_drv] = 10,
-        [snd_soc_dapm_hp] = 10,
-        [snd_soc_dapm_spk] = 10,
-        [snd_soc_dapm_line] = 10,
-        [snd_soc_dapm_kcontrol] = 11,
-        [snd_soc_dapm_post] = 12,
+        [snd_soc_dapm_dai_in] = 4,
+        [snd_soc_dapm_dai_out] = 4,
+        [snd_soc_dapm_aif_in] = 4,
+        [snd_soc_dapm_aif_out] = 4,
+        [snd_soc_dapm_mic] = 5,
+        [snd_soc_dapm_mux] = 6,
+        [snd_soc_dapm_virt_mux] = 6,
+        [snd_soc_dapm_value_mux] = 6,
+        [snd_soc_dapm_dac] = 7,
+        [snd_soc_dapm_switch] = 8,
+        [snd_soc_dapm_mixer] = 8,
+        [snd_soc_dapm_mixer_named_ctl] = 8,
+        [snd_soc_dapm_pga] = 9,
+        [snd_soc_dapm_adc] = 10,
+        [snd_soc_dapm_out_drv] = 11,
+        [snd_soc_dapm_hp] = 11,
+        [snd_soc_dapm_spk] = 11,
+        [snd_soc_dapm_line] = 11,
+        [snd_soc_dapm_kcontrol] = 12,
+        [snd_soc_dapm_post] = 13,
 };
 
 static int dapm_down_seq[] = {
@@ -109,10 +109,10 @@ static int dapm_down_seq[] = {
         [snd_soc_dapm_dai_in] = 10,
         [snd_soc_dapm_dai_out] = 10,
         [snd_soc_dapm_dai_link] = 11,
-        [snd_soc_dapm_clock_supply] = 12,
-        [snd_soc_dapm_regulator_supply] = 12,
         [snd_soc_dapm_supply] = 12,
-        [snd_soc_dapm_post] = 13,
+        [snd_soc_dapm_clock_supply] = 13,
+        [snd_soc_dapm_regulator_supply] = 13,
+        [snd_soc_dapm_post] = 14,
 };
 
 static void pop_wait(u32 pop_time)
@@ -409,6 +409,12 @@ static inline void soc_widget_unlock(struct snd_soc_dapm_widget *w)
                 mutex_unlock(&w->platform->mutex);
 }
 
+static void soc_dapm_async_complete(struct snd_soc_dapm_context *dapm)
+{
+        if (dapm->codec && dapm->codec->using_regmap)
+                regmap_async_complete(dapm->codec->control_data);
+}
+
 static int soc_widget_update_bits_locked(struct snd_soc_dapm_widget *w,
         unsigned short reg, unsigned int mask, unsigned int value)
 {
@@ -417,8 +423,9 @@ static int soc_widget_update_bits_locked(struct snd_soc_dapm_widget *w,
         int ret;
 
         if (w->codec && w->codec->using_regmap) {
-                ret = regmap_update_bits_check(w->codec->control_data,
-                                               reg, mask, value, &change);
+                ret = regmap_update_bits_check_async(w->codec->control_data,
+                                                     reg, mask, value,
+                                                     &change);
                 if (ret != 0)
                         return ret;
         } else {
@@ -499,18 +506,22 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
                 int val;
                 struct soc_mixer_control *mc = (struct soc_mixer_control *)
                         w->kcontrol_news[i].private_value;
-                unsigned int reg = mc->reg;
+                int reg = mc->reg;
                 unsigned int shift = mc->shift;
                 int max = mc->max;
                 unsigned int mask = (1 << fls(max)) - 1;
                 unsigned int invert = mc->invert;
 
-                val = soc_widget_read(w, reg);
-                val = (val >> shift) & mask;
-                if (invert)
-                        val = max - val;
+                if (reg != SND_SOC_NOPM) {
+                        val = soc_widget_read(w, reg);
+                        val = (val >> shift) & mask;
+                        if (invert)
+                                val = max - val;
+                        p->connect = !!val;
+                } else {
+                        p->connect = 0;
+                }
 
-                p->connect = !!val;
         }
         break;
         case snd_soc_dapm_mux: {
@@ -1197,6 +1208,8 @@ int dapm_regulator_event(struct snd_soc_dapm_widget *w,
 {
         int ret;
 
+        soc_dapm_async_complete(w->dapm);
+
         if (SND_SOC_DAPM_EVENT_ON(event)) {
                 if (w->on_val & SND_SOC_DAPM_REGULATOR_BYPASS) {
                         ret = regulator_allow_bypass(w->regulator, false);
@@ -1230,6 +1243,8 @@ int dapm_clock_event(struct snd_soc_dapm_widget *w,
         if (!w->clk)
                 return -EIO;
 
+        soc_dapm_async_complete(w->dapm);
+
 #ifdef CONFIG_HAVE_CLK
         if (SND_SOC_DAPM_EVENT_ON(event)) {
                 return clk_prepare_enable(w->clk);
@@ -1422,6 +1437,7 @@ static void dapm_seq_check_event(struct snd_soc_card *card,
         if (w->event && (w->event_flags & event)) {
                 pop_dbg(w->dapm->dev, card->pop_time, "pop test : %s %s\n",
                         w->name, ev_name);
+                soc_dapm_async_complete(w->dapm);
                 trace_snd_soc_dapm_widget_event_start(w, event);
                 ret = w->event(w, NULL, event);
                 trace_snd_soc_dapm_widget_event_done(w, event);
@@ -1494,6 +1510,7 @@ static void dapm_seq_run(struct snd_soc_card *card,
         struct list_head *list, int event, bool power_up)
 {
         struct snd_soc_dapm_widget *w, *n;
+        struct snd_soc_dapm_context *d;
         LIST_HEAD(pending);
         int cur_sort = -1;
         int cur_subseq = -1;
@@ -1524,6 +1541,9 @@ static void dapm_seq_run(struct snd_soc_card *card,
                                                                        cur_subseq);
                         }
 
+                        if (cur_dapm && w->dapm != cur_dapm)
+                                soc_dapm_async_complete(cur_dapm);
+
                         INIT_LIST_HEAD(&pending);
                         cur_sort = -1;
                         cur_subseq = INT_MIN;
@@ -1582,6 +1602,10 @@ static void dapm_seq_run(struct snd_soc_card *card,
                                 cur_dapm->seq_notifier(cur_dapm,
                                                        i, cur_subseq);
         }
+
+        list_for_each_entry(d, &card->dapm_list, list) {
+                soc_dapm_async_complete(d);
+        }
 }
 
 static void dapm_widget_update(struct snd_soc_card *card)
@@ -1840,6 +1864,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
                          */
                         switch (w->id) {
                         case snd_soc_dapm_siggen:
+                        case snd_soc_dapm_vmid:
                                 break;
                         case snd_soc_dapm_supply:
                         case snd_soc_dapm_regulator_supply:
@@ -1949,7 +1974,7 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
                                 w->active ? "active" : "inactive");
 
         list_for_each_entry(p, &w->sources, list_sink) {
-                if (p->connected && !p->connected(w, p->sink))
+                if (p->connected && !p->connected(w, p->source))
                         continue;
 
                 if (p->connect)
@@ -2791,7 +2816,7 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
         struct snd_soc_card *card = codec->card;
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        unsigned int reg = mc->reg;
+        int reg = mc->reg;
         unsigned int shift = mc->shift;
         int max = mc->max;
         unsigned int mask = (1 << fls(max)) - 1;
@@ -2804,7 +2829,7 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
                          kcontrol->id.name);
 
         mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
-        if (dapm_kcontrol_is_powered(kcontrol))
+        if (dapm_kcontrol_is_powered(kcontrol) && reg != SND_SOC_NOPM)
                 val = (snd_soc_read(codec, reg) >> shift) & mask;
         else
                 val = dapm_kcontrol_get_value(kcontrol);
@@ -2835,7 +2860,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
         struct snd_soc_card *card = codec->card;
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        unsigned int reg = mc->reg;
+        int reg = mc->reg;
         unsigned int shift = mc->shift;
         int max = mc->max;
         unsigned int mask = (1 << fls(max)) - 1;
@@ -2857,19 +2882,24 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
 
         mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
 
-        dapm_kcontrol_set_value(kcontrol, val);
+        change = dapm_kcontrol_set_value(kcontrol, val);
 
-        mask = mask << shift;
-        val = val << shift;
+        if (reg != SND_SOC_NOPM) {
+                mask = mask << shift;
+                val = val << shift;
+
+                change = snd_soc_test_bits(codec, reg, mask, val);
+        }
 
-        change = snd_soc_test_bits(codec, reg, mask, val);
         if (change) {
-                update.kcontrol = kcontrol;
-                update.reg = reg;
-                update.mask = mask;
-                update.val = val;
+                if (reg != SND_SOC_NOPM) {
+                        update.kcontrol = kcontrol;
+                        update.reg = reg;
+                        update.mask = mask;
+                        update.val = val;
 
-                card->update = &update;
+                        card->update = &update;
+                }
 
                 soc_dapm_mixer_update_power(card, kcontrol, connect);
 
@@ -3495,6 +3525,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
                 if (!w) {
                         dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",
                                 dai->driver->playback.stream_name);
+                        return -ENOMEM;
                 }
 
                 w->priv = dai;
@@ -3513,6 +3544,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
                 if (!w) {
                         dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",
                                 dai->driver->capture.stream_name);
+                        return -ENOMEM;
                 }
 
                 w->priv = dai;
diff --git a/sound/soc/soc-devres.c b/sound/soc/soc-devres.c
new file mode 100644
index 000000000000..b1d732255c02
--- /dev/null
+++ b/sound/soc/soc-devres.c
@@ -0,0 +1,86 @@
+/*
+ * soc-devres.c  --  ALSA SoC Audio Layer devres functions
+ *
+ * Copyright (C) 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/module.h>
+#include <linux/moduleparam.h>
+#include <sound/soc.h>
+
+static void devm_component_release(struct device *dev, void *res)
+{
+        snd_soc_unregister_component(*(struct device **)res);
+}
+
+/**
+ * devm_snd_soc_register_component - resource managed component registration
+ * @dev: Device used to manage component
+ * @cmpnt_drv: Component driver
+ * @dai_drv: DAI driver
+ * @num_dai: Number of DAIs to register
+ *
+ * Register a component with automatic unregistration when the device is
+ * unregistered.
+ */
+int devm_snd_soc_register_component(struct device *dev,
+                         const struct snd_soc_component_driver *cmpnt_drv,
+                         struct snd_soc_dai_driver *dai_drv, int num_dai)
+{
+        struct device **ptr;
+        int ret;
+
+        ptr = devres_alloc(devm_component_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return -ENOMEM;
+
+        ret = snd_soc_register_component(dev, cmpnt_drv, dai_drv, num_dai);
+        if (ret == 0) {
+                *ptr = dev;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(devm_snd_soc_register_component);
+
+static void devm_card_release(struct device *dev, void *res)
+{
+        snd_soc_unregister_card(*(struct snd_soc_card **)res);
+}
+
+/**
+ * devm_snd_soc_register_card - resource managed card registration
+ * @dev: Device used to manage card
+ * @card: Card to register
+ *
+ * Register a card with automatic unregistration when the device is
+ * unregistered.
+ */
+int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card)
+{
+        struct device **ptr;
+        int ret;
+
+        ptr = devres_alloc(devm_card_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return -ENOMEM;
+
+        ret = snd_soc_register_card(card);
+        if (ret == 0) {
+                *ptr = dev;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(devm_snd_soc_register_card);
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 122c0c18b9dd..4f11d23f2062 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -65,31 +65,6 @@ static unsigned int hw_read(struct snd_soc_codec *codec, unsigned int reg)
         return val;
 }
 
-/* Primitive bulk write support for soc-cache.  The data pointed to by
- * `data' needs to already be in the form the hardware expects.  Any
- * data written through this function will not go through the cache as
- * it only handles writing to volatile or out of bounds registers.
- *
- * This is currently only supported for devices using the regmap API
- * wrappers.
- */
-static int snd_soc_hw_bulk_write_raw(struct snd_soc_codec *codec,
-                                     unsigned int reg,
-                                     const void *data, size_t len)
-{
-        /* To ensure that we don't get out of sync with the cache, check
-         * whether the base register is volatile or if we've directly asked
-         * to bypass the cache.  Out of bounds registers are considered
-         * volatile.
-         */
-        if (!codec->cache_bypass
-            && !snd_soc_codec_volatile_register(codec, reg)
-            && reg < codec->driver->reg_cache_size)
-                return -EINVAL;
-
-        return regmap_raw_write(codec->control_data, reg, data, len);
-}
-
 /**
  * snd_soc_codec_set_cache_io: Set up standard I/O functions.
  *
@@ -119,7 +94,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
         memset(&config, 0, sizeof(config));
         codec->write = hw_write;
         codec->read = hw_read;
-        codec->bulk_write_raw = snd_soc_hw_bulk_write_raw;
 
         config.reg_bits = addr_bits;
         config.val_bits = data_bits;
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 71358e3b54d9..23d43dac91da 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -65,6 +65,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
         struct snd_soc_codec *codec;
         struct snd_soc_dapm_context *dapm;
         struct snd_soc_jack_pin *pin;
+        unsigned int sync = 0;
         int enable;
 
         trace_snd_soc_jack_report(jack, mask, status);
@@ -92,12 +93,16 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
                         snd_soc_dapm_enable_pin(dapm, pin->pin);
                 else
                         snd_soc_dapm_disable_pin(dapm, pin->pin);
+
+                /* we need to sync for this case only */
+                sync = 1;
         }
 
         /* Report before the DAPM sync to help users updating micbias status */
         blocking_notifier_call_chain(&jack->notifier, jack->status, jack);
 
-        snd_soc_dapm_sync(dapm);
+        if (sync)
+                snd_soc_dapm_sync(dapm);
 
         snd_jack_report(jack->jack, jack->status);
 
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 330c9a6b5cb5..d4498723b375 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -721,7 +721,7 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,
         list_add(&dpcm->list_be, &fe->dpcm[stream].be_clients);
         list_add(&dpcm->list_fe, &be->dpcm[stream].fe_clients);
 
-        dev_dbg(fe->dev, "  connected new DPCM %s path %s %s %s\n",
+        dev_dbg(fe->dev, "connected new DPCM %s path %s %s %s\n",
                         stream ? "capture" : "playback",  fe->dai_link->name,
                         stream ? "<-" : "->", be->dai_link->name);
 
@@ -749,7 +749,7 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe,
                 if (dpcm->fe == fe)
                         continue;
 
-                dev_dbg(fe->dev, "  reparent %s path %s %s %s\n",
+                dev_dbg(fe->dev, "reparent %s path %s %s %s\n",
                         stream ? "capture" : "playback",
                         dpcm->fe->dai_link->name,
                         stream ? "<-" : "->", dpcm->be->dai_link->name);
@@ -773,7 +773,7 @@ static void dpcm_be_disconnect(struct snd_soc_pcm_runtime *fe, int stream)
                 if (dpcm->state != SND_SOC_DPCM_LINK_STATE_FREE)
                         continue;
 
-                dev_dbg(fe->dev, "  freed DSP %s path %s %s %s\n",
+                dev_dbg(fe->dev, "freed DSP %s path %s %s %s\n",
                         stream ? "capture" : "playback", fe->dai_link->name,
                         stream ? "<-" : "->", dpcm->be->dai_link->name);
 
@@ -2116,7 +2116,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
 
         pcm->private_free = platform->driver->pcm_free;
 out:
-        dev_info(rtd->card->dev, " %s <-> %s mapping ok\n", codec_dai->name,
+        dev_info(rtd->card->dev, "%s <-> %s mapping ok\n", codec_dai->name,
                 cpu_dai->name);
         return ret;
 }
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index 29b211e9c060..5e633659c1b3 100644
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -75,7 +75,11 @@ static const struct snd_pcm_hardware dummy_dma_hardware = {
 
 static int dummy_dma_open(struct snd_pcm_substream *substream)
 {
-        snd_soc_set_runtime_hwparams(substream, &dummy_dma_hardware);
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+
+        /* BE's dont need dummy params */
+        if (!rtd->dai_link->no_pcm)
+                snd_soc_set_runtime_hwparams(substream, &dummy_dma_hardware);
 
         return 0;
 }
diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c
index 63acfeb4b69d..21a8c954af1c 100644
--- a/sound/soc/spear/spdif_in.c
+++ b/sound/soc/spear/spdif_in.c
@@ -257,20 +257,12 @@ static int spdif_in_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        return snd_soc_register_component(&pdev->dev, &spdif_in_component,
-                                         &spdif_in_dai, 1);
-}
-
-static int spdif_in_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_component(&pdev->dev);
-
-        return 0;
+        return devm_snd_soc_register_component(&pdev->dev, &spdif_in_component,
+                                               &spdif_in_dai, 1);
 }
 
 static struct platform_driver spdif_in_driver = {
         .probe          = spdif_in_probe,
-        .remove         = spdif_in_remove,
         .driver         = {
                 .name   = "spdif-in",
                 .owner  = THIS_MODULE,
diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
index 2fdf68c98d22..b6ef6f78dc78 100644
--- a/sound/soc/spear/spdif_out.c
+++ b/sound/soc/spear/spdif_out.c
@@ -280,7 +280,6 @@ static int spdif_out_probe(struct platform_device *pdev)
         struct spdif_out_dev *host;
         struct spear_spdif_platform_data *pdata;
         struct resource *res;
-        int ret;
 
         host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL);
         if (!host) {
@@ -307,16 +306,8 @@ static int spdif_out_probe(struct platform_device *pdev)
 
         dev_set_drvdata(&pdev->dev, host);
 
-        ret = snd_soc_register_component(&pdev->dev, &spdif_out_component,
-                                         &spdif_out_dai, 1);
-        return ret;
-}
-
-static int spdif_out_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_component(&pdev->dev);
-
-        return 0;
+        return devm_snd_soc_register_component(&pdev->dev, &spdif_out_component,
+                                               &spdif_out_dai, 1);
 }
 
 #ifdef CONFIG_PM
@@ -357,7 +348,6 @@ static SIMPLE_DEV_PM_OPS(spdif_out_dev_pm_ops, spdif_out_suspend, \
 
 static struct platform_driver spdif_out_driver = {
         .probe          = spdif_out_probe,
-        .remove         = spdif_out_remove,
         .driver         = {
                 .name   = "spdif-out",
                 .owner  = THIS_MODULE,
diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index d554d46d08b5..bdd19db4a08b 100644
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -100,6 +100,7 @@ int tegra30_ahub_allocate_rx_fifo(enum tegra30_ahub_rxcif *rxcif,
 {
         int channel;
         u32 reg, val;
+        struct tegra30_ahub_cif_conf cif_conf;
 
         channel = find_first_zero_bit(ahub->rx_usage,
                                       TEGRA30_AHUB_CHANNEL_CTRL_COUNT);
@@ -123,15 +124,21 @@ int tegra30_ahub_allocate_rx_fifo(enum tegra30_ahub_rxcif *rxcif,
                TEGRA30_AHUB_CHANNEL_CTRL_RX_PACK_16;
         tegra30_apbif_write(reg, val);
 
+        cif_conf.threshold = 0;
+        cif_conf.audio_channels = 2;
+        cif_conf.client_channels = 2;
+        cif_conf.audio_bits = TEGRA30_AUDIOCIF_BITS_16;
+        cif_conf.client_bits = TEGRA30_AUDIOCIF_BITS_16;
+        cif_conf.expand = 0;
+        cif_conf.stereo_conv = 0;
+        cif_conf.replicate = 0;
+        cif_conf.direction = TEGRA30_AUDIOCIF_DIRECTION_RX;
+        cif_conf.truncate = 0;
+        cif_conf.mono_conv = 0;
+
         reg = TEGRA30_AHUB_CIF_RX_CTRL +
               (channel * TEGRA30_AHUB_CIF_RX_CTRL_STRIDE);
-        val = (0 << TEGRA30_AUDIOCIF_CTRL_FIFO_THRESHOLD_SHIFT) |
-              (1 << TEGRA30_AUDIOCIF_CTRL_AUDIO_CHANNELS_SHIFT) |
-              (1 << TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_SHIFT) |
-              TEGRA30_AUDIOCIF_CTRL_AUDIO_BITS_16 |
-              TEGRA30_AUDIOCIF_CTRL_CLIENT_BITS_16 |
-              TEGRA30_AUDIOCIF_CTRL_DIRECTION_RX;
-        tegra30_apbif_write(reg, val);
+        ahub->soc_data->set_audio_cif(ahub->regmap_apbif, reg, &cif_conf);
 
         return 0;
 }
@@ -183,6 +190,7 @@ int tegra30_ahub_allocate_tx_fifo(enum tegra30_ahub_txcif *txcif,
 {
         int channel;
         u32 reg, val;
+        struct tegra30_ahub_cif_conf cif_conf;
 
         channel = find_first_zero_bit(ahub->tx_usage,
                                       TEGRA30_AHUB_CHANNEL_CTRL_COUNT);
@@ -206,15 +214,21 @@ int tegra30_ahub_allocate_tx_fifo(enum tegra30_ahub_txcif *txcif,
                TEGRA30_AHUB_CHANNEL_CTRL_TX_PACK_16;
         tegra30_apbif_write(reg, val);
 
+        cif_conf.threshold = 0;
+        cif_conf.audio_channels = 2;
+        cif_conf.client_channels = 2;
+        cif_conf.audio_bits = TEGRA30_AUDIOCIF_BITS_16;
+        cif_conf.client_bits = TEGRA30_AUDIOCIF_BITS_16;
+        cif_conf.expand = 0;
+        cif_conf.stereo_conv = 0;
+        cif_conf.replicate = 0;
+        cif_conf.direction = TEGRA30_AUDIOCIF_DIRECTION_TX;
+        cif_conf.truncate = 0;
+        cif_conf.mono_conv = 0;
+
         reg = TEGRA30_AHUB_CIF_TX_CTRL +
               (channel * TEGRA30_AHUB_CIF_TX_CTRL_STRIDE);
-        val = (0 << TEGRA30_AUDIOCIF_CTRL_FIFO_THRESHOLD_SHIFT) |
-              (1 << TEGRA30_AUDIOCIF_CTRL_AUDIO_CHANNELS_SHIFT) |
-              (1 << TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_SHIFT) |
-              TEGRA30_AUDIOCIF_CTRL_AUDIO_BITS_16 |
-              TEGRA30_AUDIOCIF_CTRL_CLIENT_BITS_16 |
-              TEGRA30_AUDIOCIF_CTRL_DIRECTION_TX;
-        tegra30_apbif_write(reg, val);
+        ahub->soc_data->set_audio_cif(ahub->regmap_apbif, reg, &cif_conf);
 
         return 0;
 }
@@ -437,13 +451,21 @@ static const struct regmap_config tegra30_ahub_ahub_regmap_config = {
 
 static struct tegra30_ahub_soc_data soc_data_tegra30 = {
         .clk_list_mask = CLK_LIST_MASK_TEGRA30,
+        .set_audio_cif = tegra30_ahub_set_cif,
 };
 
 static struct tegra30_ahub_soc_data soc_data_tegra114 = {
         .clk_list_mask = CLK_LIST_MASK_TEGRA114,
+        .set_audio_cif = tegra30_ahub_set_cif,
+};
+
+static struct tegra30_ahub_soc_data soc_data_tegra124 = {
+        .clk_list_mask = CLK_LIST_MASK_TEGRA114,
+        .set_audio_cif = tegra124_ahub_set_cif,
 };
 
 static const struct of_device_id tegra30_ahub_of_match[] = {
+        { .compatible = "nvidia,tegra124-ahub", .data = &soc_data_tegra124 },
         { .compatible = "nvidia,tegra114-ahub", .data = &soc_data_tegra114 },
         { .compatible = "nvidia,tegra30-ahub",  .data = &soc_data_tegra30 },
         {},
@@ -497,6 +519,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev)
         }
         dev_set_drvdata(&pdev->dev, ahub);
 
+        ahub->soc_data = soc_data;
         ahub->dev = &pdev->dev;
 
         ahub->clk_d_audio = clk_get(&pdev->dev, "d_audio");
@@ -669,6 +692,70 @@ static struct platform_driver tegra30_ahub_driver = {
 };
 module_platform_driver(tegra30_ahub_driver);
 
+void tegra30_ahub_set_cif(struct regmap *regmap, unsigned int reg,
+                          struct tegra30_ahub_cif_conf *conf)
+{
+        unsigned int value;
+
+        value = (conf->threshold <<
+                        TEGRA30_AUDIOCIF_CTRL_FIFO_THRESHOLD_SHIFT) |
+                ((conf->audio_channels - 1) <<
+                        TEGRA30_AUDIOCIF_CTRL_AUDIO_CHANNELS_SHIFT) |
+                ((conf->client_channels - 1) <<
+                        TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_SHIFT) |
+                (conf->audio_bits <<
+                        TEGRA30_AUDIOCIF_CTRL_AUDIO_BITS_SHIFT) |
+                (conf->client_bits <<
+                        TEGRA30_AUDIOCIF_CTRL_CLIENT_BITS_SHIFT) |
+                (conf->expand <<
+                        TEGRA30_AUDIOCIF_CTRL_EXPAND_SHIFT) |
+                (conf->stereo_conv <<
+                        TEGRA30_AUDIOCIF_CTRL_STEREO_CONV_SHIFT) |
+                (conf->replicate <<
+                        TEGRA30_AUDIOCIF_CTRL_REPLICATE_SHIFT) |
+                (conf->direction <<
+                        TEGRA30_AUDIOCIF_CTRL_DIRECTION_SHIFT) |
+                (conf->truncate <<
+                        TEGRA30_AUDIOCIF_CTRL_TRUNCATE_SHIFT) |
+                (conf->mono_conv <<
+                        TEGRA30_AUDIOCIF_CTRL_MONO_CONV_SHIFT);
+
+        regmap_write(regmap, reg, value);
+}
+EXPORT_SYMBOL_GPL(tegra30_ahub_set_cif);
+
+void tegra124_ahub_set_cif(struct regmap *regmap, unsigned int reg,
+                           struct tegra30_ahub_cif_conf *conf)
+{
+        unsigned int value;
+
+        value = (conf->threshold <<
+                        TEGRA124_AUDIOCIF_CTRL_FIFO_THRESHOLD_SHIFT) |
+                ((conf->audio_channels - 1) <<
+                        TEGRA124_AUDIOCIF_CTRL_AUDIO_CHANNELS_SHIFT) |
+                ((conf->client_channels - 1) <<
+                        TEGRA124_AUDIOCIF_CTRL_CLIENT_CHANNELS_SHIFT) |
+                (conf->audio_bits <<
+                        TEGRA30_AUDIOCIF_CTRL_AUDIO_BITS_SHIFT) |
+                (conf->client_bits <<
+                        TEGRA30_AUDIOCIF_CTRL_CLIENT_BITS_SHIFT) |
+                (conf->expand <<
+                        TEGRA30_AUDIOCIF_CTRL_EXPAND_SHIFT) |
+                (conf->stereo_conv <<
+                        TEGRA30_AUDIOCIF_CTRL_STEREO_CONV_SHIFT) |
+                (conf->replicate <<
+                        TEGRA30_AUDIOCIF_CTRL_REPLICATE_SHIFT) |
+                (conf->direction <<
+                        TEGRA30_AUDIOCIF_CTRL_DIRECTION_SHIFT) |
+                (conf->truncate <<
+                        TEGRA30_AUDIOCIF_CTRL_TRUNCATE_SHIFT) |
+                (conf->mono_conv <<
+                        TEGRA30_AUDIOCIF_CTRL_MONO_CONV_SHIFT);
+
+        regmap_write(regmap, reg, value);
+}
+EXPORT_SYMBOL_GPL(tegra124_ahub_set_cif);
+
 MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");
 MODULE_DESCRIPTION("Tegra30 AHUB driver");
 MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/tegra/tegra30_ahub.h b/sound/soc/tegra/tegra30_ahub.h
index 09766cdc45ca..d67321d90faa 100644
--- a/sound/soc/tegra/tegra30_ahub.h
+++ b/sound/soc/tegra/tegra30_ahub.h
@@ -25,16 +25,30 @@
 #define TEGRA30_AUDIOCIF_CTRL_FIFO_THRESHOLD_MASK_US    0xf
 #define TEGRA30_AUDIOCIF_CTRL_FIFO_THRESHOLD_MASK       (TEGRA30_AUDIOCIF_CTRL_FIFO_THRESHOLD_MASK_US << TEGRA30_AUDIOCIF_CTRL_FIFO_THRESHOLD_SHIFT)
 
+#define TEGRA124_AUDIOCIF_CTRL_FIFO_THRESHOLD_SHIFT     24
+#define TEGRA124_AUDIOCIF_CTRL_FIFO_THRESHOLD_MASK_US   0x3f
+#define TEGRA124_AUDIOCIF_CTRL_FIFO_THRESHOLD_MASK      (TEGRA124_AUDIOCIF_CTRL_FIFO_THRESHOLD_MASK_US << TEGRA124_AUDIOCIF_CTRL_FIFO_THRESHOLD_SHIFT)
+
 /* Channel count minus 1 */
 #define TEGRA30_AUDIOCIF_CTRL_AUDIO_CHANNELS_SHIFT      24
 #define TEGRA30_AUDIOCIF_CTRL_AUDIO_CHANNELS_MASK_US    7
 #define TEGRA30_AUDIOCIF_CTRL_AUDIO_CHANNELS_MASK       (TEGRA30_AUDIOCIF_CTRL_AUDIO_CHANNELS_MASK_US << TEGRA30_AUDIOCIF_CTRL_AUDIO_CHANNELS_SHIFT)
 
 /* Channel count minus 1 */
+#define TEGRA124_AUDIOCIF_CTRL_AUDIO_CHANNELS_SHIFT     20
+#define TEGRA124_AUDIOCIF_CTRL_AUDIO_CHANNELS_MASK_US   0xf
+#define TEGRA124_AUDIOCIF_CTRL_AUDIO_CHANNELS_MASK      (TEGRA124_AUDIOCIF_CTRL_AUDIO_CHANNELS_MASK_US << TEGRA124_AUDIOCIF_CTRL_AUDIO_CHANNELS_SHIFT)
+
+/* Channel count minus 1 */
 #define TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_SHIFT     16
 #define TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_MASK_US   7
 #define TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_MASK      (TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_MASK_US << TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_SHIFT)
 
+/* Channel count minus 1 */
+#define TEGRA124_AUDIOCIF_CTRL_CLIENT_CHANNELS_SHIFT    16
+#define TEGRA124_AUDIOCIF_CTRL_CLIENT_CHANNELS_MASK_US  0xf
+#define TEGRA124_AUDIOCIF_CTRL_CLIENT_CHANNELS_MASK     (TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_MASK_US << TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_SHIFT)
+
 #define TEGRA30_AUDIOCIF_BITS_4                         0
 #define TEGRA30_AUDIOCIF_BITS_8                         1
 #define TEGRA30_AUDIOCIF_BITS_12                        2
@@ -86,7 +100,7 @@
 #define TEGRA30_AUDIOCIF_CTRL_STEREO_CONV_CH1           (TEGRA30_AUDIOCIF_STEREO_CONV_CH1 << TEGRA30_AUDIOCIF_CTRL_STEREO_CONV_SHIFT)
 #define TEGRA30_AUDIOCIF_CTRL_STEREO_CONV_AVG           (TEGRA30_AUDIOCIF_STEREO_CONV_AVG << TEGRA30_AUDIOCIF_CTRL_STEREO_CONV_SHIFT)
 
-#define TEGRA30_AUDIOCIF_CTRL_REPLICATE                 3
+#define TEGRA30_AUDIOCIF_CTRL_REPLICATE_SHIFT           3
 
 #define TEGRA30_AUDIOCIF_DIRECTION_TX                   0
 #define TEGRA30_AUDIOCIF_DIRECTION_RX                   1
@@ -468,8 +482,30 @@ extern int tegra30_ahub_set_rx_cif_source(enum tegra30_ahub_rxcif rxcif,
                                           enum tegra30_ahub_txcif txcif);
 extern int tegra30_ahub_unset_rx_cif_source(enum tegra30_ahub_rxcif rxcif);
 
+struct tegra30_ahub_cif_conf {
+        unsigned int threshold;
+        unsigned int audio_channels;
+        unsigned int client_channels;
+        unsigned int audio_bits;
+        unsigned int client_bits;
+        unsigned int expand;
+        unsigned int stereo_conv;
+        unsigned int replicate;
+        unsigned int direction;
+        unsigned int truncate;
+        unsigned int mono_conv;
+};
+
+void tegra30_ahub_set_cif(struct regmap *regmap, unsigned int reg,
+                          struct tegra30_ahub_cif_conf *conf);
+void tegra124_ahub_set_cif(struct regmap *regmap, unsigned int reg,
+                           struct tegra30_ahub_cif_conf *conf);
+
 struct tegra30_ahub_soc_data {
         u32 clk_list_mask;
+        void (*set_audio_cif)(struct regmap *regmap,
+                              unsigned int reg,
+                              struct tegra30_ahub_cif_conf *conf);
         /*
          * FIXME: There are many more differences in HW, such as:
          * - More APBIF channels.
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index 47565fd04505..5f20b695eba2 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -30,6 +30,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
@@ -179,6 +180,7 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
         struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);
         unsigned int mask, val, reg;
         int ret, sample_size, srate, i2sclock, bitcnt;
+        struct tegra30_ahub_cif_conf cif_conf;
 
         if (params_channels(params) != 2)
                 return -EINVAL;
@@ -217,21 +219,26 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
 
         regmap_write(i2s->regmap, TEGRA30_I2S_TIMING, val);
 
-        val = (0 << TEGRA30_AUDIOCIF_CTRL_FIFO_THRESHOLD_SHIFT) |
-              (1 << TEGRA30_AUDIOCIF_CTRL_AUDIO_CHANNELS_SHIFT) |
-              (1 << TEGRA30_AUDIOCIF_CTRL_CLIENT_CHANNELS_SHIFT) |
-              TEGRA30_AUDIOCIF_CTRL_AUDIO_BITS_16 |
-              TEGRA30_AUDIOCIF_CTRL_CLIENT_BITS_16;
+        cif_conf.threshold = 0;
+        cif_conf.audio_channels = 2;
+        cif_conf.client_channels = 2;
+        cif_conf.audio_bits = TEGRA30_AUDIOCIF_BITS_16;
+        cif_conf.client_bits = TEGRA30_AUDIOCIF_BITS_16;
+        cif_conf.expand = 0;
+        cif_conf.stereo_conv = 0;
+        cif_conf.replicate = 0;
+        cif_conf.truncate = 0;
+        cif_conf.mono_conv = 0;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                val |= TEGRA30_AUDIOCIF_CTRL_DIRECTION_RX;
+                cif_conf.direction = TEGRA30_AUDIOCIF_DIRECTION_RX;
                 reg = TEGRA30_I2S_CIF_RX_CTRL;
         } else {
-                val |= TEGRA30_AUDIOCIF_CTRL_DIRECTION_TX;
+                cif_conf.direction = TEGRA30_AUDIOCIF_DIRECTION_TX;
                 reg = TEGRA30_I2S_CIF_TX_CTRL;
         }
 
-        regmap_write(i2s->regmap, reg, val);
+        i2s->soc_data->set_audio_cif(i2s->regmap, reg, &cif_conf);
 
         val = (1 << TEGRA30_I2S_OFFSET_RX_DATA_OFFSET_SHIFT) |
               (1 << TEGRA30_I2S_OFFSET_TX_DATA_OFFSET_SHIFT);
@@ -396,9 +403,24 @@ static const struct regmap_config tegra30_i2s_regmap_config = {
         .cache_type = REGCACHE_RBTREE,
 };
 
+static const struct tegra30_i2s_soc_data tegra30_i2s_config = {
+        .set_audio_cif = tegra30_ahub_set_cif,
+};
+
+static const struct tegra30_i2s_soc_data tegra124_i2s_config = {
+        .set_audio_cif = tegra124_ahub_set_cif,
+};
+
+static const struct of_device_id tegra30_i2s_of_match[] = {
+        { .compatible = "nvidia,tegra124-i2s", .data = &tegra124_i2s_config },
+        { .compatible = "nvidia,tegra30-i2s", .data = &tegra30_i2s_config },
+        {},
+};
+
 static int tegra30_i2s_platform_probe(struct platform_device *pdev)
 {
         struct tegra30_i2s *i2s;
+        const struct of_device_id *match;
         u32 cif_ids[2];
         struct resource *mem, *memregion;
         void __iomem *regs;
@@ -412,6 +434,14 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
         }
         dev_set_drvdata(&pdev->dev, i2s);
 
+        match = of_match_device(tegra30_i2s_of_match, &pdev->dev);
+        if (!match) {
+                dev_err(&pdev->dev, "Error: No device match found\n");
+                ret = -ENODEV;
+                goto err;
+        }
+        i2s->soc_data = (struct tegra30_i2s_soc_data *)match->data;
+
         i2s->dai = tegra30_i2s_dai_template;
         i2s->dai.name = dev_name(&pdev->dev);
 
@@ -539,11 +569,6 @@ static int tegra30_i2s_resume(struct device *dev)
 }
 #endif
 
-static const struct of_device_id tegra30_i2s_of_match[] = {
-        { .compatible = "nvidia,tegra30-i2s", },
-        {},
-};
-
 static const struct dev_pm_ops tegra30_i2s_pm_ops = {
         SET_RUNTIME_PM_OPS(tegra30_i2s_runtime_suspend,
                            tegra30_i2s_runtime_resume, NULL)
diff --git a/sound/soc/tegra/tegra30_i2s.h b/sound/soc/tegra/tegra30_i2s.h
index bea23afe3b9f..4d0b0a30dbfb 100644
--- a/sound/soc/tegra/tegra30_i2s.h
+++ b/sound/soc/tegra/tegra30_i2s.h
@@ -225,7 +225,14 @@
 #define TEGRA30_I2S_LCOEF_COEF_MASK_US                  0xffff
 #define TEGRA30_I2S_LCOEF_COEF_MASK                     (TEGRA30_I2S_LCOEF_COEF_MASK_US << TEGRA30_I2S_LCOEF_COEF_SHIFT)
 
+struct tegra30_i2s_soc_data {
+        void (*set_audio_cif)(struct regmap *regmap,
+                              unsigned int reg,
+                              struct tegra30_ahub_cif_conf *conf);
+};
+
 struct tegra30_i2s {
+        const struct tegra30_i2s_soc_data *soc_data;
         struct snd_soc_dai_driver dai;
         int cif_id;
         struct clk *clk_i2s;
diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index d173880f290d..1be311c51a18 100644
--- a/sound/soc/tegra/tegra_asoc_utils.c
+++ b/sound/soc/tegra/tegra_asoc_utils.c
@@ -182,6 +182,8 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
                 data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30;
         else if (of_machine_is_compatible("nvidia,tegra114"))
                 data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA114;
+        else if (of_machine_is_compatible("nvidia,tegra124"))
+                data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA124;
         else {
                 dev_err(data->dev, "SoC unknown to Tegra ASoC utils\n");
                 return -EINVAL;
diff --git a/sound/soc/tegra/tegra_asoc_utils.h b/sound/soc/tegra/tegra_asoc_utils.h
index 19fdcafed32f..9577121ce971 100644
--- a/sound/soc/tegra/tegra_asoc_utils.h
+++ b/sound/soc/tegra/tegra_asoc_utils.h
@@ -30,6 +30,7 @@ enum tegra_asoc_utils_soc {
         TEGRA_ASOC_UTILS_SOC_TEGRA20,
         TEGRA_ASOC_UTILS_SOC_TEGRA30,
         TEGRA_ASOC_UTILS_SOC_TEGRA114,
+        TEGRA_ASOC_UTILS_SOC_TEGRA124,
 };
 
 struct tegra_asoc_utils_data {
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/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index e297b74471b8..ca0d3d9f4bac 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -90,8 +90,20 @@ OPTIONS
         Number of mmap data pages. Must be a power of two.
 
 -g::
+        Enables call-graph (stack chain/backtrace) recording.
+
 --call-graph::
-        Do call-graph (stack chain/backtrace) recording.
+        Setup and enable call-graph (stack chain/backtrace) recording,
+        implies -g.
+
+        Allows specifying "fp" (frame pointer) or "dwarf"
+        (DWARF's CFI - Call Frame Information) as the method to collect
+        the information used to show the call graphs.
+
+        In some systems, where binaries are build with gcc
+        --fomit-frame-pointer, using the "fp" method will produce bogus
+        call graphs, using "dwarf", if available (perf tools linked to
+        the libunwind library) should be used instead.
 
 -q::
 --quiet::
diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentation/perf-top.txt
index 58d6598a9686..6a118e71d003 100644
--- a/tools/perf/Documentation/perf-top.txt
+++ b/tools/perf/Documentation/perf-top.txt
@@ -140,20 +140,12 @@ Default is to monitor all CPUS.
 --asm-raw::
         Show raw instruction encoding of assembly instructions.
 
--G [type,min,order]::
+-G::
+        Enables call-graph (stack chain/backtrace) recording.
+
 --call-graph::
-        Display call chains using type, min percent threshold and order.
-        type can be either:
-        - flat: single column, linear exposure of call chains.
-        - graph: use a graph tree, displaying absolute overhead rates.
-        - fractal: like graph, but displays relative rates. Each branch of
-                 the tree is considered as a new profiled object.
-
-        order can be either:
-        - callee: callee based call graph.
-        - caller: inverted caller based call graph.
-
-        Default: fractal,0.5,callee.
+        Setup and enable call-graph (stack chain/backtrace) recording,
+        implies -G.
 
 --ignore-callees=<regex>::
         Ignore callees of the function(s) matching the given regex.
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 935d52216c89..fbc2888d6495 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -888,11 +888,18 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
         while ((event = perf_evlist__mmap_read(kvm->evlist, idx)) != NULL) {
                 err = perf_evlist__parse_sample(kvm->evlist, event, &sample);
                 if (err) {
+                        perf_evlist__mmap_consume(kvm->evlist, idx);
                         pr_err("Failed to parse sample\n");
                         return -1;
                 }
 
                 err = perf_session_queue_event(kvm->session, event, &sample, 0);
+                /*
+                 * FIXME: Here we can't consume the event, as perf_session_queue_event will
+                 *        point to it, and it'll get possibly overwritten by the kernel.
+                 */
+                perf_evlist__mmap_consume(kvm->evlist, idx);
+
                 if (err) {
                         pr_err("Failed to enqueue sample: %d\n", err);
                         return -1;
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index a41ac41546c9..d04651484640 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -712,21 +712,12 @@ static int get_stack_size(char *str, unsigned long *_size)
 }
 #endif /* LIBUNWIND_SUPPORT */
 
-int record_parse_callchain_opt(const struct option *opt,
-                               const char *arg, int unset)
+int record_parse_callchain(const char *arg, struct perf_record_opts *opts)
 {
-        struct perf_record_opts *opts = opt->value;
         char *tok, *name, *saveptr = NULL;
         char *buf;
         int ret = -1;
 
-        /* --no-call-graph */
-        if (unset)
-                return 0;
-
-        /* We specified default option if none is provided. */
-        BUG_ON(!arg);
-
         /* We need buffer that we know we can write to. */
         buf = malloc(strlen(arg) + 1);
         if (!buf)
@@ -764,13 +755,9 @@ int record_parse_callchain_opt(const struct option *opt,
                                 ret = get_stack_size(tok, &size);
                                 opts->stack_dump_size = size;
                         }
-
-                        if (!ret)
-                                pr_debug("callchain: stack dump size %d\n",
-                                         opts->stack_dump_size);
 #endif /* LIBUNWIND_SUPPORT */
                 } else {
-                        pr_err("callchain: Unknown -g option "
+                        pr_err("callchain: Unknown --call-graph option "
                                "value: %s\n", arg);
                         break;
                 }
@@ -778,13 +765,52 @@ int record_parse_callchain_opt(const struct option *opt,
         } while (0);
 
         free(buf);
+        return ret;
+}
+
+static void callchain_debug(struct perf_record_opts *opts)
+{
+        pr_debug("callchain: type %d\n", opts->call_graph);
 
+        if (opts->call_graph == CALLCHAIN_DWARF)
+                pr_debug("callchain: stack dump size %d\n",
+                         opts->stack_dump_size);
+}
+
+int record_parse_callchain_opt(const struct option *opt,
+                               const char *arg,
+                               int unset)
+{
+        struct perf_record_opts *opts = opt->value;
+        int ret;
+
+        /* --no-call-graph */
+        if (unset) {
+                opts->call_graph = CALLCHAIN_NONE;
+                pr_debug("callchain: disabled\n");
+                return 0;
+        }
+
+        ret = record_parse_callchain(arg, opts);
         if (!ret)
-                pr_debug("callchain: type %d\n", opts->call_graph);
+                callchain_debug(opts);
 
         return ret;
 }
 
+int record_callchain_opt(const struct option *opt,
+                         const char *arg __maybe_unused,
+                         int unset __maybe_unused)
+{
+        struct perf_record_opts *opts = opt->value;
+
+        if (opts->call_graph == CALLCHAIN_NONE)
+                opts->call_graph = CALLCHAIN_FP;
+
+        callchain_debug(opts);
+        return 0;
+}
+
 static const char * const record_usage[] = {
         "perf record [<options>] [<command>]",
         "perf record [<options>] -- <command> [<options>]",
@@ -813,12 +839,12 @@ static struct perf_record record = {
         },
 };
 
-#define CALLCHAIN_HELP "do call-graph (stack chain/backtrace) recording: "
+#define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace) recording: "
 
 #ifdef LIBUNWIND_SUPPORT
-const char record_callchain_help[] = CALLCHAIN_HELP "[fp] dwarf";
+const char record_callchain_help[] = CALLCHAIN_HELP "fp dwarf";
 #else
-const char record_callchain_help[] = CALLCHAIN_HELP "[fp]";
+const char record_callchain_help[] = CALLCHAIN_HELP "fp";
 #endif
 
 /*
@@ -858,9 +884,12 @@ const struct option record_options[] = {
                      "number of mmap data pages"),
         OPT_BOOLEAN(0, "group", &record.opts.group,
                     "put the counters into a counter group"),
-        OPT_CALLBACK_DEFAULT('g', "call-graph", &record.opts,
-                             "mode[,dump_size]", record_callchain_help,
-                             &record_parse_callchain_opt, "fp"),
+        OPT_CALLBACK_NOOPT('g', NULL, &record.opts,
+                           NULL, "enables call-graph recording" ,
+                           &record_callchain_opt),
+        OPT_CALLBACK(0, "call-graph", &record.opts,
+                     "mode[,dump_size]", record_callchain_help,
+                     &record_parse_callchain_opt),
         OPT_INCR('v', "verbose", &verbose,
                     "be more verbose (show counter open errors, etc)"),
         OPT_BOOLEAN('q', "quiet", &quiet, "don't print any message"),
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 212214162bb2..5a11f13e56f9 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -810,7 +810,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                 ret = perf_evlist__parse_sample(top->evlist, event, &sample);
                 if (ret) {
                         pr_err("Can't parse sample, err = %d\n", ret);
-                        continue;
+                        goto next_event;
                 }
 
                 evsel = perf_evlist__id2evsel(session->evlist, sample.id);
@@ -825,13 +825,13 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                 case PERF_RECORD_MISC_USER:
                         ++top->us_samples;
                         if (top->hide_user_symbols)
-                                continue;
+                                goto next_event;
                         machine = &session->machines.host;
                         break;
                 case PERF_RECORD_MISC_KERNEL:
                         ++top->kernel_samples;
                         if (top->hide_kernel_symbols)
-                                continue;
+                                goto next_event;
                         machine = &session->machines.host;
                         break;
                 case PERF_RECORD_MISC_GUEST_KERNEL:
@@ -847,7 +847,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                          */
                         /* Fall thru */
                 default:
-                        continue;
+                        goto next_event;
                 }
 
 
@@ -859,6 +859,8 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                         machine__process_event(machine, event);
                 } else
                         ++session->stats.nr_unknown_events;
+next_event:
+                perf_evlist__mmap_consume(top->evlist, idx);
         }
 }
 
@@ -1016,16 +1018,16 @@ out_delete:
 }
 
 static int
-parse_callchain_opt(const struct option *opt, const char *arg, int unset)
+callchain_opt(const struct option *opt, const char *arg, int unset)
 {
-        /*
-         * --no-call-graph
-         */
-        if (unset)
-                return 0;
-
         symbol_conf.use_callchain = true;
+        return record_callchain_opt(opt, arg, unset);
+}
 
+static int
+parse_callchain_opt(const struct option *opt, const char *arg, int unset)
+{
+        symbol_conf.use_callchain = true;
         return record_parse_callchain_opt(opt, arg, unset);
 }
 
@@ -1106,9 +1108,12 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
                    "sort by key(s): pid, comm, dso, symbol, parent, weight, local_weight"),
         OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
                     "Show a column with the number of samples"),
-        OPT_CALLBACK_DEFAULT('G', "call-graph", &top.record_opts,
-                             "mode[,dump_size]", record_callchain_help,
-                             &parse_callchain_opt, "fp"),
+        OPT_CALLBACK_NOOPT('G', NULL, &top.record_opts,
+                           NULL, "enables call-graph recording",
+                           &callchain_opt),
+        OPT_CALLBACK(0, "call-graph", &top.record_opts,
+                     "mode[,dump_size]", record_callchain_help,
+                     &parse_callchain_opt),
         OPT_CALLBACK(0, "ignore-callees", NULL, "regex",
                    "ignore callees of these functions in call graphs",
                    report_parse_ignore_callees_opt),
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 71aa3e35406b..99c8d9ad6729 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -987,7 +987,7 @@ again:
                         err = perf_evlist__parse_sample(evlist, event, &sample);
                         if (err) {
                                 fprintf(trace->output, "Can't parse sample, err = %d, skipping...\n", err);
-                                continue;
+                                goto next_event;
                         }
 
                         if (trace->base_time == 0)
@@ -1001,18 +1001,20 @@ again:
                         evsel = perf_evlist__id2evsel(evlist, sample.id);
                         if (evsel == NULL) {
                                 fprintf(trace->output, "Unknown tp ID %" PRIu64 ", skipping...\n", sample.id);
-                                continue;
+                                goto next_event;
                         }
 
                         if (sample.raw_data == NULL) {
                                 fprintf(trace->output, "%s sample with no payload for tid: %d, cpu %d, raw_size=%d, skipping...\n",
                                        perf_evsel__name(evsel), sample.tid,
                                        sample.cpu, sample.raw_size);
-                                continue;
+                                goto next_event;
                         }
 
                         handler = evsel->handler.func;
                         handler(trace, evsel, &sample);
+next_event:
+                        perf_evlist__mmap_consume(evlist, i);
 
                         if (done)
                                 goto out_unmap_evlist;
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 6fb781d5586c..e3fedfa2906e 100644
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -290,6 +290,7 @@ static int process_events(struct machine *machine, struct perf_evlist *evlist,
         for (i = 0; i < evlist->nr_mmaps; i++) {
                 while ((event = perf_evlist__mmap_read(evlist, i)) != NULL) {
                         ret = process_event(machine, evlist, event, state);
+                        perf_evlist__mmap_consume(evlist, i);
                         if (ret < 0)
                                 return ret;
                 }
diff --git a/tools/perf/tests/keep-tracking.c b/tools/perf/tests/keep-tracking.c
index d444ea2c47d9..376c35608534 100644
--- a/tools/perf/tests/keep-tracking.c
+++ b/tools/perf/tests/keep-tracking.c
@@ -36,6 +36,7 @@ static int find_comm(struct perf_evlist *evlist, const char *comm)
                             (pid_t)event->comm.tid == getpid() &&
                             strcmp(event->comm.comm, comm) == 0)
                                 found += 1;
+                        perf_evlist__mmap_consume(evlist, i);
                 }
         }
         return found;
diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
index c4185b9aeb80..a7232c204eb9 100644
--- a/tools/perf/tests/mmap-basic.c
+++ b/tools/perf/tests/mmap-basic.c
@@ -122,6 +122,7 @@ int test__basic_mmap(void)
                         goto out_munmap;
                 }
                 nr_events[evsel->idx]++;
+                perf_evlist__mmap_consume(evlist, 0);
         }
 
         err = 0;
diff --git a/tools/perf/tests/open-syscall-tp-fields.c b/tools/perf/tests/open-syscall-tp-fields.c
index fc5b9fca8b47..524b221b829b 100644
--- a/tools/perf/tests/open-syscall-tp-fields.c
+++ b/tools/perf/tests/open-syscall-tp-fields.c
@@ -77,8 +77,10 @@ int test__syscall_open_tp_fields(void)
 
                                 ++nr_events;
 
-                                if (type != PERF_RECORD_SAMPLE)
+                                if (type != PERF_RECORD_SAMPLE) {
+                                        perf_evlist__mmap_consume(evlist, i);
                                         continue;
+                                }
 
                                 err = perf_evsel__parse_sample(evsel, event, &sample);
                                 if (err) {
diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index b8a7056519ac..7923b06ffc91 100644
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -263,6 +263,8 @@ int test__PERF_RECORD(void)
                                                  type);
                                         ++errs;
                                 }
+
+                                perf_evlist__mmap_consume(evlist, i);
                         }
                 }
 
diff --git a/tools/perf/tests/perf-time-to-tsc.c b/tools/perf/tests/perf-time-to-tsc.c
index 0ab61b1f408e..4ca1b938f6a6 100644
--- a/tools/perf/tests/perf-time-to-tsc.c
+++ b/tools/perf/tests/perf-time-to-tsc.c
@@ -122,7 +122,7 @@ int test__perf_time_to_tsc(void)
                         if (event->header.type != PERF_RECORD_COMM ||
                             (pid_t)event->comm.pid != getpid() ||
                             (pid_t)event->comm.tid != getpid())
-                                continue;
+                                goto next_event;
 
                         if (strcmp(event->comm.comm, comm1) == 0) {
                                 CHECK__(perf_evsel__parse_sample(evsel, event,
@@ -134,6 +134,8 @@ int test__perf_time_to_tsc(void)
                                                                  &sample));
                                 comm2_time = sample.time;
                         }
+next_event:
+                        perf_evlist__mmap_consume(evlist, i);
                 }
         }
 
diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c
index 2e41e2d32ccc..6e2b44ec0749 100644
--- a/tools/perf/tests/sw-clock.c
+++ b/tools/perf/tests/sw-clock.c
@@ -78,7 +78,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
                 struct perf_sample sample;
 
                 if (event->header.type != PERF_RECORD_SAMPLE)
-                        continue;
+                        goto next_event;
 
                 err = perf_evlist__parse_sample(evlist, event, &sample);
                 if (err < 0) {
@@ -88,6 +88,8 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
 
                 total_periods += sample.period;
                 nr_samples++;
+next_event:
+                perf_evlist__mmap_consume(evlist, 0);
         }
 
         if ((u64) nr_samples == total_periods) {
diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c
index 28fe5894b061..a3e64876e940 100644
--- a/tools/perf/tests/task-exit.c
+++ b/tools/perf/tests/task-exit.c
@@ -96,10 +96,10 @@ int test__task_exit(void)
 
 retry:
         while ((event = perf_evlist__mmap_read(evlist, 0)) != NULL) {
-                if (event->header.type != PERF_RECORD_EXIT)
-                        continue;
+                if (event->header.type == PERF_RECORD_EXIT)
+                        nr_exit++;
 
-                nr_exit++;
+                perf_evlist__mmap_consume(evlist, 0);
         }
 
         if (!exited || !nr_exit) {
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 194e2f42ff5d..6c152686e837 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -315,8 +315,7 @@ static inline void advance_hpp(struct perf_hpp *hpp, int inc)
 }
 
 static int hist_entry__period_snprintf(struct perf_hpp *hpp,
-                                       struct hist_entry *he,
-                                       bool color)
+                                       struct hist_entry *he)
 {
         const char *sep = symbol_conf.field_sep;
         struct perf_hpp_fmt *fmt;
@@ -338,7 +337,7 @@ static int hist_entry__period_snprintf(struct perf_hpp *hpp,
                 } else
                         first = false;
 
-                if (color && fmt->color)
+                if (perf_hpp__use_color() && fmt->color)
                         ret = fmt->color(fmt, hpp, he);
                 else
                         ret = fmt->entry(fmt, hpp, he);
@@ -358,12 +357,11 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
                 .buf            = bf,
                 .size           = size,
         };
-        bool color = !symbol_conf.field_sep;
 
         if (size == 0 || size > bfsz)
                 size = hpp.size = bfsz;
 
-        ret = hist_entry__period_snprintf(&hpp, he, color);
+        ret = hist_entry__period_snprintf(&hpp, he);
         hist_entry__sort_snprintf(he, bf + ret, size - ret, hists);
 
         ret = fprintf(fp, "%s\n", bf);
@@ -482,6 +480,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
 
 print_entries:
         linesz = hists__sort_list_width(hists) + 3 + 1;
+        linesz += perf_hpp__color_overhead();
         line = malloc(linesz);
         if (line == NULL) {
                 ret = -1;
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 2b585bc308cf..9e99060408ae 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -147,6 +147,9 @@ static inline void callchain_cursor_advance(struct callchain_cursor *cursor)
 
 struct option;
 
+int record_parse_callchain(const char *arg, struct perf_record_opts *opts);
 int record_parse_callchain_opt(const struct option *opt, const char *arg, int unset);
+int record_callchain_opt(const struct option *opt, const char *arg, int unset);
+
 extern const char record_callchain_help[];
 #endif  /* __PERF_CALLCHAIN_H */
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 9b393e7dca6f..49096ea58a15 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -187,7 +187,7 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
                 return -1;
         }
 
-        event->header.type = PERF_RECORD_MMAP2;
+        event->header.type = PERF_RECORD_MMAP;
         /*
          * Just like the kernel, see __perf_event_mmap in kernel/perf_event.c
          */
@@ -198,7 +198,6 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
                 char prot[5];
                 char execname[PATH_MAX];
                 char anonstr[] = "//anon";
-                unsigned int ino;
                 size_t size;
                 ssize_t n;
 
@@ -209,15 +208,12 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
                 strcpy(execname, "");
 
                 /* 00400000-0040c000 r-xp 00000000 fd:01 41038  /bin/cat */
-                n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %x:%x %u %s\n",
-                       &event->mmap2.start, &event->mmap2.len, prot,
-                       &event->mmap2.pgoff, &event->mmap2.maj,
-                       &event->mmap2.min,
-                       &ino, execname);
-
-                event->mmap2.ino = (u64)ino;
+                n = sscanf(bf, "%"PRIx64"-%"PRIx64" %s %"PRIx64" %*x:%*x %*u %s\n",
+                       &event->mmap.start, &event->mmap.len, prot,
+                       &event->mmap.pgoff,
+                       execname);
 
-                if (n != 8)
+                if (n != 5)
                         continue;
 
                 if (prot[2] != 'x')
@@ -227,15 +223,15 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
                         strcpy(execname, anonstr);
 
                 size = strlen(execname) + 1;
-                memcpy(event->mmap2.filename, execname, size);
+                memcpy(event->mmap.filename, execname, size);
                 size = PERF_ALIGN(size, sizeof(u64));
-                event->mmap2.len -= event->mmap.start;
-                event->mmap2.header.size = (sizeof(event->mmap2) -
-                                        (sizeof(event->mmap2.filename) - size));
-                memset(event->mmap2.filename + size, 0, machine->id_hdr_size);
-                event->mmap2.header.size += machine->id_hdr_size;
-                event->mmap2.pid = tgid;
-                event->mmap2.tid = pid;
+                event->mmap.len -= event->mmap.start;
+                event->mmap.header.size = (sizeof(event->mmap) -
+                                        (sizeof(event->mmap.filename) - size));
+                memset(event->mmap.filename + size, 0, machine->id_hdr_size);
+                event->mmap.header.size += machine->id_hdr_size;
+                event->mmap.pid = tgid;
+                event->mmap.tid = pid;
 
                 if (process(tool, event, &synth_sample, machine) != 0) {
                         rc = -1;
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index f9f77bee0b1b..e584cd30b0f2 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -545,12 +545,19 @@ union perf_event *perf_evlist__mmap_read(struct perf_evlist *evlist, int idx)
 
         md->prev = old;
 
-        if (!evlist->overwrite)
-                perf_mmap__write_tail(md, old);
-
         return event;
 }
 
+void perf_evlist__mmap_consume(struct perf_evlist *evlist, int idx)
+{
+        if (!evlist->overwrite) {
+                struct perf_mmap *md = &evlist->mmap[idx];
+                unsigned int old = md->prev;
+
+                perf_mmap__write_tail(md, old);
+        }
+}
+
 static void __perf_evlist__munmap(struct perf_evlist *evlist, int idx)
 {
         if (evlist->mmap[idx].base != NULL) {
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 880d7139d2fb..206d09339306 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -89,6 +89,8 @@ struct perf_sample_id *perf_evlist__id2sid(struct perf_evlist *evlist, u64 id);
 
 union perf_event *perf_evlist__mmap_read(struct perf_evlist *self, int idx);
 
+void perf_evlist__mmap_consume(struct perf_evlist *evlist, int idx);
+
 int perf_evlist__open(struct perf_evlist *evlist);
 void perf_evlist__close(struct perf_evlist *evlist);
 
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 0ce9febf1ba0..9f1ef9bee2d0 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -678,7 +678,6 @@ void perf_evsel__config(struct perf_evsel *evsel,
                 attr->sample_type       |= PERF_SAMPLE_WEIGHT;
 
         attr->mmap  = track;
-        attr->mmap2 = track && !perf_missing_features.mmap2;
         attr->comm  = track;
 
         /*
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 1329b6b6ffe6..ce8dc61ce2c3 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -5,6 +5,7 @@
 #include <pthread.h>
 #include "callchain.h"
 #include "header.h"
+#include "color.h"
 
 extern struct callchain_param callchain_param;
 
@@ -175,6 +176,18 @@ void perf_hpp__init(void);
 void perf_hpp__column_register(struct perf_hpp_fmt *format);
 void perf_hpp__column_enable(unsigned col);
 
+static inline size_t perf_hpp__use_color(void)
+{
+        return !symbol_conf.field_sep;
+}
+
+static inline size_t perf_hpp__color_overhead(void)
+{
+        return perf_hpp__use_color() ?
+               (COLOR_MAXLEN + sizeof(PERF_COLOR_RESET)) * PERF_HPP__MAX_INDEX
+               : 0;
+}
+
 struct perf_evlist;
 
 struct hist_browser_timer {
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index c09e0a9fdf4c..f0692737ebf1 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -1357,10 +1357,10 @@ int debuginfo__find_probe_point(struct debuginfo *self, unsigned long addr,
                         goto post;
                 }
 
+                fname = dwarf_decl_file(&spdie);
                 if (addr == (unsigned long)baseaddr) {
                         /* Function entry - Relative line number is 0 */
                         lineno = baseline;
-                        fname = dwarf_decl_file(&spdie);
                         goto post;
                 }
 
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 71b5412bbbb9..2ac4bc92bb1f 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -822,6 +822,8 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
                 PyObject *pyevent = pyrf_event__new(event);
                 struct pyrf_event *pevent = (struct pyrf_event *)pyevent;
 
+                perf_evlist__mmap_consume(evlist, cpu);
+
                 if (pyevent == NULL)
                         return PyErr_NoMemory();
 
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index a85e4ae5f3ac..c0c9795c4f02 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -282,7 +282,7 @@ static void perl_process_tracepoint(union perf_event *perf_event __maybe_unused,
 
         event = find_cache_event(evsel);
         if (!event)
-                die("ug! no event found for type %" PRIu64, evsel->attr.config);
+                die("ug! no event found for type %" PRIu64, (u64)evsel->attr.config);
 
         pid = raw_field_value(event, "common_pid", data);
 
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index cc75a3cef388..95d91a0b23af 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -56,6 +56,17 @@ static void handler_call_die(const char *handler_name)
         Py_FatalError("problem in Python trace event handler");
 }
 
+/*
+ * Insert val into into the dictionary and decrement the reference counter.
+ * This is necessary for dictionaries since PyDict_SetItemString() does not 
+ * steal a reference, as opposed to PyTuple_SetItem().
+ */
+static void pydict_set_item_string_decref(PyObject *dict, const char *key, PyObject *val)
+{
+        PyDict_SetItemString(dict, key, val);
+        Py_DECREF(val);
+}
+
 static void define_value(enum print_arg_type field_type,
                          const char *ev_name,
                          const char *field_name,
@@ -279,11 +290,11 @@ static void python_process_tracepoint(union perf_event *perf_event
                 PyTuple_SetItem(t, n++, PyInt_FromLong(pid));
                 PyTuple_SetItem(t, n++, PyString_FromString(comm));
         } else {
-                PyDict_SetItemString(dict, "common_cpu", PyInt_FromLong(cpu));
-                PyDict_SetItemString(dict, "common_s", PyInt_FromLong(s));
-                PyDict_SetItemString(dict, "common_ns", PyInt_FromLong(ns));
-                PyDict_SetItemString(dict, "common_pid", PyInt_FromLong(pid));
-                PyDict_SetItemString(dict, "common_comm", PyString_FromString(comm));
+                pydict_set_item_string_decref(dict, "common_cpu", PyInt_FromLong(cpu));
+                pydict_set_item_string_decref(dict, "common_s", PyInt_FromLong(s));
+                pydict_set_item_string_decref(dict, "common_ns", PyInt_FromLong(ns));
+                pydict_set_item_string_decref(dict, "common_pid", PyInt_FromLong(pid));
+                pydict_set_item_string_decref(dict, "common_comm", PyString_FromString(comm));
         }
         for (field = event->format.fields; field; field = field->next) {
                 if (field->flags & FIELD_IS_STRING) {
@@ -313,7 +324,7 @@ static void python_process_tracepoint(union perf_event *perf_event
                 if (handler)
                         PyTuple_SetItem(t, n++, obj);
                 else
-                        PyDict_SetItemString(dict, field->name, obj);
+                        pydict_set_item_string_decref(dict, field->name, obj);
 
         }
         if (!handler)
@@ -370,21 +381,21 @@ static void python_process_general_event(union perf_event *perf_event
         if (!handler || !PyCallable_Check(handler))
                 goto exit;
 
-        PyDict_SetItemString(dict, "ev_name", PyString_FromString(perf_evsel__name(evsel)));
-        PyDict_SetItemString(dict, "attr", PyString_FromStringAndSize(
+        pydict_set_item_string_decref(dict, "ev_name", PyString_FromString(perf_evsel__name(evsel)));
+        pydict_set_item_string_decref(dict, "attr", PyString_FromStringAndSize(
                         (const char *)&evsel->attr, sizeof(evsel->attr)));
-        PyDict_SetItemString(dict, "sample", PyString_FromStringAndSize(
+        pydict_set_item_string_decref(dict, "sample", PyString_FromStringAndSize(
                         (const char *)sample, sizeof(*sample)));
-        PyDict_SetItemString(dict, "raw_buf", PyString_FromStringAndSize(
+        pydict_set_item_string_decref(dict, "raw_buf", PyString_FromStringAndSize(
                         (const char *)sample->raw_data, sample->raw_size));
-        PyDict_SetItemString(dict, "comm",
+        pydict_set_item_string_decref(dict, "comm",
                         PyString_FromString(thread->comm));
         if (al->map) {
-                PyDict_SetItemString(dict, "dso",
+                pydict_set_item_string_decref(dict, "dso",
                         PyString_FromString(al->map->dso->name));
         }
         if (al->sym) {
-                PyDict_SetItemString(dict, "symbol",
+                pydict_set_item_string_decref(dict, "symbol",
                         PyString_FromString(al->sym->name));
         }
 
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;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index a9dd682cf5e3..1cf9ccb01013 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3091,7 +3091,7 @@ static const struct file_operations *stat_fops[] = {
 
 static int kvm_init_debug(void)
 {
-        int r = -EFAULT;
+        int r = -EEXIST;
         struct kvm_stats_debugfs_item *p;
 
         kvm_debugfs_dir = debugfs_create_dir("kvm", NULL);