Merge tag 'asoc-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v4.1

More updates for v4.1, pretty much all drivers:

 - Lots of cleanups from Lars, mainly moving things from the CODEC level
   to the card level.
 - Continuing improvements to rcar from Morimoto-san, pcm512x from
   Howard and Peter, the Intel platforms from Vinod, Jie, Jin and Han,
   and to rt5670 from Bard.
 - Support for some non-DSP Qualcomm platforms, Google's Storm
   platform, Maxmim MAX98925 CODECs and the Ingenic JZ4780 SoC.

330 files changed, 9378 insertions, 2738 deletions

diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.txt b/Documentation/devicetree/bindings/net/dsa/dsa.txt
index e124847443f8..f0b4cd72411d 100644
--- a/Documentation/devicetree/bindings/net/dsa/dsa.txt
+++ b/Documentation/devicetree/bindings/net/dsa/dsa.txt
@@ -19,7 +19,9 @@ the parent DSA node. The maximum number of allowed child nodes is 4
 (DSA_MAX_SWITCHES).
 Each of these switch child nodes should have the following required properties:
 
-- reg                   : Describes the switch address on the MII bus
+- reg                   : Contains two fields. The first one describes the
+                          address on the MII bus. The second is the switch
+                          number that must be unique in cascaded configurations
 - #address-cells        : Must be 1
 - #size-cells           : Must be 0
 
diff --git a/Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt b/Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt
index b41433386e2f..b623d50004fb 100644
--- a/Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt
@@ -1,7 +1,7 @@
 Ingenic JZ4740 I2S controller
 
 Required properties:
-- compatible : "ingenic,jz4740-i2s"
+- compatible : "ingenic,jz4740-i2s" or "ingenic,jz4780-i2s"
 - reg : I2S registers location and length
 - clocks : AIC and I2S PLL clock specifiers.
 - clock-names: "aic" and "i2s"
diff --git a/Documentation/devicetree/bindings/sound/max98925.txt b/Documentation/devicetree/bindings/sound/max98925.txt
new file mode 100644
index 000000000000..27be63e2aa0d
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/max98925.txt
@@ -0,0 +1,22 @@
+max98925 audio CODEC
+
+This device supports I2C.
+
+Required properties:
+
+  - compatible : "maxim,max98925"
+
+  - vmon-slot-no : slot number used to send voltage information
+
+  - imon-slot-no : slot number used to send current information
+
+  - reg : the I2C address of the device for I2C
+
+Example:
+
+codec: max98925@1a {
+        compatible = "maxim,max98925";
+        vmon-slot-no = <0>;
+        imon-slot-no = <2>;
+        reg = <0x1a>;
+};
diff --git a/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt
new file mode 100644
index 000000000000..e00732dac939
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt
@@ -0,0 +1,43 @@
+* Qualcomm Technologies LPASS CPU DAI
+
+This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS).
+
+Required properties:
+
+- compatible            : "qcom,lpass-cpu"
+- clocks                : Must contain an entry for each entry in clock-names.
+- clock-names           : A list which must include the following entries:
+                                * "ahbix-clk"
+                                * "mi2s-osr-clk"
+                                * "mi2s-bit-clk"
+- interrupts            : Must contain an entry for each entry in
+                          interrupt-names.
+- interrupt-names       : A list which must include the following entries:
+                                * "lpass-irq-lpaif"
+- pinctrl-N             : One property must exist for each entry in
+                          pinctrl-names.  See ../pinctrl/pinctrl-bindings.txt
+                          for details of the property values.
+- pinctrl-names         : Must contain a "default" entry.
+- reg                   : Must contain an address for each entry in reg-names.
+- reg-names             : A list which must include the following entries:
+                                * "lpass-lpaif"
+
+Optional properties:
+
+- qcom,adsp             : Phandle for the audio DSP node
+
+Example:
+
+lpass@28100000 {
+        compatible = "qcom,lpass-cpu";
+        clocks = <&lcc AHBIX_CLK>, <&lcc MI2S_OSR_CLK>, <&lcc MI2S_BIT_CLK>;
+        clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk";
+        interrupts = <0 85 1>;
+        interrupt-names = "lpass-irq-lpaif";
+        pinctrl-names = "default", "idle";
+        pinctrl-0 = <&mi2s_default>;
+        pinctrl-1 = <&mi2s_idle>;
+        reg = <0x28100000 0x10000>;
+        reg-names = "lpass-lpaif";
+        qcom,adsp = <&adsp>;
+};
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
index 2dd690bc19cc..f316ce1f214a 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -29,9 +29,17 @@ SSI subnode properties:
 - shared-pin                    : if shared clock pin
 - pio-transfer                  : use PIO transfer mode
 - no-busif                      : BUSIF is not ussed when [mem -> SSI] via DMA case
+- dma                           : Should contain Audio DMAC entry
+- dma-names                     : SSI  case "rx"  (=playback), "tx"  (=capture)
+                                  SSIU case "rxu" (=playback), "txu" (=capture)
 
 SRC subnode properties:
-no properties at this point
+- dma                           : Should contain Audio DMAC entry
+- dma-names                     : "rx" (=playback), "tx" (=capture)
+
+DVC subnode properties:
+- dma                           : Should contain Audio DMAC entry
+- dma-names                     : "tx" (=playback/capture)
 
 DAI subnode properties:
 - playback                      : list of playback modules
@@ -45,56 +53,145 @@ rcar_sound: rcar_sound@ec500000 {
         reg =   <0 0xec500000 0 0x1000>, /* SCU */
                 <0 0xec5a0000 0 0x100>,  /* ADG */
                 <0 0xec540000 0 0x1000>, /* SSIU */
-                <0 0xec541000 0 0x1280>; /* SSI */
+                <0 0xec541000 0 0x1280>, /* SSI */
+                <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
+        reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+
+        clocks = <&mstp10_clks R8A7790_CLK_SSI_ALL>,
+                <&mstp10_clks R8A7790_CLK_SSI9>, <&mstp10_clks R8A7790_CLK_SSI8>,
+                <&mstp10_clks R8A7790_CLK_SSI7>, <&mstp10_clks R8A7790_CLK_SSI6>,
+                <&mstp10_clks R8A7790_CLK_SSI5>, <&mstp10_clks R8A7790_CLK_SSI4>,
+                <&mstp10_clks R8A7790_CLK_SSI3>, <&mstp10_clks R8A7790_CLK_SSI2>,
+                <&mstp10_clks R8A7790_CLK_SSI1>, <&mstp10_clks R8A7790_CLK_SSI0>,
+                <&mstp10_clks R8A7790_CLK_SCU_SRC9>, <&mstp10_clks R8A7790_CLK_SCU_SRC8>,
+                <&mstp10_clks R8A7790_CLK_SCU_SRC7>, <&mstp10_clks R8A7790_CLK_SCU_SRC6>,
+                <&mstp10_clks R8A7790_CLK_SCU_SRC5>, <&mstp10_clks R8A7790_CLK_SCU_SRC4>,
+                <&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>,
+                <&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>,
+                <&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>,
+                <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
+        clock-names = "ssi-all",
+                        "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
+                        "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
+                        "src.9", "src.8", "src.7", "src.6", "src.5",
+                        "src.4", "src.3", "src.2", "src.1", "src.0",
+                        "dvc.0", "dvc.1",
+                        "clk_a", "clk_b", "clk_c", "clk_i";
 
         rcar_sound,dvc {
-                dvc0: dvc@0 { };
-                dvc1: dvc@1 { };
+                dvc0: dvc@0 {
+                        dmas = <&audma0 0xbc>;
+                        dma-names = "tx";
+                };
+                dvc1: dvc@1 {
+                        dmas = <&audma0 0xbe>;
+                        dma-names = "tx";
+                };
         };
 
         rcar_sound,src {
-                src0: src@0 { };
-                src1: src@1 { };
-                src2: src@2 { };
-                src3: src@3 { };
-                src4: src@4 { };
-                src5: src@5 { };
-                src6: src@6 { };
-                src7: src@7 { };
-                src8: src@8 { };
-                src9: src@9 { };
+                src0: src@0 {
+                        interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x85>, <&audma1 0x9a>;
+                        dma-names = "rx", "tx";
+                };
+                src1: src@1 {
+                        interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x87>, <&audma1 0x9c>;
+                        dma-names = "rx", "tx";
+                };
+                src2: src@2 {
+                        interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x89>, <&audma1 0x9e>;
+                        dma-names = "rx", "tx";
+                };
+                src3: src@3 {
+                        interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x8b>, <&audma1 0xa0>;
+                        dma-names = "rx", "tx";
+                };
+                src4: src@4 {
+                        interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x8d>, <&audma1 0xb0>;
+                        dma-names = "rx", "tx";
+                };
+                src5: src@5 {
+                        interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x8f>, <&audma1 0xb2>;
+                        dma-names = "rx", "tx";
+                };
+                src6: src@6 {
+                        interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x91>, <&audma1 0xb4>;
+                        dma-names = "rx", "tx";
+                };
+                src7: src@7 {
+                        interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x93>, <&audma1 0xb6>;
+                        dma-names = "rx", "tx";
+                };
+                src8: src@8 {
+                        interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x95>, <&audma1 0xb8>;
+                        dma-names = "rx", "tx";
+                };
+                src9: src@9 {
+                        interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x97>, <&audma1 0xba>;
+                        dma-names = "rx", "tx";
+                };
         };
 
         rcar_sound,ssi {
                 ssi0: ssi@0 {
                         interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
                 ssi1: ssi@1 {
                         interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
                 ssi2: ssi@2 {
                         interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
                 ssi3: ssi@3 {
                         interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
                 ssi4: ssi@4 {
                         interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
                 ssi5: ssi@5 {
                         interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
                 ssi6: ssi@6 {
                         interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
                 ssi7: ssi@7 {
                         interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
                 ssi8: ssi@8 {
                         interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
                 ssi9: ssi@9 {
                         interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
+                        dma-names = "rx", "tx", "rxu", "txu";
                 };
         };
 
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt b/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
new file mode 100644
index 000000000000..c64155027288
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
@@ -0,0 +1,67 @@
+Renesas Sampling Rate Convert Sound Card:
+
+Renesas Sampling Rate Convert Sound Card specifies audio DAI connections of SoC <-> codec.
+
+Required properties:
+
+- compatible                            : "renesas,rsrc-card,<board>"
+                                          Examples with soctypes are:
+                                            - "renesas,rsrc-card,lager"
+                                            - "renesas,rsrc-card,koelsch"
+Optional properties:
+
+- card_name                             : User specified audio sound card name, one string
+                                          property.
+- cpu                                   : CPU   sub-node
+- codec                                 : CODEC sub-node
+
+Optional subnode properties:
+
+- format                                : CPU/CODEC common audio format.
+                                          "i2s", "right_j", "left_j" , "dsp_a"
+                                          "dsp_b", "ac97", "pdm", "msb", "lsb"
+- frame-master                          : Indicates dai-link frame master.
+                                          phandle to a cpu or codec subnode.
+- bitclock-master                       : Indicates dai-link bit clock master.
+                                          phandle to a cpu or codec subnode.
+- bitclock-inversion                    : bool property. Add this if the
+                                          dai-link uses bit clock inversion.
+- frame-inversion                       : bool property. Add this if the
+                                          dai-link uses frame clock inversion.
+- convert-rate                          : platform specified sampling rate convert
+
+Required CPU/CODEC subnodes properties:
+
+- sound-dai                             : phandle and port of CPU/CODEC
+
+Optional CPU/CODEC subnodes properties:
+
+- clocks / system-clock-frequency       : specify subnode's clock if needed.
+                                          it can be specified via "clocks" if system has
+                                          clock node (= common clock), or "system-clock-frequency"
+                                          (if system doens't support common clock)
+                                          If a clock is specified, it is
+                                          enabled with clk_prepare_enable()
+                                          in dai startup() and disabled with
+                                          clk_disable_unprepare() in dai
+                                          shutdown().
+
+Example
+
+sound {
+        compatible = "renesas,rsrc-card,lager";
+
+        card-name = "rsnd-ak4643";
+        format = "left_j";
+        bitclock-master = <&sndcodec>;
+        frame-master = <&sndcodec>;
+
+        sndcpu: cpu {
+                sound-dai = <&rcar_sound>;
+        };
+
+        sndcodec: codec {
+                sound-dai = <&ak4643>;
+                system-clock-frequency = <11289600>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/sound/storm.txt b/Documentation/devicetree/bindings/sound/storm.txt
new file mode 100644
index 000000000000..062a4c185fa9
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/storm.txt
@@ -0,0 +1,23 @@
+* Sound complex for Storm boards
+
+Models a soundcard for Storm boards with the Qualcomm Technologies IPQ806x SOC
+connected to a MAX98357A DAC via I2S.
+
+Required properties:
+
+- compatible    : "google,storm-audio"
+- cpu           : Phandle of the CPU DAI
+- codec         : Phandle of the codec DAI
+
+Optional properties:
+
+- qcom,model    : The user-visible name of this sound card.
+
+Example:
+
+sound {
+        compatible = "google,storm-audio";
+        qcom,model = "ipq806x-storm";
+        cpu = <&lpass_cpu>;
+        codec = <&max98357a>;
+};
diff --git a/Documentation/devicetree/bindings/sound/wm8804.txt b/Documentation/devicetree/bindings/sound/wm8804.txt
index 4d3a56f38adc..6fd124b16496 100644
--- a/Documentation/devicetree/bindings/sound/wm8804.txt
+++ b/Documentation/devicetree/bindings/sound/wm8804.txt
@@ -10,6 +10,13 @@ Required properties:
   - reg : the I2C address of the device for I2C, the chip select
           number for SPI.
 
+  - PVDD-supply, DVDD-supply : Power supplies for the device, as covered
+    in Documentation/devicetree/bindings/regulator/regulator.txt
+
+Optional properties:
+
+  - wlf,reset-gpio: A GPIO specifier for the GPIO controlling the reset pin
+
 Example:
 
 codec: wm8804@1a {
diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt
index a63e5e013a8c..92ae734c00c3 100644
--- a/Documentation/input/alps.txt
+++ b/Documentation/input/alps.txt
@@ -114,6 +114,9 @@ ALPS Absolute Mode - Protocol Version 2
  byte 4:  0   y6   y5   y4   y3   y2   y1   y0
  byte 5:  0   z6   z5   z4   z3   z2   z1   z0
 
+Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for
+the DualPoint Stick.
+
 Dualpoint device -- interleaved packet format
 ---------------------------------------------
 
@@ -127,6 +130,11 @@ Dualpoint device -- interleaved packet format
  byte 7:    0   y6   y5   y4   y3   y2   y1   y0
  byte 8:    0   z6   z5   z4   z3   z2   z1   z0
 
+Devices which use the interleaving format normally send standard PS/2 mouse
+packets for the DualPoint Stick + ALPS Absolute Mode packets for the
+touchpad, switching to the interleaved packet format when both the stick and
+the touchpad are used at the same time.
+
 ALPS Absolute Mode - Protocol Version 3
 ---------------------------------------
 
diff --git a/Documentation/input/event-codes.txt b/Documentation/input/event-codes.txt
index c587a966413e..96705616f582 100644
--- a/Documentation/input/event-codes.txt
+++ b/Documentation/input/event-codes.txt
@@ -294,6 +294,12 @@ accordingly. This property does not affect kernel behavior.
 The kernel does not provide button emulation for such devices but treats
 them as any other INPUT_PROP_BUTTONPAD device.
 
+INPUT_PROP_ACCELEROMETER
+-------------------------
+Directional axes on this device (absolute and/or relative x, y, z) represent
+accelerometer data. All other axes retain their meaning. A device must not mix
+regular directional axes and accelerometer axes on the same event node.
+
 Guidelines:
 ==========
 The guidelines below ensure proper single-touch and multi-finger functionality.
diff --git a/Documentation/input/multi-touch-protocol.txt b/Documentation/input/multi-touch-protocol.txt
index 7b4f59c09ee2..b85d000faeb4 100644
--- a/Documentation/input/multi-touch-protocol.txt
+++ b/Documentation/input/multi-touch-protocol.txt
@@ -312,9 +312,12 @@ ABS_MT_TOOL_TYPE
 
 The type of approaching tool. A lot of kernel drivers cannot distinguish
 between different tool types, such as a finger or a pen. In such cases, the
-event should be omitted. The protocol currently supports MT_TOOL_FINGER and
-MT_TOOL_PEN [2]. For type B devices, this event is handled by input core;
-drivers should instead use input_mt_report_slot_state().
+event should be omitted. The protocol currently supports MT_TOOL_FINGER,
+MT_TOOL_PEN, and MT_TOOL_PALM [2]. For type B devices, this event is handled
+by input core; drivers should instead use input_mt_report_slot_state().
+A contact's ABS_MT_TOOL_TYPE may change over time while still touching the
+device, because the firmware may not be able to determine which tool is being
+used when it first appears.
 
 ABS_MT_BLOB_ID
 
diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt
index 79a6127863ca..3fc1cf50d28e 100644
--- a/Documentation/sound/alsa/ControlNames.txt
+++ b/Documentation/sound/alsa/ControlNames.txt
@@ -71,11 +71,11 @@ SOURCE:
   HDMI/DP       (either HDMI or DisplayPort)
 
 Exceptions (deprecated):
-  [Digital] Capture Source
-  [Digital] Capture Switch      (aka input gain switch)
-  [Digital] Capture Volume      (aka input gain volume)
-  [Digital] Playback Switch     (aka output gain switch)
-  [Digital] Playback Volume     (aka output gain volume)
+  [Analogue|Digital] Capture Source
+  [Analogue|Digital] Capture Switch     (aka input gain switch)
+  [Analogue|Digital] Capture Volume     (aka input gain volume)
+  [Analogue|Digital] Playback Switch    (aka output gain switch)
+  [Analogue|Digital] Playback Volume    (aka output gain volume)
   Tone Control - Switch
   Tone Control - Bass
   Tone Control - Treble
diff --git a/MAINTAINERS b/MAINTAINERS
index 1de6afa8ee51..080be6d19f78 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -637,8 +637,7 @@ F:      drivers/gpu/drm/radeon/radeon_kfd.h
 F:      include/uapi/linux/kfd_ioctl.h
 
 AMD MICROCODE UPDATE SUPPORT
-M:      Andreas Herrmann <herrmann.der.user@googlemail.com>
-L:      amd64-microcode@amd64.org
+M:      Borislav Petkov <bp@alien8.de>
 S:      Maintained
 F:      arch/x86/kernel/cpu/microcode/amd*
 
@@ -1763,7 +1762,7 @@ S:	Supported
 F:      drivers/tty/serial/atmel_serial.c
 
 ATMEL Audio ALSA driver
-M:      Bo Shen <voice.shen@atmel.com>
+M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Supported
 F:      sound/soc/atmel
@@ -5095,7 +5094,7 @@ S:	Supported
 F:      drivers/platform/x86/intel_menlow.c
 
 INTEL IA32 MICROCODE UPDATE SUPPORT
-M:      Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
+M:      Borislav Petkov <bp@alien8.de>
 S:      Maintained
 F:      arch/x86/kernel/cpu/microcode/core*
 F:      arch/x86/kernel/cpu/microcode/intel*
@@ -5136,22 +5135,21 @@ M:	Deepak Saxena <dsaxena@plexity.net>
 S:      Maintained
 F:      drivers/char/hw_random/ixp4xx-rng.c
 
-INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
+INTEL ETHERNET DRIVERS
 M:      Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-M:      Jesse Brandeburg <jesse.brandeburg@intel.com>
-M:      Bruce Allan <bruce.w.allan@intel.com>
-M:      Carolyn Wyborny <carolyn.wyborny@intel.com>
-M:      Don Skidmore <donald.c.skidmore@intel.com>
-M:      Greg Rose <gregory.v.rose@intel.com>
-M:      Matthew Vick <matthew.vick@intel.com>
-M:      John Ronciak <john.ronciak@intel.com>
-M:      Mitch Williams <mitch.a.williams@intel.com>
-M:      Linux NICS <linux.nics@intel.com>
-L:      e1000-devel@lists.sourceforge.net
+R:      Jesse Brandeburg <jesse.brandeburg@intel.com>
+R:      Shannon Nelson <shannon.nelson@intel.com>
+R:      Carolyn Wyborny <carolyn.wyborny@intel.com>
+R:      Don Skidmore <donald.c.skidmore@intel.com>
+R:      Matthew Vick <matthew.vick@intel.com>
+R:      John Ronciak <john.ronciak@intel.com>
+R:      Mitch Williams <mitch.a.williams@intel.com>
+L:      intel-wired-lan@lists.osuosl.org
 W:      http://www.intel.com/support/feedback.htm
 W:      http://e1000.sourceforge.net/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
+Q:      http://patchwork.ozlabs.org/project/intel-wired-lan/list/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
 S:      Supported
 F:      Documentation/networking/e100.txt
 F:      Documentation/networking/e1000.txt
@@ -5273,6 +5271,13 @@ F:	drivers/char/ipmi/
 F:      include/linux/ipmi*
 F:      include/uapi/linux/ipmi*
 
+QCOM AUDIO (ASoC) DRIVERS
+M:      Patrick Lai <plai@codeaurora.org>
+M:      Banajit Goswami <bgoswami@codeaurora.org>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:      Supported
+F:      sound/soc/qcom/
+
 IPS SCSI RAID DRIVER
 M:      Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 L:      linux-scsi@vger.kernel.org
diff --git a/Makefile b/Makefile
index da36a3be7969..54430f933b62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 4
 PATCHLEVEL = 0
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
 NAME = Hurr durr I'ma sheep
 
 # *DOCUMENTATION*
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 6d949f1c850b..36aaeb12e1a5 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1015,7 +1015,6 @@ static struct asoc_simple_card_info fsi_wm8978_info = {
         .platform       = "sh_fsi2",
         .daifmt         = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM,
         .cpu_dai = {
-                .fmt    = SND_SOC_DAIFMT_IB_NF,
                 .name   = "fsia-dai",
         },
         .codec_dai = {
@@ -1040,9 +1039,9 @@ static struct asoc_simple_card_info fsi2_hdmi_info = {
         .card           = "FSI2B-HDMI",
         .codec          = "sh-mobile-hdmi",
         .platform       = "sh_fsi2",
+        .daifmt         = SND_SOC_DAIFMT_CBS_CFS,
         .cpu_dai = {
                 .name   = "fsib-dai",
-                .fmt    = SND_SOC_DAIFMT_CBS_CFS,
         },
         .codec_dai = {
                 .name = "sh_mobile_hdmi-hifi",
diff --git a/arch/powerpc/include/asm/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h
index 2bf8e9307be9..4c8ad592ae33 100644
--- a/arch/powerpc/include/asm/cputhreads.h
+++ b/arch/powerpc/include/asm/cputhreads.h
@@ -55,7 +55,7 @@ static inline cpumask_t cpu_thread_mask_to_cores(const struct cpumask *threads)
 
 static inline int cpu_nr_cores(void)
 {
-        return NR_CPUS >> threads_shift;
+        return nr_cpu_ids >> threads_shift;
 }
 
 static inline cpumask_t cpu_online_cores_map(void)
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 498b6d967138..258990688a5e 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -212,11 +212,11 @@ static struct event_constraint intel_hsw_event_constraints[] = {
         INTEL_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PREC_DIST */
         INTEL_EVENT_CONSTRAINT(0xcd, 0x8), /* MEM_TRANS_RETIRED.LOAD_LATENCY */
         /* CYCLE_ACTIVITY.CYCLES_L1D_PENDING */
-        INTEL_EVENT_CONSTRAINT(0x08a3, 0x4),
+        INTEL_UEVENT_CONSTRAINT(0x08a3, 0x4),
         /* CYCLE_ACTIVITY.STALLS_L1D_PENDING */
-        INTEL_EVENT_CONSTRAINT(0x0ca3, 0x4),
+        INTEL_UEVENT_CONSTRAINT(0x0ca3, 0x4),
         /* CYCLE_ACTIVITY.CYCLES_NO_EXECUTE */
-        INTEL_EVENT_CONSTRAINT(0x04a3, 0xf),
+        INTEL_UEVENT_CONSTRAINT(0x04a3, 0xf),
         EVENT_CONSTRAINT_END
 };
 
@@ -1649,11 +1649,11 @@ intel_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event
         if (c)
                 return c;
 
-        c = intel_pebs_constraints(event);
+        c = intel_shared_regs_constraints(cpuc, event);
         if (c)
                 return c;
 
-        c = intel_shared_regs_constraints(cpuc, event);
+        c = intel_pebs_constraints(event);
         if (c)
                 return c;
 
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 2babb393915e..f0095a76c182 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -799,7 +799,21 @@ retint_swapgs:		/* return to user-space */
         cmpq %r11,(EFLAGS-ARGOFFSET)(%rsp)      /* R11 == RFLAGS */
         jne opportunistic_sysret_failed
 
-        testq $X86_EFLAGS_RF,%r11               /* sysret can't restore RF */
+        /*
+         * SYSRET can't restore RF.  SYSRET can restore TF, but unlike IRET,
+         * restoring TF results in a trap from userspace immediately after
+         * SYSRET.  This would cause an infinite loop whenever #DB happens
+         * with register state that satisfies the opportunistic SYSRET
+         * conditions.  For example, single-stepping this user code:
+         *
+         *           movq $stuck_here,%rcx
+         *           pushfq
+         *           popq %r11
+         *   stuck_here:
+         *
+         * would never get past 'stuck_here'.
+         */
+        testq $(X86_EFLAGS_RF|X86_EFLAGS_TF), %r11
         jnz opportunistic_sysret_failed
 
         /* nothing to check for RSP */
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 7ec1d5f8d283..25ecd56cefa8 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -72,7 +72,7 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] =
         { "bx", 8, offsetof(struct pt_regs, bx) },
         { "cx", 8, offsetof(struct pt_regs, cx) },
         { "dx", 8, offsetof(struct pt_regs, dx) },
-        { "si", 8, offsetof(struct pt_regs, dx) },
+        { "si", 8, offsetof(struct pt_regs, si) },
         { "di", 8, offsetof(struct pt_regs, di) },
         { "bp", 8, offsetof(struct pt_regs, bp) },
         { "sp", 8, offsetof(struct pt_regs, sp) },
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index bae6c609888e..86db4bcd7ce5 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -183,6 +183,16 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
                 },
         },
 
+        /* ASRock */
+        {       /* Handle problems with rebooting on ASRock Q1900DC-ITX */
+                .callback = set_pci_reboot,
+                .ident = "ASRock Q1900DC-ITX",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "ASRock"),
+                        DMI_MATCH(DMI_BOARD_NAME, "Q1900DC-ITX"),
+                },
+        },
+
         /* ASUS */
         {       /* Handle problems with rebooting on ASUS P4S800 */
                 .callback = set_bios_reboot,
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index 9f93af56a5fc..b47124d4cd67 100644
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -91,6 +91,12 @@ EXPORT_SYMBOL_GPL(xen_p2m_size);
 unsigned long xen_max_p2m_pfn __read_mostly;
 EXPORT_SYMBOL_GPL(xen_max_p2m_pfn);
 
+#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT
+#define P2M_LIMIT CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT
+#else
+#define P2M_LIMIT 0
+#endif
+
 static DEFINE_SPINLOCK(p2m_update_lock);
 
 static unsigned long *p2m_mid_missing_mfn;
@@ -385,9 +391,11 @@ static void __init xen_rebuild_p2m_list(unsigned long *p2m)
 void __init xen_vmalloc_p2m_tree(void)
 {
         static struct vm_struct vm;
+        unsigned long p2m_limit;
 
+        p2m_limit = (phys_addr_t)P2M_LIMIT * 1024 * 1024 * 1024 / PAGE_SIZE;
         vm.flags = VM_ALLOC;
-        vm.size = ALIGN(sizeof(unsigned long) * xen_max_p2m_pfn,
+        vm.size = ALIGN(sizeof(unsigned long) * max(xen_max_p2m_pfn, p2m_limit),
                         PMD_SIZE * PMDS_PER_MID_PAGE);
         vm_area_register_early(&vm, PMD_SIZE * PMDS_PER_MID_PAGE);
         pr_notice("p2m virtual area at %p, size is %lx\n", vm.addr, vm.size);
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 6ed2cbe5e8c9..12600bfffca9 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -585,7 +585,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
                                      b->physical_block_size);
 
         t->io_min = max(t->io_min, b->io_min);
-        t->io_opt = lcm(t->io_opt, b->io_opt);
+        t->io_opt = lcm_not_zero(t->io_opt, b->io_opt);
 
         t->cluster &= b->cluster;
         t->discard_zeroes_data &= b->discard_zeroes_data;
@@ -616,7 +616,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
                     b->raid_partial_stripes_expensive);
 
         /* Find lowest common alignment_offset */
-        t->alignment_offset = lcm(t->alignment_offset, alignment)
+        t->alignment_offset = lcm_not_zero(t->alignment_offset, alignment)
                 % max(t->physical_block_size, t->io_min);
 
         /* Verify that new alignment_offset is on a logical block boundary */
@@ -643,7 +643,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
                                                       b->max_discard_sectors);
                 t->discard_granularity = max(t->discard_granularity,
                                              b->discard_granularity);
-                t->discard_alignment = lcm(t->discard_alignment, alignment) %
+                t->discard_alignment = lcm_not_zero(t->discard_alignment, alignment) %
                         t->discard_granularity;
         }
 
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index ef150ebb4c30..23dac3babfe3 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4204,9 +4204,18 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "PIONEER DVD-RW  DVR-216D",   NULL,   ATA_HORKAGE_NOSETXFER },
 
         /* devices that don't properly handle queued TRIM commands */
-        { "Micron_M[56]*",              NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
+        { "Micron_M500*",               NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
+                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
+        { "Crucial_CT*M500*",           NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
+                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
+        { "Micron_M5[15]0*",            "MU01", ATA_HORKAGE_NO_NCQ_TRIM |
+                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
+        { "Crucial_CT*M550*",           "MU01", ATA_HORKAGE_NO_NCQ_TRIM |
+                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
+        { "Crucial_CT*MX100*",          "MU01", ATA_HORKAGE_NO_NCQ_TRIM |
+                                                ATA_HORKAGE_ZERO_AFTER_TRIM, },
+        { "Samsung SSD 850 PRO*",       NULL,   ATA_HORKAGE_NO_NCQ_TRIM |
                                                 ATA_HORKAGE_ZERO_AFTER_TRIM, },
-        { "Crucial_CT*SSD*",            NULL,   ATA_HORKAGE_NO_NCQ_TRIM, },
 
         /*
          * As defined, the DRAT (Deterministic Read After Trim) and RZAT
@@ -4226,6 +4235,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
          */
         { "INTEL*SSDSC2MH*",            NULL,   0, },
 
+        { "Micron*",                    NULL,   ATA_HORKAGE_ZERO_AFTER_TRIM, },
+        { "Crucial*",                   NULL,   ATA_HORKAGE_ZERO_AFTER_TRIM, },
         { "INTEL*SSD*",                 NULL,   ATA_HORKAGE_ZERO_AFTER_TRIM, },
         { "SSD*INTEL*",                 NULL,   ATA_HORKAGE_ZERO_AFTER_TRIM, },
         { "Samsung*SSD*",               NULL,   ATA_HORKAGE_ZERO_AFTER_TRIM, },
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index 0723096fb50a..c92d6a70ccf3 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -475,6 +475,7 @@ static int bcm2835_dma_terminate_all(struct dma_chan *chan)
          * c->desc is NULL and exit.)
          */
         if (c->desc) {
+                bcm2835_dma_desc_free(&c->desc->vd);
                 c->desc = NULL;
                 bcm2835_dma_abort(c->chan_base);
 
diff --git a/drivers/dma/dma-jz4740.c b/drivers/dma/dma-jz4740.c
index 4527a3ebeac4..84884418fd30 100644
--- a/drivers/dma/dma-jz4740.c
+++ b/drivers/dma/dma-jz4740.c
@@ -511,6 +511,9 @@ static void jz4740_dma_desc_free(struct virt_dma_desc *vdesc)
         kfree(container_of(vdesc, struct jz4740_dma_desc, vdesc));
 }
 
+#define JZ4740_DMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
+        BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES))
+
 static int jz4740_dma_probe(struct platform_device *pdev)
 {
         struct jz4740_dmaengine_chan *chan;
@@ -548,6 +551,10 @@ static int jz4740_dma_probe(struct platform_device *pdev)
         dd->device_prep_dma_cyclic = jz4740_dma_prep_dma_cyclic;
         dd->device_config = jz4740_dma_slave_config;
         dd->device_terminate_all = jz4740_dma_terminate_all;
+        dd->src_addr_widths = JZ4740_DMA_BUSWIDTHS;
+        dd->dst_addr_widths = JZ4740_DMA_BUSWIDTHS;
+        dd->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
+        dd->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
         dd->dev = &pdev->dev;
         INIT_LIST_HEAD(&dd->channels);
 
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 276157f22612..53dbd3b3384c 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -260,6 +260,13 @@ static int edma_terminate_all(struct dma_chan *chan)
          */
         if (echan->edesc) {
                 int cyclic = echan->edesc->cyclic;
+
+                /*
+                 * free the running request descriptor
+                 * since it is not in any of the vdesc lists
+                 */
+                edma_desc_free(&echan->edesc->vdesc);
+
                 echan->edesc = NULL;
                 edma_stop(echan->ch_num);
                 /* Move the cyclic channel back to default queue */
diff --git a/drivers/dma/moxart-dma.c b/drivers/dma/moxart-dma.c
index 15cab7d79525..b4634109e010 100644
--- a/drivers/dma/moxart-dma.c
+++ b/drivers/dma/moxart-dma.c
@@ -193,8 +193,10 @@ static int moxart_terminate_all(struct dma_chan *chan)
 
         spin_lock_irqsave(&ch->vc.lock, flags);
 
-        if (ch->desc)
+        if (ch->desc) {
+                moxart_dma_desc_free(&ch->desc->vd);
                 ch->desc = NULL;
+        }
 
         ctrl = readl(ch->base + REG_OFF_CTRL);
         ctrl &= ~(APB_DMA_ENABLE | APB_DMA_FIN_INT_EN | APB_DMA_ERR_INT_EN);
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index ca31f1b45366..cbd4a8aff120 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -194,6 +194,7 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
 
         return ERR_PTR(ret_no_channel);
 }
+EXPORT_SYMBOL_GPL(of_dma_request_slave_channel);
 
 /**
  * of_dma_simple_xlate - Simple DMA engine translation function
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 7dd6dd121681..167dbaf65742 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -981,6 +981,7 @@ static int omap_dma_terminate_all(struct dma_chan *chan)
          * c->desc is NULL and exit.)
          */
         if (c->desc) {
+                omap_dma_desc_free(&c->desc->vd);
                 c->desc = NULL;
                 /* Avoid stopping the dma twice */
                 if (!c->paused)
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 69fac068669f..2eebd28b4c40 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -86,10 +86,13 @@ static void dmi_table(u8 *buf, u32 len, int num,
         int i = 0;
 
         /*
-         *      Stop when we see all the items the table claimed to have
-         *      OR we run off the end of the table (also happens)
+         * Stop when we have seen all the items the table claimed to have
+         * (SMBIOS < 3.0 only) OR we reach an end-of-table marker OR we run
+         * off the end of the table (should never happen but sometimes does
+         * on bogus implementations.)
          */
-        while ((i < num) && (data - buf + sizeof(struct dmi_header)) <= len) {
+        while ((!num || i < num) &&
+               (data - buf + sizeof(struct dmi_header)) <= len) {
                 const struct dmi_header *dm = (const struct dmi_header *)data;
 
                 /*
@@ -529,21 +532,10 @@ static int __init dmi_smbios3_present(const u8 *buf)
         if (memcmp(buf, "_SM3_", 5) == 0 &&
             buf[6] < 32 && dmi_checksum(buf, buf[6])) {
                 dmi_ver = get_unaligned_be16(buf + 7);
+                dmi_num = 0;                    /* No longer specified */
                 dmi_len = get_unaligned_le32(buf + 12);
                 dmi_base = get_unaligned_le64(buf + 16);
 
-                /*
-                 * The 64-bit SMBIOS 3.0 entry point no longer has a field
-                 * containing the number of structures present in the table.
-                 * Instead, it defines the table size as a maximum size, and
-                 * relies on the end-of-table structure type (#127) to be used
-                 * to signal the end of the table.
-                 * So let's define dmi_num as an upper bound as well: each
-                 * structure has a 4 byte header, so dmi_len / 4 is an upper
-                 * bound for the number of structures in the table.
-                 */
-                dmi_num = dmi_len / 4;
-
                 if (dmi_walk_early(dmi_decode) == 0) {
                         pr_info("SMBIOS %d.%d present.\n",
                                 dmi_ver >> 8, dmi_ver & 0xFF);
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
index a6952ba343a8..a65b75161aa4 100644
--- a/drivers/gpio/gpio-mpc8xxx.c
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -334,7 +334,7 @@ static struct irq_domain_ops mpc8xxx_gpio_irq_ops = {
         .xlate  = irq_domain_xlate_twocell,
 };
 
-static struct of_device_id mpc8xxx_gpio_ids[] __initdata = {
+static struct of_device_id mpc8xxx_gpio_ids[] = {
         { .compatible = "fsl,mpc8349-gpio", },
         { .compatible = "fsl,mpc8572-gpio", },
         { .compatible = "fsl,mpc8610-gpio", },
diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c
index 257e2989215c..045a952576c7 100644
--- a/drivers/gpio/gpio-syscon.c
+++ b/drivers/gpio/gpio-syscon.c
@@ -219,7 +219,7 @@ static int syscon_gpio_probe(struct platform_device *pdev)
                 ret = of_property_read_u32_index(np, "gpio,syscon-dev", 2,
                                                  &priv->dir_reg_offset);
                 if (ret)
-                        dev_err(dev, "can't read the dir register offset!\n");
+                        dev_dbg(dev, "can't read the dir register offset!\n");
 
                 priv->dir_reg_offset <<= 3;
         }
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index c0929d938ced..df990f29757a 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -201,6 +201,10 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares,
         if (!handler)
                 return AE_BAD_PARAMETER;
 
+        pin = acpi_gpiochip_pin_to_gpio_offset(chip, pin);
+        if (pin < 0)
+                return AE_BAD_PARAMETER;
+
         desc = gpiochip_request_own_desc(chip, pin, "ACPI:Event");
         if (IS_ERR(desc)) {
                 dev_err(chip->dev, "Failed to request GPIO\n");
@@ -551,6 +555,12 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
                 struct gpio_desc *desc;
                 bool found;
 
+                pin = acpi_gpiochip_pin_to_gpio_offset(chip, pin);
+                if (pin < 0) {
+                        status = AE_BAD_PARAMETER;
+                        goto out;
+                }
+
                 mutex_lock(&achip->conn_lock);
 
                 found = false;
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
index 732cb6f8e653..4c0aa97aaf03 100644
--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c
@@ -287,6 +287,7 @@ int drm_load_edid_firmware(struct drm_connector *connector)
 
         drm_mode_connector_update_edid_property(connector, edid);
         ret = drm_add_edid_modes(connector, edid);
+        drm_edid_to_eld(connector, edid);
         kfree(edid);
 
         return ret;
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 6591d48c1b9d..3fee587bc284 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -174,6 +174,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect
                         struct edid *edid = (struct edid *) connector->edid_blob_ptr->data;
 
                         count = drm_add_edid_modes(connector, edid);
+                        drm_edid_to_eld(connector, edid);
                 } else
                         count = (*connector_funcs->get_modes)(connector);
         }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index c300e22da8ac..33a10ce967ea 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -147,6 +147,7 @@ struct fimd_win_data {
         unsigned int            ovl_height;
         unsigned int            fb_width;
         unsigned int            fb_height;
+        unsigned int            fb_pitch;
         unsigned int            bpp;
         unsigned int            pixel_format;
         dma_addr_t              dma_addr;
@@ -532,13 +533,14 @@ static void fimd_win_mode_set(struct exynos_drm_crtc *crtc,
         win_data->offset_y = plane->crtc_y;
         win_data->ovl_width = plane->crtc_width;
         win_data->ovl_height = plane->crtc_height;
+        win_data->fb_pitch = plane->pitch;
         win_data->fb_width = plane->fb_width;
         win_data->fb_height = plane->fb_height;
         win_data->dma_addr = plane->dma_addr[0] + offset;
         win_data->bpp = plane->bpp;
         win_data->pixel_format = plane->pixel_format;
-        win_data->buf_offsize = (plane->fb_width - plane->crtc_width) *
-                                (plane->bpp >> 3);
+        win_data->buf_offsize =
+                plane->pitch - (plane->crtc_width * (plane->bpp >> 3));
         win_data->line_size = plane->crtc_width * (plane->bpp >> 3);
 
         DRM_DEBUG_KMS("offset_x = %d, offset_y = %d\n",
@@ -704,7 +706,7 @@ static void fimd_win_commit(struct exynos_drm_crtc *crtc, int zpos)
         writel(val, ctx->regs + VIDWx_BUF_START(win, 0));
 
         /* buffer end address */
-        size = win_data->fb_width * win_data->ovl_height * (win_data->bpp >> 3);
+        size = win_data->fb_pitch * win_data->ovl_height * (win_data->bpp >> 3);
         val = (unsigned long)(win_data->dma_addr + size);
         writel(val, ctx->regs + VIDWx_BUF_END(win, 0));
 
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 3518bc4654c5..2e3bc57ea50e 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -55,6 +55,7 @@ struct hdmi_win_data {
         unsigned int            fb_x;
         unsigned int            fb_y;
         unsigned int            fb_width;
+        unsigned int            fb_pitch;
         unsigned int            fb_height;
         unsigned int            src_width;
         unsigned int            src_height;
@@ -438,7 +439,7 @@ static void vp_video_buffer(struct mixer_context *ctx, int win)
         } else {
                 luma_addr[0] = win_data->dma_addr;
                 chroma_addr[0] = win_data->dma_addr
-                        + (win_data->fb_width * win_data->fb_height);
+                        + (win_data->fb_pitch * win_data->fb_height);
         }
 
         if (win_data->scan_flags & DRM_MODE_FLAG_INTERLACE) {
@@ -447,8 +448,8 @@ static void vp_video_buffer(struct mixer_context *ctx, int win)
                         luma_addr[1] = luma_addr[0] + 0x40;
                         chroma_addr[1] = chroma_addr[0] + 0x40;
                 } else {
-                        luma_addr[1] = luma_addr[0] + win_data->fb_width;
-                        chroma_addr[1] = chroma_addr[0] + win_data->fb_width;
+                        luma_addr[1] = luma_addr[0] + win_data->fb_pitch;
+                        chroma_addr[1] = chroma_addr[0] + win_data->fb_pitch;
                 }
         } else {
                 ctx->interlace = false;
@@ -469,10 +470,10 @@ static void vp_video_buffer(struct mixer_context *ctx, int win)
         vp_reg_writemask(res, VP_MODE, val, VP_MODE_FMT_MASK);
 
         /* setting size of input image */
-        vp_reg_write(res, VP_IMG_SIZE_Y, VP_IMG_HSIZE(win_data->fb_width) |
+        vp_reg_write(res, VP_IMG_SIZE_Y, VP_IMG_HSIZE(win_data->fb_pitch) |
                 VP_IMG_VSIZE(win_data->fb_height));
         /* chroma height has to reduced by 2 to avoid chroma distorions */
-        vp_reg_write(res, VP_IMG_SIZE_C, VP_IMG_HSIZE(win_data->fb_width) |
+        vp_reg_write(res, VP_IMG_SIZE_C, VP_IMG_HSIZE(win_data->fb_pitch) |
                 VP_IMG_VSIZE(win_data->fb_height / 2));
 
         vp_reg_write(res, VP_SRC_WIDTH, win_data->src_width);
@@ -559,7 +560,7 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win)
         /* converting dma address base and source offset */
         dma_addr = win_data->dma_addr
                 + (win_data->fb_x * win_data->bpp >> 3)
-                + (win_data->fb_y * win_data->fb_width * win_data->bpp >> 3);
+                + (win_data->fb_y * win_data->fb_pitch);
         src_x_offset = 0;
         src_y_offset = 0;
 
@@ -576,7 +577,8 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win)
                 MXR_GRP_CFG_FORMAT_VAL(fmt), MXR_GRP_CFG_FORMAT_MASK);
 
         /* setup geometry */
-        mixer_reg_write(res, MXR_GRAPHIC_SPAN(win), win_data->fb_width);
+        mixer_reg_write(res, MXR_GRAPHIC_SPAN(win),
+                        win_data->fb_pitch / (win_data->bpp >> 3));
 
         /* setup display size */
         if (ctx->mxr_ver == MXR_VER_128_0_0_184 &&
@@ -961,6 +963,7 @@ static void mixer_win_mode_set(struct exynos_drm_crtc *crtc,
         win_data->fb_y = plane->fb_y;
         win_data->fb_width = plane->fb_width;
         win_data->fb_height = plane->fb_height;
+        win_data->fb_pitch = plane->pitch;
         win_data->src_width = plane->src_width;
         win_data->src_height = plane->src_height;
 
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index b773368fc62c..38a742532c4f 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1487,7 +1487,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                 goto err;
         }
 
-        if (i915_needs_cmd_parser(ring)) {
+        if (i915_needs_cmd_parser(ring) && args->batch_len) {
                 batch_obj = i915_gem_execbuffer_parse(ring,
                                                       &shadow_exec_entry,
                                                       eb,
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 0a52c44ad03d..9c5451c97942 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1322,7 +1322,7 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
         drm_modeset_lock_all(dev);
 
         plane = drm_plane_find(dev, set->plane_id);
-        if (!plane) {
+        if (!plane || plane->type != DRM_PLANE_TYPE_OVERLAY) {
                 ret = -ENOENT;
                 goto out_unlock;
         }
@@ -1349,7 +1349,7 @@ int intel_sprite_get_colorkey(struct drm_device *dev, void *data,
         drm_modeset_lock_all(dev);
 
         plane = drm_plane_find(dev, get->plane_id);
-        if (!plane) {
+        if (!plane || plane->type != DRM_PLANE_TYPE_OVERLAY) {
                 ret = -ENOENT;
                 goto out_unlock;
         }
diff --git a/drivers/gpu/drm/radeon/cikd.h b/drivers/gpu/drm/radeon/cikd.h
index c648e1996dab..243a36c93b8f 100644
--- a/drivers/gpu/drm/radeon/cikd.h
+++ b/drivers/gpu/drm/radeon/cikd.h
@@ -2129,6 +2129,7 @@
 #define VCE_UENC_REG_CLOCK_GATING       0x207c0
 #define VCE_SYS_INT_EN                  0x21300
 #       define VCE_SYS_INT_TRAP_INTERRUPT_EN    (1 << 3)
+#define VCE_LMI_VCPU_CACHE_40BIT_BAR    0x2145c
 #define VCE_LMI_CTRL2                   0x21474
 #define VCE_LMI_CTRL                    0x21498
 #define VCE_LMI_VM_CTRL                 0x214a0
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 5587603b4a89..33d5a4f4eebd 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1565,6 +1565,7 @@ struct radeon_dpm {
         int                     new_active_crtc_count;
         u32                     current_active_crtcs;
         int                     current_active_crtc_count;
+        bool single_display;
         struct radeon_dpm_dynamic_state dyn_state;
         struct radeon_dpm_fan fan;
         u32 tdp_limit;
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index 63ccb8fa799c..d27e4ccb848c 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -76,7 +76,7 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev)
 
 static bool radeon_read_bios(struct radeon_device *rdev)
 {
-        uint8_t __iomem *bios;
+        uint8_t __iomem *bios, val1, val2;
         size_t size;
 
         rdev->bios = NULL;
@@ -86,15 +86,19 @@ static bool radeon_read_bios(struct radeon_device *rdev)
                 return false;
         }
 
-        if (size == 0 || bios[0] != 0x55 || bios[1] != 0xaa) {
+        val1 = readb(&bios[0]);
+        val2 = readb(&bios[1]);
+
+        if (size == 0 || val1 != 0x55 || val2 != 0xaa) {
                 pci_unmap_rom(rdev->pdev, bios);
                 return false;
         }
-        rdev->bios = kmemdup(bios, size, GFP_KERNEL);
+        rdev->bios = kzalloc(size, GFP_KERNEL);
         if (rdev->bios == NULL) {
                 pci_unmap_rom(rdev->pdev, bios);
                 return false;
         }
+        memcpy_fromio(rdev->bios, bios, size);
         pci_unmap_rom(rdev->pdev, bios);
         return true;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c
index a69bd441dd2d..572b4dbec186 100644
--- a/drivers/gpu/drm/radeon/radeon_mn.c
+++ b/drivers/gpu/drm/radeon/radeon_mn.c
@@ -122,7 +122,6 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
         it = interval_tree_iter_first(&rmn->objects, start, end);
         while (it) {
                 struct radeon_bo *bo;
-                struct fence *fence;
                 int r;
 
                 bo = container_of(it, struct radeon_bo, mn_it);
@@ -134,12 +133,10 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
                         continue;
                 }
 
-                fence = reservation_object_get_excl(bo->tbo.resv);
-                if (fence) {
-                        r = radeon_fence_wait((struct radeon_fence *)fence, false);
-                        if (r)
-                                DRM_ERROR("(%d) failed to wait for user bo\n", r);
-                }
+                r = reservation_object_wait_timeout_rcu(bo->tbo.resv, true,
+                        false, MAX_SCHEDULE_TIMEOUT);
+                if (r)
+                        DRM_ERROR("(%d) failed to wait for user bo\n", r);
 
                 radeon_ttm_placement_from_domain(bo, RADEON_GEM_DOMAIN_CPU);
                 r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 33cf4108386d..c1ba83a8dd8c 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -837,12 +837,8 @@ static void radeon_dpm_thermal_work_handler(struct work_struct *work)
         radeon_pm_compute_clocks(rdev);
 }
 
-static struct radeon_ps *radeon_dpm_pick_power_state(struct radeon_device *rdev,
-                                                     enum radeon_pm_state_type dpm_state)
+static bool radeon_dpm_single_display(struct radeon_device *rdev)
 {
-        int i;
-        struct radeon_ps *ps;
-        u32 ui_class;
         bool single_display = (rdev->pm.dpm.new_active_crtc_count < 2) ?
                 true : false;
 
@@ -858,6 +854,17 @@ static struct radeon_ps *radeon_dpm_pick_power_state(struct radeon_device *rdev,
         if (single_display && (r600_dpm_get_vrefresh(rdev) >= 120))
                 single_display = false;
 
+        return single_display;
+}
+
+static struct radeon_ps *radeon_dpm_pick_power_state(struct radeon_device *rdev,
+                                                     enum radeon_pm_state_type dpm_state)
+{
+        int i;
+        struct radeon_ps *ps;
+        u32 ui_class;
+        bool single_display = radeon_dpm_single_display(rdev);
+
         /* certain older asics have a separare 3D performance state,
          * so try that first if the user selected performance
          */
@@ -983,6 +990,7 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
         struct radeon_ps *ps;
         enum radeon_pm_state_type dpm_state;
         int ret;
+        bool single_display = radeon_dpm_single_display(rdev);
 
         /* if dpm init failed */
         if (!rdev->pm.dpm_enabled)
@@ -1007,6 +1015,9 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
                 /* vce just modifies an existing state so force a change */
                 if (ps->vce_active != rdev->pm.dpm.vce_active)
                         goto force;
+                /* user has made a display change (such as timing) */
+                if (rdev->pm.dpm.single_display != single_display)
+                        goto force;
                 if ((rdev->family < CHIP_BARTS) || (rdev->flags & RADEON_IS_IGP)) {
                         /* for pre-BTC and APUs if the num crtcs changed but state is the same,
                          * all we need to do is update the display configuration.
@@ -1069,6 +1080,7 @@ force:
 
         rdev->pm.dpm.current_active_crtcs = rdev->pm.dpm.new_active_crtcs;
         rdev->pm.dpm.current_active_crtc_count = rdev->pm.dpm.new_active_crtc_count;
+        rdev->pm.dpm.single_display = single_display;
 
         /* wait for the rings to drain */
         for (i = 0; i < RADEON_NUM_RINGS; i++) {
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 2456f69efd23..8c7872339c2a 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -495,7 +495,7 @@ static int radeon_debugfs_ring_info(struct seq_file *m, void *data)
         seq_printf(m, "%u free dwords in ring\n", ring->ring_free_dw);
         seq_printf(m, "%u dwords in ring\n", count);
 
-        if (!ring->ready)
+        if (!ring->ring)
                 return 0;
 
         /* print 8 dw before current rptr as often it's the last executed
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index d02aa1d0f588..b292aca0f342 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -598,6 +598,10 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm)
         enum dma_data_direction direction = write ?
                 DMA_BIDIRECTIONAL : DMA_TO_DEVICE;
 
+        /* double check that we don't free the table twice */
+        if (!ttm->sg->sgl)
+                return;
+
         /* free the sg table and pages again */
         dma_unmap_sg(rdev->dev, ttm->sg->sgl, ttm->sg->nents, direction);
 
diff --git a/drivers/gpu/drm/radeon/vce_v2_0.c b/drivers/gpu/drm/radeon/vce_v2_0.c
index 1ac7bb825a1b..fbbe78fbd087 100644
--- a/drivers/gpu/drm/radeon/vce_v2_0.c
+++ b/drivers/gpu/drm/radeon/vce_v2_0.c
@@ -156,6 +156,9 @@ int vce_v2_0_resume(struct radeon_device *rdev)
         WREG32(VCE_LMI_SWAP_CNTL1, 0);
         WREG32(VCE_LMI_VM_CTRL, 0);
 
+        WREG32(VCE_LMI_VCPU_CACHE_40BIT_BAR, addr >> 8);
+
+        addr &= 0xff;
         size = RADEON_GPU_PAGE_ALIGN(rdev->vce_fw->size);
         WREG32(VCE_VCPU_CACHE_OFFSET0, addr & 0x7fffffff);
         WREG32(VCE_VCPU_CACHE_SIZE0, size);
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 1096da327130..75c6d2103e07 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -659,7 +659,7 @@ static irqreturn_t bma180_trigger_handler(int irq, void *p)
 
         mutex_lock(&data->mutex);
 
-        for_each_set_bit(bit, indio_dev->buffer->scan_mask,
+        for_each_set_bit(bit, indio_dev->active_scan_mask,
                          indio_dev->masklength) {
                 ret = bma180_get_data_reg(data, bit);
                 if (ret < 0) {
diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c
index 066d0c04072c..75567fd457dc 100644
--- a/drivers/iio/accel/bmc150-accel.c
+++ b/drivers/iio/accel/bmc150-accel.c
@@ -168,14 +168,14 @@ static const struct {
         int val;
         int val2;
         u8 bw_bits;
-} bmc150_accel_samp_freq_table[] = { {7, 810000, 0x08},
-                                     {15, 630000, 0x09},
-                                     {31, 250000, 0x0A},
-                                     {62, 500000, 0x0B},
-                                     {125, 0, 0x0C},
-                                     {250, 0, 0x0D},
-                                     {500, 0, 0x0E},
-                                     {1000, 0, 0x0F} };
+} bmc150_accel_samp_freq_table[] = { {15, 620000, 0x08},
+                                     {31, 260000, 0x09},
+                                     {62, 500000, 0x0A},
+                                     {125, 0, 0x0B},
+                                     {250, 0, 0x0C},
+                                     {500, 0, 0x0D},
+                                     {1000, 0, 0x0E},
+                                     {2000, 0, 0x0F} };
 
 static const struct {
         int bw_bits;
@@ -840,7 +840,7 @@ static int bmc150_accel_validate_trigger(struct iio_dev *indio_dev,
 }
 
 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL(
-                "7.810000 15.630000 31.250000 62.500000 125 250 500 1000");
+                "15.620000 31.260000 62.50000 125 250 500 1000 2000");
 
 static struct attribute *bmc150_accel_attributes[] = {
         &iio_const_attr_sampling_frequency_available.dev_attr.attr,
@@ -986,7 +986,7 @@ static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p)
         int bit, ret, i = 0;
 
         mutex_lock(&data->mutex);
-        for_each_set_bit(bit, indio_dev->buffer->scan_mask,
+        for_each_set_bit(bit, indio_dev->active_scan_mask,
                          indio_dev->masklength) {
                 ret = i2c_smbus_read_word_data(data->client,
                                                BMC150_ACCEL_AXIS_TO_REG(bit));
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 567de269cc00..1a6379525fa4 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -956,7 +956,7 @@ static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p)
 
         mutex_lock(&data->mutex);
 
-        for_each_set_bit(bit, indio_dev->buffer->scan_mask,
+        for_each_set_bit(bit, indio_dev->active_scan_mask,
                          indio_dev->masklength) {
                 ret = kxcjk1013_get_acc_reg(data, bit);
                 if (ret < 0) {
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 202daf889be2..46379b1fb25b 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -137,7 +137,8 @@ config AXP288_ADC
 
 config CC10001_ADC
         tristate "Cosmic Circuits 10001 ADC driver"
-        depends on HAS_IOMEM || HAVE_CLK || REGULATOR
+        depends on HAVE_CLK || REGULATOR
+        depends on HAS_IOMEM
         select IIO_BUFFER
         select IIO_TRIGGERED_BUFFER
         help
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index ff61ae55dd3f..8a0eb4a04fb5 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -544,7 +544,6 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
 {
         struct iio_dev *idev = iio_trigger_get_drvdata(trig);
         struct at91_adc_state *st = iio_priv(idev);
-        struct iio_buffer *buffer = idev->buffer;
         struct at91_adc_reg_desc *reg = st->registers;
         u32 status = at91_adc_readl(st, reg->trigger_register);
         int value;
@@ -564,7 +563,7 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
                 at91_adc_writel(st, reg->trigger_register,
                                 status | value);
 
-                for_each_set_bit(bit, buffer->scan_mask,
+                for_each_set_bit(bit, idev->active_scan_mask,
                                  st->num_channels) {
                         struct iio_chan_spec const *chan = idev->channels + bit;
                         at91_adc_writel(st, AT91_ADC_CHER,
@@ -579,7 +578,7 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
                 at91_adc_writel(st, reg->trigger_register,
                                 status & ~value);
 
-                for_each_set_bit(bit, buffer->scan_mask,
+                for_each_set_bit(bit, idev->active_scan_mask,
                                  st->num_channels) {
                         struct iio_chan_spec const *chan = idev->channels + bit;
                         at91_adc_writel(st, AT91_ADC_CHDR,
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 2e5cc4409f78..a0e7161f040c 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -188,12 +188,11 @@ static int tiadc_buffer_preenable(struct iio_dev *indio_dev)
 static int tiadc_buffer_postenable(struct iio_dev *indio_dev)
 {
         struct tiadc_device *adc_dev = iio_priv(indio_dev);
-        struct iio_buffer *buffer = indio_dev->buffer;
         unsigned int enb = 0;
         u8 bit;
 
         tiadc_step_config(indio_dev);
-        for_each_set_bit(bit, buffer->scan_mask, adc_dev->channels)
+        for_each_set_bit(bit, indio_dev->active_scan_mask, adc_dev->channels)
                 enb |= (get_adc_step_bit(adc_dev, bit) << 1);
         adc_dev->buffer_en_ch_steps = enb;
 
diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
index 8ec353c01d98..e63b8e76d4c3 100644
--- a/drivers/iio/adc/vf610_adc.c
+++ b/drivers/iio/adc/vf610_adc.c
@@ -141,9 +141,13 @@ struct vf610_adc {
         struct regulator *vref;
         struct vf610_adc_feature adc_feature;
 
+        u32 sample_freq_avail[5];
+
         struct completion completion;
 };
 
+static const u32 vf610_hw_avgs[] = { 1, 4, 8, 16, 32 };
+
 #define VF610_ADC_CHAN(_idx, _chan_type) {                      \
         .type = (_chan_type),                                   \
         .indexed = 1,                                           \
@@ -180,35 +184,47 @@ static const struct iio_chan_spec vf610_adc_iio_channels[] = {
         /* sentinel */
 };
 
-/*
- * ADC sample frequency, unit is ADCK cycles.
- * ADC clk source is ipg clock, which is the same as bus clock.
- *
- * ADC conversion time = SFCAdder + AverageNum x (BCT + LSTAdder)
- * SFCAdder: fixed to 6 ADCK cycles
- * AverageNum: 1, 4, 8, 16, 32 samples for hardware average.
- * BCT (Base Conversion Time): fixed to 25 ADCK cycles for 12 bit mode
- * LSTAdder(Long Sample Time): fixed to 3 ADCK cycles
- *
- * By default, enable 12 bit resolution mode, clock source
- * set to ipg clock, So get below frequency group:
- */
-static const u32 vf610_sample_freq_avail[5] =
-{1941176, 559332, 286957, 145374, 73171};
+static inline void vf610_adc_calculate_rates(struct vf610_adc *info)
+{
+        unsigned long adck_rate, ipg_rate = clk_get_rate(info->clk);
+        int i;
+
+        /*
+         * Calculate ADC sample frequencies
+         * Sample time unit is ADCK cycles. ADCK clk source is ipg clock,
+         * which is the same as bus clock.
+         *
+         * ADC conversion time = SFCAdder + AverageNum x (BCT + LSTAdder)
+         * SFCAdder: fixed to 6 ADCK cycles
+         * AverageNum: 1, 4, 8, 16, 32 samples for hardware average.
+         * BCT (Base Conversion Time): fixed to 25 ADCK cycles for 12 bit mode
+         * LSTAdder(Long Sample Time): fixed to 3 ADCK cycles
+         */
+        adck_rate = ipg_rate / info->adc_feature.clk_div;
+        for (i = 0; i < ARRAY_SIZE(vf610_hw_avgs); i++)
+                info->sample_freq_avail[i] =
+                        adck_rate / (6 + vf610_hw_avgs[i] * (25 + 3));
+}
 
 static inline void vf610_adc_cfg_init(struct vf610_adc *info)
 {
+        struct vf610_adc_feature *adc_feature = &info->adc_feature;
+
         /* set default Configuration for ADC controller */
-        info->adc_feature.clk_sel = VF610_ADCIOC_BUSCLK_SET;
-        info->adc_feature.vol_ref = VF610_ADCIOC_VR_VREF_SET;
+        adc_feature->clk_sel = VF610_ADCIOC_BUSCLK_SET;
+        adc_feature->vol_ref = VF610_ADCIOC_VR_VREF_SET;
+
+        adc_feature->calibration = true;
+        adc_feature->ovwren = true;
+
+        adc_feature->res_mode = 12;
+        adc_feature->sample_rate = 1;
+        adc_feature->lpm = true;
 
-        info->adc_feature.calibration = true;
-        info->adc_feature.ovwren = true;
+        /* Use a save ADCK which is below 20MHz on all devices */
+        adc_feature->clk_div = 8;
 
-        info->adc_feature.clk_div = 1;
-        info->adc_feature.res_mode = 12;
-        info->adc_feature.sample_rate = 1;
-        info->adc_feature.lpm = true;
+        vf610_adc_calculate_rates(info);
 }
 
 static void vf610_adc_cfg_post_set(struct vf610_adc *info)
@@ -290,12 +306,10 @@ static void vf610_adc_cfg_set(struct vf610_adc *info)
 
         cfg_data = readl(info->regs + VF610_REG_ADC_CFG);
 
-        /* low power configuration */
         cfg_data &= ~VF610_ADC_ADLPC_EN;
         if (adc_feature->lpm)
                 cfg_data |= VF610_ADC_ADLPC_EN;
 
-        /* disable high speed */
         cfg_data &= ~VF610_ADC_ADHSC_EN;
 
         writel(cfg_data, info->regs + VF610_REG_ADC_CFG);
@@ -435,10 +449,27 @@ static irqreturn_t vf610_adc_isr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("1941176, 559332, 286957, 145374, 73171");
+static ssize_t vf610_show_samp_freq_avail(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct vf610_adc *info = iio_priv(dev_to_iio_dev(dev));
+        size_t len = 0;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(info->sample_freq_avail); i++)
+                len += scnprintf(buf + len, PAGE_SIZE - len,
+                        "%u ", info->sample_freq_avail[i]);
+
+        /* replace trailing space by newline */
+        buf[len - 1] = '\n';
+
+        return len;
+}
+
+static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(vf610_show_samp_freq_avail);
 
 static struct attribute *vf610_attributes[] = {
-        &iio_const_attr_sampling_frequency_available.dev_attr.attr,
+        &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
         NULL
 };
 
@@ -502,7 +533,7 @@ static int vf610_read_raw(struct iio_dev *indio_dev,
                 return IIO_VAL_FRACTIONAL_LOG2;
 
         case IIO_CHAN_INFO_SAMP_FREQ:
-                *val = vf610_sample_freq_avail[info->adc_feature.sample_rate];
+                *val = info->sample_freq_avail[info->adc_feature.sample_rate];
                 *val2 = 0;
                 return IIO_VAL_INT;
 
@@ -525,9 +556,9 @@ static int vf610_write_raw(struct iio_dev *indio_dev,
         switch (mask) {
                 case IIO_CHAN_INFO_SAMP_FREQ:
                         for (i = 0;
-                                i < ARRAY_SIZE(vf610_sample_freq_avail);
+                                i < ARRAY_SIZE(info->sample_freq_avail);
                                 i++)
-                                if (val == vf610_sample_freq_avail[i]) {
+                                if (val == info->sample_freq_avail[i]) {
                                         info->adc_feature.sample_rate = i;
                                         vf610_adc_sample_set(info);
                                         return 0;
diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c
index 60451b328242..ccf3ea7e1afa 100644
--- a/drivers/iio/gyro/bmg160.c
+++ b/drivers/iio/gyro/bmg160.c
@@ -822,7 +822,7 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)
         int bit, ret, i = 0;
 
         mutex_lock(&data->mutex);
-        for_each_set_bit(bit, indio_dev->buffer->scan_mask,
+        for_each_set_bit(bit, indio_dev->active_scan_mask,
                          indio_dev->masklength) {
                 ret = i2c_smbus_read_word_data(data->client,
                                                BMG160_AXIS_TO_REG(bit));
diff --git a/drivers/iio/imu/adis_trigger.c b/drivers/iio/imu/adis_trigger.c
index e0017c22bb9c..f53e9a803a0e 100644
--- a/drivers/iio/imu/adis_trigger.c
+++ b/drivers/iio/imu/adis_trigger.c
@@ -60,7 +60,7 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev)
         iio_trigger_set_drvdata(adis->trig, adis);
         ret = iio_trigger_register(adis->trig);
 
-        indio_dev->trig = adis->trig;
+        indio_dev->trig = iio_trigger_get(adis->trig);
         if (ret)
                 goto error_free_irq;
 
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index d8d5bed65e07..ef76afe2643c 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -410,42 +410,46 @@ error_read_raw:
         }
 }
 
-static int inv_mpu6050_write_fsr(struct inv_mpu6050_state *st, int fsr)
+static int inv_mpu6050_write_gyro_scale(struct inv_mpu6050_state *st, int val)
 {
-        int result;
+        int result, i;
         u8 d;
 
-        if (fsr < 0 || fsr > INV_MPU6050_MAX_GYRO_FS_PARAM)
-                return -EINVAL;
-        if (fsr == st->chip_config.fsr)
-                return 0;
+        for (i = 0; i < ARRAY_SIZE(gyro_scale_6050); ++i) {
+                if (gyro_scale_6050[i] == val) {
+                        d = (i << INV_MPU6050_GYRO_CONFIG_FSR_SHIFT);
+                        result = inv_mpu6050_write_reg(st,
+                                        st->reg->gyro_config, d);
+                        if (result)
+                                return result;
 
-        d = (fsr << INV_MPU6050_GYRO_CONFIG_FSR_SHIFT);
-        result = inv_mpu6050_write_reg(st, st->reg->gyro_config, d);
-        if (result)
-                return result;
-        st->chip_config.fsr = fsr;
+                        st->chip_config.fsr = i;
+                        return 0;
+                }
+        }
 
-        return 0;
+        return -EINVAL;
 }
 
-static int inv_mpu6050_write_accel_fs(struct inv_mpu6050_state *st, int fs)
+static int inv_mpu6050_write_accel_scale(struct inv_mpu6050_state *st, int val)
 {
-        int result;
+        int result, i;
         u8 d;
 
-        if (fs < 0 || fs > INV_MPU6050_MAX_ACCL_FS_PARAM)
-                return -EINVAL;
-        if (fs == st->chip_config.accl_fs)
-                return 0;
+        for (i = 0; i < ARRAY_SIZE(accel_scale); ++i) {
+                if (accel_scale[i] == val) {
+                        d = (i << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT);
+                        result = inv_mpu6050_write_reg(st,
+                                        st->reg->accl_config, d);
+                        if (result)
+                                return result;
 
-        d = (fs << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT);
-        result = inv_mpu6050_write_reg(st, st->reg->accl_config, d);
-        if (result)
-                return result;
-        st->chip_config.accl_fs = fs;
+                        st->chip_config.accl_fs = i;
+                        return 0;
+                }
+        }
 
-        return 0;
+        return -EINVAL;
 }
 
 static int inv_mpu6050_write_raw(struct iio_dev *indio_dev,
@@ -471,10 +475,10 @@ static int inv_mpu6050_write_raw(struct iio_dev *indio_dev,
         case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_ANGL_VEL:
-                        result = inv_mpu6050_write_fsr(st, val);
+                        result = inv_mpu6050_write_gyro_scale(st, val2);
                         break;
                 case IIO_ACCEL:
-                        result = inv_mpu6050_write_accel_fs(st, val);
+                        result = inv_mpu6050_write_accel_scale(st, val2);
                         break;
                 default:
                         result = -EINVAL;
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
index 0cd306a72a6e..ba27e277511f 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
@@ -24,6 +24,16 @@
 #include <linux/poll.h>
 #include "inv_mpu_iio.h"
 
+static void inv_clear_kfifo(struct inv_mpu6050_state *st)
+{
+        unsigned long flags;
+
+        /* take the spin lock sem to avoid interrupt kick in */
+        spin_lock_irqsave(&st->time_stamp_lock, flags);
+        kfifo_reset(&st->timestamps);
+        spin_unlock_irqrestore(&st->time_stamp_lock, flags);
+}
+
 int inv_reset_fifo(struct iio_dev *indio_dev)
 {
         int result;
@@ -50,6 +60,10 @@ int inv_reset_fifo(struct iio_dev *indio_dev)
                                         INV_MPU6050_BIT_FIFO_RST);
         if (result)
                 goto reset_fifo_fail;
+
+        /* clear timestamps fifo */
+        inv_clear_kfifo(st);
+
         /* enable interrupt */
         if (st->chip_config.accl_fifo_enable ||
             st->chip_config.gyro_fifo_enable) {
@@ -83,16 +97,6 @@ reset_fifo_fail:
         return result;
 }
 
-static void inv_clear_kfifo(struct inv_mpu6050_state *st)
-{
-        unsigned long flags;
-
-        /* take the spin lock sem to avoid interrupt kick in */
-        spin_lock_irqsave(&st->time_stamp_lock, flags);
-        kfifo_reset(&st->timestamps);
-        spin_unlock_irqrestore(&st->time_stamp_lock, flags);
-}
-
 /**
  * inv_mpu6050_irq_handler() - Cache a timestamp at each data ready interrupt.
  */
@@ -184,7 +188,6 @@ end_session:
 flush_fifo:
         /* Flush HW and SW FIFOs. */
         inv_reset_fifo(indio_dev);
-        inv_clear_kfifo(st);
         mutex_unlock(&indio_dev->mlock);
         iio_trigger_notify_done(indio_dev->trig);
 
diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c
index 5cc3692acf37..b3a36376c719 100644
--- a/drivers/iio/imu/kmx61.c
+++ b/drivers/iio/imu/kmx61.c
@@ -1227,7 +1227,7 @@ static irqreturn_t kmx61_trigger_handler(int irq, void *p)
                 base = KMX61_MAG_XOUT_L;
 
         mutex_lock(&data->lock);
-        for_each_set_bit(bit, indio_dev->buffer->scan_mask,
+        for_each_set_bit(bit, indio_dev->active_scan_mask,
                          indio_dev->masklength) {
                 ret = kmx61_read_measurement(data, base, bit);
                 if (ret < 0) {
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index aaba9d3d980e..4df97f650e44 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -847,8 +847,7 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
  * @attr_list: List of IIO device attributes
  *
  * This function frees the memory allocated for each of the IIO device
- * attributes in the list. Note: if you want to reuse the list after calling
- * this function you have to reinitialize it using INIT_LIST_HEAD().
+ * attributes in the list.
  */
 void iio_free_chan_devattr_list(struct list_head *attr_list)
 {
@@ -856,6 +855,7 @@ void iio_free_chan_devattr_list(struct list_head *attr_list)
 
         list_for_each_entry_safe(p, n, attr_list, l) {
                 kfree(p->dev_attr.attr.name);
+                list_del(&p->l);
                 kfree(p);
         }
 }
@@ -936,6 +936,7 @@ static void iio_device_unregister_sysfs(struct iio_dev *indio_dev)
 
         iio_free_chan_devattr_list(&indio_dev->channel_attr_list);
         kfree(indio_dev->chan_attr_group.attrs);
+        indio_dev->chan_attr_group.attrs = NULL;
 }
 
 static void iio_dev_release(struct device *device)
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index a4b397048f71..a99692ba91bc 100644
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -500,6 +500,7 @@ int iio_device_register_eventset(struct iio_dev *indio_dev)
 error_free_setup_event_lines:
         iio_free_chan_devattr_list(&indio_dev->event_interface->dev_attr_list);
         kfree(indio_dev->event_interface);
+        indio_dev->event_interface = NULL;
         return ret;
 }
 
diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c
index 74dff4e4a11a..89fca3a70750 100644
--- a/drivers/iio/proximity/sx9500.c
+++ b/drivers/iio/proximity/sx9500.c
@@ -494,7 +494,7 @@ static irqreturn_t sx9500_trigger_handler(int irq, void *private)
 
         mutex_lock(&data->mutex);
 
-        for_each_set_bit(bit, indio_dev->buffer->scan_mask,
+        for_each_set_bit(bit, indio_dev->active_scan_mask,
                          indio_dev->masklength) {
                 ret = sx9500_read_proximity(data, &indio_dev->channels[bit],
                                             &val);
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index aec7a6aa2951..8c014b5dab4c 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -99,6 +99,14 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
         if (dmasync)
                 dma_set_attr(DMA_ATTR_WRITE_BARRIER, &attrs);
 
+        /*
+         * If the combination of the addr and size requested for this memory
+         * region causes an integer overflow, return error.
+         */
+        if ((PAGE_ALIGN(addr + size) <= size) ||
+            (PAGE_ALIGN(addr + size) <= addr))
+                return ERR_PTR(-EINVAL);
+
         if (!can_do_mlock())
                 return ERR_PTR(-EPERM);
 
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 1bd15ebc01f2..27bcdbc950c9 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1154,10 +1154,28 @@ out:
         mutex_unlock(&alps_mutex);
 }
 
-static void alps_report_bare_ps2_packet(struct input_dev *dev,
+static void alps_report_bare_ps2_packet(struct psmouse *psmouse,
                                         unsigned char packet[],
                                         bool report_buttons)
 {
+        struct alps_data *priv = psmouse->private;
+        struct input_dev *dev;
+
+        /* Figure out which device to use to report the bare packet */
+        if (priv->proto_version == ALPS_PROTO_V2 &&
+            (priv->flags & ALPS_DUALPOINT)) {
+                /* On V2 devices the DualPoint Stick reports bare packets */
+                dev = priv->dev2;
+        } else if (unlikely(IS_ERR_OR_NULL(priv->dev3))) {
+                /* Register dev3 mouse if we received PS/2 packet first time */
+                if (!IS_ERR(priv->dev3))
+                        psmouse_queue_work(psmouse, &priv->dev3_register_work,
+                                           0);
+                return;
+        } else {
+                dev = priv->dev3;
+        }
+
         if (report_buttons)
                 alps_report_buttons(dev, NULL,
                                 packet[0] & 1, packet[0] & 2, packet[0] & 4);
@@ -1232,8 +1250,8 @@ static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)
                  * de-synchronization.
                  */
 
-                alps_report_bare_ps2_packet(priv->dev2,
-                                            &psmouse->packet[3], false);
+                alps_report_bare_ps2_packet(psmouse, &psmouse->packet[3],
+                                            false);
 
                 /*
                  * Continue with the standard ALPS protocol handling,
@@ -1289,18 +1307,9 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
          * properly we only do this if the device is fully synchronized.
          */
         if (!psmouse->out_of_sync_cnt && (psmouse->packet[0] & 0xc8) == 0x08) {
-
-                /* Register dev3 mouse if we received PS/2 packet first time */
-                if (unlikely(!priv->dev3))
-                        psmouse_queue_work(psmouse,
-                                           &priv->dev3_register_work, 0);
-
                 if (psmouse->pktcnt == 3) {
-                        /* Once dev3 mouse device is registered report data */
-                        if (likely(!IS_ERR_OR_NULL(priv->dev3)))
-                                alps_report_bare_ps2_packet(priv->dev3,
-                                                            psmouse->packet,
-                                                            true);
+                        alps_report_bare_ps2_packet(psmouse, psmouse->packet,
+                                                    true);
                         return PSMOUSE_FULL_PACKET;
                 }
                 return PSMOUSE_GOOD_DATA;
@@ -2281,10 +2290,12 @@ static int alps_set_protocol(struct psmouse *psmouse,
                 priv->set_abs_params = alps_set_abs_params_mt;
                 priv->nibble_commands = alps_v3_nibble_commands;
                 priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
-                priv->x_max = 1360;
-                priv->y_max = 660;
                 priv->x_bits = 23;
                 priv->y_bits = 12;
+
+                if (alps_dolphin_get_device_area(psmouse, priv))
+                        return -EIO;
+
                 break;
 
         case ALPS_PROTO_V6:
@@ -2303,9 +2314,8 @@ static int alps_set_protocol(struct psmouse *psmouse,
                 priv->set_abs_params = alps_set_abs_params_mt;
                 priv->nibble_commands = alps_v3_nibble_commands;
                 priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
-
-                if (alps_dolphin_get_device_area(psmouse, priv))
-                        return -EIO;
+                priv->x_max = 0xfff;
+                priv->y_max = 0x7ff;
 
                 if (priv->fw_ver[1] != 0xba)
                         priv->flags |= ALPS_BUTTONPAD;
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index dda605836546..3b06c8a360b6 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -154,6 +154,11 @@ static const struct min_max_quirk min_max_pnpid_table[] = {
         },
         {
                 (const char * const []){"LEN2006", NULL},
+                {2691, 2691},
+                1024, 5045, 2457, 4832
+        },
+        {
+                (const char * const []){"LEN2006", NULL},
                 {ANY_BOARD_ID, ANY_BOARD_ID},
                 1264, 5675, 1171, 4688
         },
@@ -189,7 +194,7 @@ static const char * const topbuttonpad_pnp_ids[] = {
         "LEN2003",
         "LEN2004", /* L440 */
         "LEN2005",
-        "LEN2006",
+        "LEN2006", /* Edge E440/E540 */
         "LEN2007",
         "LEN2008",
         "LEN2009",
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index fc13dd56953e..a3adde6519f0 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1288,10 +1288,13 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
                 return 0;
 
         spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
-        if (smmu_domain->smmu->features & ARM_SMMU_FEAT_TRANS_OPS)
+        if (smmu_domain->smmu->features & ARM_SMMU_FEAT_TRANS_OPS &&
+                        smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
                 ret = arm_smmu_iova_to_phys_hard(domain, iova);
-        else
+        } else {
                 ret = ops->iova_to_phys(ops, iova);
+        }
+
         spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
 
         return ret;
@@ -1556,7 +1559,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
                 return -ENODEV;
         }
 
-        if (smmu->version == 1 || (!(id & ID0_ATOSNS) && (id & ID0_S1TS))) {
+        if ((id & ID0_S1TS) && ((smmu->version == 1) || (id & ID0_ATOSNS))) {
                 smmu->features |= ARM_SMMU_FEAT_TRANS_OPS;
                 dev_notice(smmu->dev, "\taddress translation ops\n");
         }
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index ae4c1a854e57..2d1e05bdbb53 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1742,9 +1742,8 @@ static int domain_init(struct dmar_domain *domain, int guest_width)
 
 static void domain_exit(struct dmar_domain *domain)
 {
-        struct dmar_drhd_unit *drhd;
-        struct intel_iommu *iommu;
         struct page *freelist = NULL;
+        int i;
 
         /* Domain 0 is reserved, so dont process it */
         if (!domain)
@@ -1764,8 +1763,8 @@ static void domain_exit(struct dmar_domain *domain)
 
         /* clear attached or cached domains */
         rcu_read_lock();
-        for_each_active_iommu(iommu, drhd)
-                iommu_detach_domain(domain, iommu);
+        for_each_set_bit(i, domain->iommu_bmp, g_num_of_iommus)
+                iommu_detach_domain(domain, g_iommus[i]);
         rcu_read_unlock();
 
         dma_free_pagelist(freelist);
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 10186cac7716..bc39bdf7b99b 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -851,6 +851,7 @@ static int ipmmu_remove(struct platform_device *pdev)
 
 static const struct of_device_id ipmmu_of_ids[] = {
         { .compatible = "renesas,ipmmu-vmsa", },
+        { }
 };
 
 static struct platform_driver ipmmu_driver = {
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 596b0a9eee99..9687f8afebff 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -169,7 +169,7 @@ static void its_encode_cmd(struct its_cmd_block *cmd, u8 cmd_nr)
 
 static void its_encode_devid(struct its_cmd_block *cmd, u32 devid)
 {
-        cmd->raw_cmd[0] &= ~(0xffffUL << 32);
+        cmd->raw_cmd[0] &= BIT_ULL(32) - 1;
         cmd->raw_cmd[0] |= ((u64)devid) << 32;
 }
 
@@ -802,6 +802,7 @@ static int its_alloc_tables(struct its_node *its)
         int i;
         int psz = SZ_64K;
         u64 shr = GITS_BASER_InnerShareable;
+        u64 cache = GITS_BASER_WaWb;
 
         for (i = 0; i < GITS_BASER_NR_REGS; i++) {
                 u64 val = readq_relaxed(its->base + GITS_BASER + i * 8);
@@ -848,7 +849,7 @@ retry_baser:
                 val = (virt_to_phys(base)                                |
                        (type << GITS_BASER_TYPE_SHIFT)                   |
                        ((entry_size - 1) << GITS_BASER_ENTRY_SIZE_SHIFT) |
-                       GITS_BASER_WaWb                                   |
+                       cache                                             |
                        shr                                               |
                        GITS_BASER_VALID);
 
@@ -874,9 +875,12 @@ retry_baser:
                          * Shareability didn't stick. Just use
                          * whatever the read reported, which is likely
                          * to be the only thing this redistributor
-                         * supports.
+                         * supports. If that's zero, make it
+                         * non-cacheable as well.
                          */
                         shr = tmp & GITS_BASER_SHAREABILITY_MASK;
+                        if (!shr)
+                                cache = GITS_BASER_nC;
                         goto retry_baser;
                 }
 
@@ -980,16 +984,39 @@ static void its_cpu_init_lpis(void)
         tmp = readq_relaxed(rbase + GICR_PROPBASER);
 
         if ((tmp ^ val) & GICR_PROPBASER_SHAREABILITY_MASK) {
+                if (!(tmp & GICR_PROPBASER_SHAREABILITY_MASK)) {
+                        /*
+                         * The HW reports non-shareable, we must
+                         * remove the cacheability attributes as
+                         * well.
+                         */
+                        val &= ~(GICR_PROPBASER_SHAREABILITY_MASK |
+                                 GICR_PROPBASER_CACHEABILITY_MASK);
+                        val |= GICR_PROPBASER_nC;
+                        writeq_relaxed(val, rbase + GICR_PROPBASER);
+                }
                 pr_info_once("GIC: using cache flushing for LPI property table\n");
                 gic_rdists->flags |= RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING;
         }
 
         /* set PENDBASE */
         val = (page_to_phys(pend_page) |
-               GICR_PROPBASER_InnerShareable |
-               GICR_PROPBASER_WaWb);
+               GICR_PENDBASER_InnerShareable |
+               GICR_PENDBASER_WaWb);
 
         writeq_relaxed(val, rbase + GICR_PENDBASER);
+        tmp = readq_relaxed(rbase + GICR_PENDBASER);
+
+        if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) {
+                /*
+                 * The HW reports non-shareable, we must remove the
+                 * cacheability attributes as well.
+                 */
+                val &= ~(GICR_PENDBASER_SHAREABILITY_MASK |
+                         GICR_PENDBASER_CACHEABILITY_MASK);
+                val |= GICR_PENDBASER_nC;
+                writeq_relaxed(val, rbase + GICR_PENDBASER);
+        }
 
         /* Enable LPIs */
         val = readl_relaxed(rbase + GICR_CTLR);
@@ -1026,7 +1053,7 @@ static void its_cpu_init_collection(void)
                          * This ITS wants a linear CPU number.
                          */
                         target = readq_relaxed(gic_data_rdist_rd_base() + GICR_TYPER);
-                        target = GICR_TYPER_CPU_NUMBER(target);
+                        target = GICR_TYPER_CPU_NUMBER(target) << 16;
                 }
 
                 /* Perform collection mapping */
@@ -1422,14 +1449,26 @@ static int its_probe(struct device_node *node, struct irq_domain *parent)
 
         writeq_relaxed(baser, its->base + GITS_CBASER);
         tmp = readq_relaxed(its->base + GITS_CBASER);
-        writeq_relaxed(0, its->base + GITS_CWRITER);
-        writel_relaxed(GITS_CTLR_ENABLE, its->base + GITS_CTLR);
 
-        if ((tmp ^ baser) & GITS_BASER_SHAREABILITY_MASK) {
+        if ((tmp ^ baser) & GITS_CBASER_SHAREABILITY_MASK) {
+                if (!(tmp & GITS_CBASER_SHAREABILITY_MASK)) {
+                        /*
+                         * The HW reports non-shareable, we must
+                         * remove the cacheability attributes as
+                         * well.
+                         */
+                        baser &= ~(GITS_CBASER_SHAREABILITY_MASK |
+                                   GITS_CBASER_CACHEABILITY_MASK);
+                        baser |= GITS_CBASER_nC;
+                        writeq_relaxed(baser, its->base + GITS_CBASER);
+                }
                 pr_info("ITS: using cache flushing for cmd queue\n");
                 its->flags |= ITS_FLAGS_CMDQ_NEEDS_FLUSHING;
         }
 
+        writeq_relaxed(0, its->base + GITS_CWRITER);
+        writel_relaxed(GITS_CTLR_ENABLE, its->base + GITS_CTLR);
+
         if (of_property_read_bool(its->msi_chip.of_node, "msi-controller")) {
                 its->domain = irq_domain_add_tree(NULL, &its_domain_ops, its);
                 if (!its->domain) {
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index ee035ec4526b..169172d2ba05 100644
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST
         tristate "Linux hypervisor example code"
-        depends on X86_32 && EVENTFD && TTY
+        depends on X86_32 && EVENTFD && TTY && PCI_DIRECT
         select HVC_DRIVER
         ---help---
           This is a very simple module which allows you to run
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b979c265fc51..089a4028859d 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3850,7 +3850,8 @@ static inline int bond_slave_override(struct bonding *bond,
         /* Find out if any slaves have the same mapping as this skb. */
         bond_for_each_slave_rcu(bond, slave, iter) {
                 if (slave->queue_id == skb->queue_mapping) {
-                        if (bond_slave_can_tx(slave)) {
+                        if (bond_slave_is_up(slave) &&
+                            slave->link == BOND_LINK_UP) {
                                 bond_dev_queue_xmit(bond, skb, slave->dev);
                                 return 0;
                         }
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 80c46ad4cee4..ad0a7e8c2c2b 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -592,13 +592,12 @@ static int flexcan_poll_state(struct net_device *dev, u32 reg_esr)
                 rx_state = unlikely(reg_esr & FLEXCAN_ESR_RX_WRN) ?
                            CAN_STATE_ERROR_WARNING : CAN_STATE_ERROR_ACTIVE;
                 new_state = max(tx_state, rx_state);
-        } else if (unlikely(flt == FLEXCAN_ESR_FLT_CONF_PASSIVE)) {
+        } else {
                 __flexcan_get_berr_counter(dev, &bec);
-                new_state = CAN_STATE_ERROR_PASSIVE;
+                new_state = flt == FLEXCAN_ESR_FLT_CONF_PASSIVE ?
+                            CAN_STATE_ERROR_PASSIVE : CAN_STATE_BUS_OFF;
                 rx_state = bec.rxerr >= bec.txerr ? new_state : 0;
                 tx_state = bec.rxerr <= bec.txerr ? new_state : 0;
-        } else {
-                new_state = CAN_STATE_BUS_OFF;
         }
 
         /* state hasn't changed */
@@ -1158,12 +1157,19 @@ static int flexcan_probe(struct platform_device *pdev)
         const struct flexcan_devtype_data *devtype_data;
         struct net_device *dev;
         struct flexcan_priv *priv;
+        struct regulator *reg_xceiver;
         struct resource *mem;
         struct clk *clk_ipg = NULL, *clk_per = NULL;
         void __iomem *base;
         int err, irq;
         u32 clock_freq = 0;
 
+        reg_xceiver = devm_regulator_get(&pdev->dev, "xceiver");
+        if (PTR_ERR(reg_xceiver) == -EPROBE_DEFER)
+                return -EPROBE_DEFER;
+        else if (IS_ERR(reg_xceiver))
+                reg_xceiver = NULL;
+
         if (pdev->dev.of_node)
                 of_property_read_u32(pdev->dev.of_node,
                                                 "clock-frequency", &clock_freq);
@@ -1224,9 +1230,7 @@ static int flexcan_probe(struct platform_device *pdev)
         priv->pdata = dev_get_platdata(&pdev->dev);
         priv->devtype_data = devtype_data;
 
-        priv->reg_xceiver = devm_regulator_get(&pdev->dev, "xceiver");
-        if (IS_ERR(priv->reg_xceiver))
-                priv->reg_xceiver = NULL;
+        priv->reg_xceiver = reg_xceiver;
 
         netif_napi_add(dev, &priv->napi, flexcan_poll, FLEXCAN_NAPI_WEIGHT);
 
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 009acc8641fc..8b4d3e6875eb 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -901,6 +901,8 @@ static int gs_usb_probe(struct usb_interface *intf, const struct usb_device_id *
         }
 
         dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return -ENOMEM;
         init_usb_anchor(&dev->rx_submitted);
 
         atomic_set(&dev->active_channels, 0);
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index e97a08ce0b90..57611fd91229 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -25,7 +25,6 @@
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 
-#define MAX_TX_URBS                     16
 #define MAX_RX_URBS                     4
 #define START_TIMEOUT                   1000 /* msecs */
 #define STOP_TIMEOUT                    1000 /* msecs */
@@ -443,6 +442,7 @@ struct kvaser_usb_error_summary {
         };
 };
 
+/* Context for an outstanding, not yet ACKed, transmission */
 struct kvaser_usb_tx_urb_context {
         struct kvaser_usb_net_priv *priv;
         u32 echo_index;
@@ -456,8 +456,13 @@ struct kvaser_usb {
         struct usb_endpoint_descriptor *bulk_in, *bulk_out;
         struct usb_anchor rx_submitted;
 
+        /* @max_tx_urbs: Firmware-reported maximum number of oustanding,
+         * not yet ACKed, transmissions on this device. This value is
+         * also used as a sentinel for marking free tx contexts.
+         */
         u32 fw_version;
         unsigned int nchannels;
+        unsigned int max_tx_urbs;
         enum kvaser_usb_family family;
 
         bool rxinitdone;
@@ -467,19 +472,18 @@ struct kvaser_usb {
 
 struct kvaser_usb_net_priv {
         struct can_priv can;
-
-        spinlock_t tx_contexts_lock;
-        int active_tx_contexts;
-        struct kvaser_usb_tx_urb_context tx_contexts[MAX_TX_URBS];
-
-        struct usb_anchor tx_submitted;
-        struct completion start_comp, stop_comp;
+        struct can_berr_counter bec;
 
         struct kvaser_usb *dev;
         struct net_device *netdev;
         int channel;
 
-        struct can_berr_counter bec;
+        struct completion start_comp, stop_comp;
+        struct usb_anchor tx_submitted;
+
+        spinlock_t tx_contexts_lock;
+        int active_tx_contexts;
+        struct kvaser_usb_tx_urb_context tx_contexts[];
 };
 
 static const struct usb_device_id kvaser_usb_table[] = {
@@ -592,8 +596,8 @@ static int kvaser_usb_wait_msg(const struct kvaser_usb *dev, u8 id,
                          * for further details.
                          */
                         if (tmp->len == 0) {
-                                pos = round_up(pos,
-                                               dev->bulk_in->wMaxPacketSize);
+                                pos = round_up(pos, le16_to_cpu(dev->bulk_in->
+                                                                wMaxPacketSize));
                                 continue;
                         }
 
@@ -657,9 +661,13 @@ static int kvaser_usb_get_software_info(struct kvaser_usb *dev)
         switch (dev->family) {
         case KVASER_LEAF:
                 dev->fw_version = le32_to_cpu(msg.u.leaf.softinfo.fw_version);
+                dev->max_tx_urbs =
+                        le16_to_cpu(msg.u.leaf.softinfo.max_outstanding_tx);
                 break;
         case KVASER_USBCAN:
                 dev->fw_version = le32_to_cpu(msg.u.usbcan.softinfo.fw_version);
+                dev->max_tx_urbs =
+                        le16_to_cpu(msg.u.usbcan.softinfo.max_outstanding_tx);
                 break;
         }
 
@@ -715,7 +723,7 @@ static void kvaser_usb_tx_acknowledge(const struct kvaser_usb *dev,
 
         stats = &priv->netdev->stats;
 
-        context = &priv->tx_contexts[tid % MAX_TX_URBS];
+        context = &priv->tx_contexts[tid % dev->max_tx_urbs];
 
         /* Sometimes the state change doesn't come after a bus-off event */
         if (priv->can.restart_ms &&
@@ -744,7 +752,7 @@ static void kvaser_usb_tx_acknowledge(const struct kvaser_usb *dev,
         spin_lock_irqsave(&priv->tx_contexts_lock, flags);
 
         can_get_echo_skb(priv->netdev, context->echo_index);
-        context->echo_index = MAX_TX_URBS;
+        context->echo_index = dev->max_tx_urbs;
         --priv->active_tx_contexts;
         netif_wake_queue(priv->netdev);
 
@@ -1329,7 +1337,8 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb)
                  * number of events in case of a heavy rx load on the bus.
                  */
                 if (msg->len == 0) {
-                        pos = round_up(pos, dev->bulk_in->wMaxPacketSize);
+                        pos = round_up(pos, le16_to_cpu(dev->bulk_in->
+                                                        wMaxPacketSize));
                         continue;
                 }
 
@@ -1512,11 +1521,13 @@ error:
 
 static void kvaser_usb_reset_tx_urb_contexts(struct kvaser_usb_net_priv *priv)
 {
-        int i;
+        int i, max_tx_urbs;
+
+        max_tx_urbs = priv->dev->max_tx_urbs;
 
         priv->active_tx_contexts = 0;
-        for (i = 0; i < MAX_TX_URBS; i++)
-                priv->tx_contexts[i].echo_index = MAX_TX_URBS;
+        for (i = 0; i < max_tx_urbs; i++)
+                priv->tx_contexts[i].echo_index = max_tx_urbs;
 }
 
 /* This method might sleep. Do not call it in the atomic context
@@ -1702,14 +1713,14 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,
                 *msg_tx_can_flags |= MSG_FLAG_REMOTE_FRAME;
 
         spin_lock_irqsave(&priv->tx_contexts_lock, flags);
-        for (i = 0; i < ARRAY_SIZE(priv->tx_contexts); i++) {
-                if (priv->tx_contexts[i].echo_index == MAX_TX_URBS) {
+        for (i = 0; i < dev->max_tx_urbs; i++) {
+                if (priv->tx_contexts[i].echo_index == dev->max_tx_urbs) {
                         context = &priv->tx_contexts[i];
 
                         context->echo_index = i;
                         can_put_echo_skb(skb, netdev, context->echo_index);
                         ++priv->active_tx_contexts;
-                        if (priv->active_tx_contexts >= MAX_TX_URBS)
+                        if (priv->active_tx_contexts >= dev->max_tx_urbs)
                                 netif_stop_queue(netdev);
 
                         break;
@@ -1743,7 +1754,7 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,
                 spin_lock_irqsave(&priv->tx_contexts_lock, flags);
 
                 can_free_echo_skb(netdev, context->echo_index);
-                context->echo_index = MAX_TX_URBS;
+                context->echo_index = dev->max_tx_urbs;
                 --priv->active_tx_contexts;
                 netif_wake_queue(netdev);
 
@@ -1881,7 +1892,9 @@ static int kvaser_usb_init_one(struct usb_interface *intf,
         if (err)
                 return err;
 
-        netdev = alloc_candev(sizeof(*priv), MAX_TX_URBS);
+        netdev = alloc_candev(sizeof(*priv) +
+                              dev->max_tx_urbs * sizeof(*priv->tx_contexts),
+                              dev->max_tx_urbs);
         if (!netdev) {
                 dev_err(&intf->dev, "Cannot alloc candev\n");
                 return -ENOMEM;
@@ -2009,6 +2022,13 @@ static int kvaser_usb_probe(struct usb_interface *intf,
                 return err;
         }
 
+        dev_dbg(&intf->dev, "Firmware version: %d.%d.%d\n",
+                ((dev->fw_version >> 24) & 0xff),
+                ((dev->fw_version >> 16) & 0xff),
+                (dev->fw_version & 0xffff));
+
+        dev_dbg(&intf->dev, "Max oustanding tx = %d URBs\n", dev->max_tx_urbs);
+
         err = kvaser_usb_get_card_info(dev);
         if (err) {
                 dev_err(&intf->dev,
@@ -2016,11 +2036,6 @@ static int kvaser_usb_probe(struct usb_interface *intf,
                 return err;
         }
 
-        dev_dbg(&intf->dev, "Firmware version: %d.%d.%d\n",
-                ((dev->fw_version >> 24) & 0xff),
-                ((dev->fw_version >> 16) & 0xff),
-                (dev->fw_version & 0xffff));
-
         for (i = 0; i < dev->nchannels; i++) {
                 err = kvaser_usb_init_one(intf, id, i);
                 if (err) {
diff --git a/drivers/net/can/usb/peak_usb/pcan_ucan.h b/drivers/net/can/usb/peak_usb/pcan_ucan.h
index 1ba7c25002e1..e8fc4952c6b0 100644
--- a/drivers/net/can/usb/peak_usb/pcan_ucan.h
+++ b/drivers/net/can/usb/peak_usb/pcan_ucan.h
@@ -26,8 +26,8 @@
 #define PUCAN_CMD_FILTER_STD            0x008
 #define PUCAN_CMD_TX_ABORT              0x009
 #define PUCAN_CMD_WR_ERR_CNT            0x00a
-#define PUCAN_CMD_RX_FRAME_ENABLE       0x00b
-#define PUCAN_CMD_RX_FRAME_DISABLE      0x00c
+#define PUCAN_CMD_SET_EN_OPTION         0x00b
+#define PUCAN_CMD_CLR_DIS_OPTION        0x00c
 #define PUCAN_CMD_END_OF_COLLECTION     0x3ff
 
 /* uCAN received messages list */
@@ -101,14 +101,15 @@ struct __packed pucan_wr_err_cnt {
         u16     unused;
 };
 
-/* uCAN RX_FRAME_ENABLE command fields */
-#define PUCAN_FLTEXT_ERROR              0x0001
-#define PUCAN_FLTEXT_BUSLOAD            0x0002
+/* uCAN SET_EN/CLR_DIS _OPTION command fields */
+#define PUCAN_OPTION_ERROR              0x0001
+#define PUCAN_OPTION_BUSLOAD            0x0002
+#define PUCAN_OPTION_CANDFDISO          0x0004
 
-struct __packed pucan_filter_ext {
+struct __packed pucan_options {
         __le16  opcode_channel;
 
-        __le16  ext_mask;
+        __le16  options;
         u32     unused;
 };
 
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
index 0bac0f14edc3..a9221ad9f1a0 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
@@ -110,13 +110,13 @@ struct __packed pcan_ufd_led {
         u8      unused[5];
 };
 
-/* Extended usage of uCAN commands CMD_RX_FRAME_xxxABLE for PCAN-USB Pro FD */
+/* Extended usage of uCAN commands CMD_xxx_xx_OPTION for PCAN-USB Pro FD */
 #define PCAN_UFD_FLTEXT_CALIBRATION     0x8000
 
-struct __packed pcan_ufd_filter_ext {
+struct __packed pcan_ufd_options {
         __le16  opcode_channel;
 
-        __le16  ext_mask;
+        __le16  ucan_mask;
         u16     unused;
         __le16  usb_mask;
 };
@@ -251,6 +251,27 @@ static int pcan_usb_fd_build_restart_cmd(struct peak_usb_device *dev, u8 *buf)
         /* moves the pointer forward */
         pc += sizeof(struct pucan_wr_err_cnt);
 
+        /* add command to switch from ISO to non-ISO mode, if fw allows it */
+        if (dev->can.ctrlmode_supported & CAN_CTRLMODE_FD_NON_ISO) {
+                struct pucan_options *puo = (struct pucan_options *)pc;
+
+                puo->opcode_channel =
+                        (dev->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO) ?
+                        pucan_cmd_opcode_channel(dev,
+                                                 PUCAN_CMD_CLR_DIS_OPTION) :
+                        pucan_cmd_opcode_channel(dev, PUCAN_CMD_SET_EN_OPTION);
+
+                puo->options = cpu_to_le16(PUCAN_OPTION_CANDFDISO);
+
+                /* to be sure that no other extended bits will be taken into
+                 * account
+                 */
+                puo->unused = 0;
+
+                /* moves the pointer forward */
+                pc += sizeof(struct pucan_options);
+        }
+
         /* next, go back to operational mode */
         cmd = (struct pucan_command *)pc;
         cmd->opcode_channel = pucan_cmd_opcode_channel(dev,
@@ -321,21 +342,21 @@ static int pcan_usb_fd_set_filter_std(struct peak_usb_device *dev, int idx,
         return pcan_usb_fd_send_cmd(dev, cmd);
 }
 
-/* set/unset notifications filter:
+/* set/unset options
  *
- *      onoff   sets(1)/unset(0) notifications
- *      mask    each bit defines a kind of notification to set/unset
+ *      onoff   set(1)/unset(0) options
+ *      mask    each bit defines a kind of options to set/unset
  */
-static int pcan_usb_fd_set_filter_ext(struct peak_usb_device *dev,
-                                      bool onoff, u16 ext_mask, u16 usb_mask)
+static int pcan_usb_fd_set_options(struct peak_usb_device *dev,
+                                   bool onoff, u16 ucan_mask, u16 usb_mask)
 {
-        struct pcan_ufd_filter_ext *cmd = pcan_usb_fd_cmd_buffer(dev);
+        struct pcan_ufd_options *cmd = pcan_usb_fd_cmd_buffer(dev);
 
         cmd->opcode_channel = pucan_cmd_opcode_channel(dev,
-                                        (onoff) ? PUCAN_CMD_RX_FRAME_ENABLE :
-                                                  PUCAN_CMD_RX_FRAME_DISABLE);
+                                        (onoff) ? PUCAN_CMD_SET_EN_OPTION :
+                                                  PUCAN_CMD_CLR_DIS_OPTION);
 
-        cmd->ext_mask = cpu_to_le16(ext_mask);
+        cmd->ucan_mask = cpu_to_le16(ucan_mask);
         cmd->usb_mask = cpu_to_le16(usb_mask);
 
         /* send the command */
@@ -770,9 +791,9 @@ static int pcan_usb_fd_start(struct peak_usb_device *dev)
                                        &pcan_usb_pro_fd);
 
                 /* enable USB calibration messages */
-                err = pcan_usb_fd_set_filter_ext(dev, 1,
-                                                 PUCAN_FLTEXT_ERROR,
-                                                 PCAN_UFD_FLTEXT_CALIBRATION);
+                err = pcan_usb_fd_set_options(dev, 1,
+                                              PUCAN_OPTION_ERROR,
+                                              PCAN_UFD_FLTEXT_CALIBRATION);
         }
 
         pdev->usb_if->dev_opened_count++;
@@ -806,9 +827,9 @@ static int pcan_usb_fd_stop(struct peak_usb_device *dev)
 
         /* turn off special msgs for that interface if no other dev opened */
         if (pdev->usb_if->dev_opened_count == 1)
-                pcan_usb_fd_set_filter_ext(dev, 0,
-                                           PUCAN_FLTEXT_ERROR,
-                                           PCAN_UFD_FLTEXT_CALIBRATION);
+                pcan_usb_fd_set_options(dev, 0,
+                                        PUCAN_OPTION_ERROR,
+                                        PCAN_UFD_FLTEXT_CALIBRATION);
         pdev->usb_if->dev_opened_count--;
 
         return 0;
@@ -860,8 +881,14 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)
                          pdev->usb_if->fw_info.fw_version[2],
                          dev->adapter->ctrl_count);
 
-                /* the currently supported hw is non-ISO */
-                dev->can.ctrlmode = CAN_CTRLMODE_FD_NON_ISO;
+                /* check for ability to switch between ISO/non-ISO modes */
+                if (pdev->usb_if->fw_info.fw_version[0] >= 2) {
+                        /* firmware >= 2.x supports ISO/non-ISO switching */
+                        dev->can.ctrlmode_supported |= CAN_CTRLMODE_FD_NON_ISO;
+                } else {
+                        /* firmware < 2.x only supports fixed(!) non-ISO */
+                        dev->can.ctrlmode |= CAN_CTRLMODE_FD_NON_ISO;
+                }
 
                 /* tell the hardware the can driver is running */
                 err = pcan_usb_fd_drv_loaded(dev, 1);
@@ -937,9 +964,9 @@ static void pcan_usb_fd_exit(struct peak_usb_device *dev)
         if (dev->ctrl_idx == 0) {
                 /* turn off calibration message if any device were opened */
                 if (pdev->usb_if->dev_opened_count > 0)
-                        pcan_usb_fd_set_filter_ext(dev, 0,
-                                                   PUCAN_FLTEXT_ERROR,
-                                                   PCAN_UFD_FLTEXT_CALIBRATION);
+                        pcan_usb_fd_set_options(dev, 0,
+                                                PUCAN_OPTION_ERROR,
+                                                PCAN_UFD_FLTEXT_CALIBRATION);
 
                 /* tell USB adapter that the driver is being unloaded */
                 pcan_usb_fd_drv_loaded(dev, 0);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 756053c028be..4085c4b31047 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1811,7 +1811,7 @@ struct bnx2x {
         int                     stats_state;
 
         /* used for synchronization of concurrent threads statistics handling */
-        spinlock_t              stats_lock;
+        struct mutex            stats_lock;
 
         /* used by dmae command loader */
         struct dmae_command     stats_dmae;
@@ -1935,8 +1935,6 @@ struct bnx2x {
 
         int fp_array_size;
         u32 dump_preset_idx;
-        bool                                    stats_started;
-        struct semaphore                        stats_sema;
 
         u8                                      phys_port_id[ETH_ALEN];
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 996e215fc324..1ec635f54994 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -129,8 +129,8 @@ struct bnx2x_mac_vals {
         u32 xmac_val;
         u32 emac_addr;
         u32 emac_val;
-        u32 umac_addr;
-        u32 umac_val;
+        u32 umac_addr[2];
+        u32 umac_val[2];
         u32 bmac_addr;
         u32 bmac_val[2];
 };
@@ -7866,6 +7866,20 @@ int bnx2x_init_hw_func_cnic(struct bnx2x *bp)
         return 0;
 }
 
+/* previous driver DMAE transaction may have occurred when pre-boot stage ended
+ * and boot began, or when kdump kernel was loaded. Either case would invalidate
+ * the addresses of the transaction, resulting in was-error bit set in the pci
+ * causing all hw-to-host pcie transactions to timeout. If this happened we want
+ * to clear the interrupt which detected this from the pglueb and the was done
+ * bit
+ */
+static void bnx2x_clean_pglue_errors(struct bnx2x *bp)
+{
+        if (!CHIP_IS_E1x(bp))
+                REG_WR(bp, PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR,
+                       1 << BP_ABS_FUNC(bp));
+}
+
 static int bnx2x_init_hw_func(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
@@ -7958,8 +7972,7 @@ static int bnx2x_init_hw_func(struct bnx2x *bp)
 
         bnx2x_init_block(bp, BLOCK_PGLUE_B, init_phase);
 
-        if (!CHIP_IS_E1x(bp))
-                REG_WR(bp, PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR, func);
+        bnx2x_clean_pglue_errors(bp);
 
         bnx2x_init_block(bp, BLOCK_ATC, init_phase);
         bnx2x_init_block(bp, BLOCK_DMAE, init_phase);
@@ -10141,6 +10154,25 @@ static u32 bnx2x_get_pretend_reg(struct bnx2x *bp)
         return base + (BP_ABS_FUNC(bp)) * stride;
 }
 
+static bool bnx2x_prev_unload_close_umac(struct bnx2x *bp,
+                                         u8 port, u32 reset_reg,
+                                         struct bnx2x_mac_vals *vals)
+{
+        u32 mask = MISC_REGISTERS_RESET_REG_2_UMAC0 << port;
+        u32 base_addr;
+
+        if (!(mask & reset_reg))
+                return false;
+
+        BNX2X_DEV_INFO("Disable umac Rx %02x\n", port);
+        base_addr = port ? GRCBASE_UMAC1 : GRCBASE_UMAC0;
+        vals->umac_addr[port] = base_addr + UMAC_REG_COMMAND_CONFIG;
+        vals->umac_val[port] = REG_RD(bp, vals->umac_addr[port]);
+        REG_WR(bp, vals->umac_addr[port], 0);
+
+        return true;
+}
+
 static void bnx2x_prev_unload_close_mac(struct bnx2x *bp,
                                         struct bnx2x_mac_vals *vals)
 {
@@ -10149,10 +10181,7 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp,
         u8 port = BP_PORT(bp);
 
         /* reset addresses as they also mark which values were changed */
-        vals->bmac_addr = 0;
-        vals->umac_addr = 0;
-        vals->xmac_addr = 0;
-        vals->emac_addr = 0;
+        memset(vals, 0, sizeof(*vals));
 
         reset_reg = REG_RD(bp, MISC_REG_RESET_REG_2);
 
@@ -10201,15 +10230,11 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp,
                         REG_WR(bp, vals->xmac_addr, 0);
                         mac_stopped = true;
                 }
-                mask = MISC_REGISTERS_RESET_REG_2_UMAC0 << port;
-                if (mask & reset_reg) {
-                        BNX2X_DEV_INFO("Disable umac Rx\n");
-                        base_addr = BP_PORT(bp) ? GRCBASE_UMAC1 : GRCBASE_UMAC0;
-                        vals->umac_addr = base_addr + UMAC_REG_COMMAND_CONFIG;
-                        vals->umac_val = REG_RD(bp, vals->umac_addr);
-                        REG_WR(bp, vals->umac_addr, 0);
-                        mac_stopped = true;
-                }
+
+                mac_stopped |= bnx2x_prev_unload_close_umac(bp, 0,
+                                                            reset_reg, vals);
+                mac_stopped |= bnx2x_prev_unload_close_umac(bp, 1,
+                                                            reset_reg, vals);
         }
 
         if (mac_stopped)
@@ -10505,8 +10530,11 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp)
                 /* Close the MAC Rx to prevent BRB from filling up */
                 bnx2x_prev_unload_close_mac(bp, &mac_vals);
 
-                /* close LLH filters towards the BRB */
+                /* close LLH filters for both ports towards the BRB */
                 bnx2x_set_rx_filter(&bp->link_params, 0);
+                bp->link_params.port ^= 1;
+                bnx2x_set_rx_filter(&bp->link_params, 0);
+                bp->link_params.port ^= 1;
 
                 /* Check if the UNDI driver was previously loaded */
                 if (bnx2x_prev_is_after_undi(bp)) {
@@ -10553,8 +10581,10 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp)
 
         if (mac_vals.xmac_addr)
                 REG_WR(bp, mac_vals.xmac_addr, mac_vals.xmac_val);
-        if (mac_vals.umac_addr)
-                REG_WR(bp, mac_vals.umac_addr, mac_vals.umac_val);
+        if (mac_vals.umac_addr[0])
+                REG_WR(bp, mac_vals.umac_addr[0], mac_vals.umac_val[0]);
+        if (mac_vals.umac_addr[1])
+                REG_WR(bp, mac_vals.umac_addr[1], mac_vals.umac_val[1]);
         if (mac_vals.emac_addr)
                 REG_WR(bp, mac_vals.emac_addr, mac_vals.emac_val);
         if (mac_vals.bmac_addr) {
@@ -10571,26 +10601,6 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp)
         return bnx2x_prev_mcp_done(bp);
 }
 
-/* previous driver DMAE transaction may have occurred when pre-boot stage ended
- * and boot began, or when kdump kernel was loaded. Either case would invalidate
- * the addresses of the transaction, resulting in was-error bit set in the pci
- * causing all hw-to-host pcie transactions to timeout. If this happened we want
- * to clear the interrupt which detected this from the pglueb and the was done
- * bit
- */
-static void bnx2x_prev_interrupted_dmae(struct bnx2x *bp)
-{
-        if (!CHIP_IS_E1x(bp)) {
-                u32 val = REG_RD(bp, PGLUE_B_REG_PGLUE_B_INT_STS);
-                if (val & PGLUE_B_PGLUE_B_INT_STS_REG_WAS_ERROR_ATTN) {
-                        DP(BNX2X_MSG_SP,
-                           "'was error' bit was found to be set in pglueb upon startup. Clearing\n");
-                        REG_WR(bp, PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR,
-                               1 << BP_FUNC(bp));
-                }
-        }
-}
-
 static int bnx2x_prev_unload(struct bnx2x *bp)
 {
         int time_counter = 10;
@@ -10600,7 +10610,7 @@ static int bnx2x_prev_unload(struct bnx2x *bp)
         /* clear hw from errors which may have resulted from an interrupted
          * dmae transaction.
          */
-        bnx2x_prev_interrupted_dmae(bp);
+        bnx2x_clean_pglue_errors(bp);
 
         /* Release previously held locks */
         hw_lock_reg = (BP_FUNC(bp) <= 5) ?
@@ -12037,9 +12047,8 @@ static int bnx2x_init_bp(struct bnx2x *bp)
         mutex_init(&bp->port.phy_mutex);
         mutex_init(&bp->fw_mb_mutex);
         mutex_init(&bp->drv_info_mutex);
+        mutex_init(&bp->stats_lock);
         bp->drv_info_mng_owner = false;
-        spin_lock_init(&bp->stats_lock);
-        sema_init(&bp->stats_sema, 1);
 
         INIT_DELAYED_WORK(&bp->sp_task, bnx2x_sp_task);
         INIT_DELAYED_WORK(&bp->sp_rtnl_task, bnx2x_sp_rtnl_task);
@@ -13668,9 +13677,9 @@ static int bnx2x_eeh_nic_unload(struct bnx2x *bp)
         cancel_delayed_work_sync(&bp->sp_task);
         cancel_delayed_work_sync(&bp->period_task);
 
-        spin_lock_bh(&bp->stats_lock);
+        mutex_lock(&bp->stats_lock);
         bp->stats_state = STATS_STATE_DISABLED;
-        spin_unlock_bh(&bp->stats_lock);
+        mutex_unlock(&bp->stats_lock);
 
         bnx2x_save_statistics(bp);
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index e5aca2de1871..cfe3c7695455 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -2238,7 +2238,9 @@ int bnx2x_vf_close(struct bnx2x *bp, struct bnx2x_virtf *vf)
 
                 cookie.vf = vf;
                 cookie.state = VF_ACQUIRED;
-                bnx2x_stats_safe_exec(bp, bnx2x_set_vf_state, &cookie);
+                rc = bnx2x_stats_safe_exec(bp, bnx2x_set_vf_state, &cookie);
+                if (rc)
+                        goto op_err;
         }
 
         DP(BNX2X_MSG_IOV, "set state to acquired\n");
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index d1608297c773..800ab44a07ce 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -123,36 +123,28 @@ static void bnx2x_dp_stats(struct bnx2x *bp)
  */
 static void bnx2x_storm_stats_post(struct bnx2x *bp)
 {
-        if (!bp->stats_pending) {
-                int rc;
+        int rc;
 
-                spin_lock_bh(&bp->stats_lock);
-
-                if (bp->stats_pending) {
-                        spin_unlock_bh(&bp->stats_lock);
-                        return;
-                }
-
-                bp->fw_stats_req->hdr.drv_stats_counter =
-                        cpu_to_le16(bp->stats_counter++);
+        if (bp->stats_pending)
+                return;
 
-                DP(BNX2X_MSG_STATS, "Sending statistics ramrod %d\n",
-                   le16_to_cpu(bp->fw_stats_req->hdr.drv_stats_counter));
+        bp->fw_stats_req->hdr.drv_stats_counter =
+                cpu_to_le16(bp->stats_counter++);
 
-                /* adjust the ramrod to include VF queues statistics */
-                bnx2x_iov_adjust_stats_req(bp);
-                bnx2x_dp_stats(bp);
+        DP(BNX2X_MSG_STATS, "Sending statistics ramrod %d\n",
+           le16_to_cpu(bp->fw_stats_req->hdr.drv_stats_counter));
 
-                /* send FW stats ramrod */
-                rc = bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_STAT_QUERY, 0,
-                                   U64_HI(bp->fw_stats_req_mapping),
-                                   U64_LO(bp->fw_stats_req_mapping),
-                                   NONE_CONNECTION_TYPE);
-                if (rc == 0)
-                        bp->stats_pending = 1;
+        /* adjust the ramrod to include VF queues statistics */
+        bnx2x_iov_adjust_stats_req(bp);
+        bnx2x_dp_stats(bp);
 
-                spin_unlock_bh(&bp->stats_lock);
-        }
+        /* send FW stats ramrod */
+        rc = bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_STAT_QUERY, 0,
+                           U64_HI(bp->fw_stats_req_mapping),
+                           U64_LO(bp->fw_stats_req_mapping),
+                           NONE_CONNECTION_TYPE);
+        if (rc == 0)
+                bp->stats_pending = 1;
 }
 
 static void bnx2x_hw_stats_post(struct bnx2x *bp)
@@ -221,7 +213,7 @@ static void bnx2x_stats_comp(struct bnx2x *bp)
  */
 
 /* should be called under stats_sema */
-static void __bnx2x_stats_pmf_update(struct bnx2x *bp)
+static void bnx2x_stats_pmf_update(struct bnx2x *bp)
 {
         struct dmae_command *dmae;
         u32 opcode;
@@ -519,7 +511,7 @@ static void bnx2x_func_stats_init(struct bnx2x *bp)
 }
 
 /* should be called under stats_sema */
-static void __bnx2x_stats_start(struct bnx2x *bp)
+static void bnx2x_stats_start(struct bnx2x *bp)
 {
         if (IS_PF(bp)) {
                 if (bp->port.pmf)
@@ -531,34 +523,13 @@ static void __bnx2x_stats_start(struct bnx2x *bp)
                 bnx2x_hw_stats_post(bp);
                 bnx2x_storm_stats_post(bp);
         }
-
-        bp->stats_started = true;
-}
-
-static void bnx2x_stats_start(struct bnx2x *bp)
-{
-        if (down_timeout(&bp->stats_sema, HZ/10))
-                BNX2X_ERR("Unable to acquire stats lock\n");
-        __bnx2x_stats_start(bp);
-        up(&bp->stats_sema);
 }
 
 static void bnx2x_stats_pmf_start(struct bnx2x *bp)
 {
-        if (down_timeout(&bp->stats_sema, HZ/10))
-                BNX2X_ERR("Unable to acquire stats lock\n");
         bnx2x_stats_comp(bp);
-        __bnx2x_stats_pmf_update(bp);
-        __bnx2x_stats_start(bp);
-        up(&bp->stats_sema);
-}
-
-static void bnx2x_stats_pmf_update(struct bnx2x *bp)
-{
-        if (down_timeout(&bp->stats_sema, HZ/10))
-                BNX2X_ERR("Unable to acquire stats lock\n");
-        __bnx2x_stats_pmf_update(bp);
-        up(&bp->stats_sema);
+        bnx2x_stats_pmf_update(bp);
+        bnx2x_stats_start(bp);
 }
 
 static void bnx2x_stats_restart(struct bnx2x *bp)
@@ -568,11 +539,9 @@ static void bnx2x_stats_restart(struct bnx2x *bp)
          */
         if (IS_VF(bp))
                 return;
-        if (down_timeout(&bp->stats_sema, HZ/10))
-                BNX2X_ERR("Unable to acquire stats lock\n");
+
         bnx2x_stats_comp(bp);
-        __bnx2x_stats_start(bp);
-        up(&bp->stats_sema);
+        bnx2x_stats_start(bp);
 }
 
 static void bnx2x_bmac_stats_update(struct bnx2x *bp)
@@ -1246,18 +1215,12 @@ static void bnx2x_stats_update(struct bnx2x *bp)
 {
         u32 *stats_comp = bnx2x_sp(bp, stats_comp);
 
-        /* we run update from timer context, so give up
-         * if somebody is in the middle of transition
-         */
-        if (down_trylock(&bp->stats_sema))
+        if (bnx2x_edebug_stats_stopped(bp))
                 return;
 
-        if (bnx2x_edebug_stats_stopped(bp) || !bp->stats_started)
-                goto out;
-
         if (IS_PF(bp)) {
                 if (*stats_comp != DMAE_COMP_VAL)
-                        goto out;
+                        return;
 
                 if (bp->port.pmf)
                         bnx2x_hw_stats_update(bp);
@@ -1267,7 +1230,7 @@ static void bnx2x_stats_update(struct bnx2x *bp)
                                 BNX2X_ERR("storm stats were not updated for 3 times\n");
                                 bnx2x_panic();
                         }
-                        goto out;
+                        return;
                 }
         } else {
                 /* vf doesn't collect HW statistics, and doesn't get completions
@@ -1281,7 +1244,7 @@ static void bnx2x_stats_update(struct bnx2x *bp)
 
         /* vf is done */
         if (IS_VF(bp))
-                goto out;
+                return;
 
         if (netif_msg_timer(bp)) {
                 struct bnx2x_eth_stats *estats = &bp->eth_stats;
@@ -1292,9 +1255,6 @@ static void bnx2x_stats_update(struct bnx2x *bp)
 
         bnx2x_hw_stats_post(bp);
         bnx2x_storm_stats_post(bp);
-
-out:
-        up(&bp->stats_sema);
 }
 
 static void bnx2x_port_stats_stop(struct bnx2x *bp)
@@ -1358,12 +1318,7 @@ static void bnx2x_port_stats_stop(struct bnx2x *bp)
 
 static void bnx2x_stats_stop(struct bnx2x *bp)
 {
-        int update = 0;
-
-        if (down_timeout(&bp->stats_sema, HZ/10))
-                BNX2X_ERR("Unable to acquire stats lock\n");
-
-        bp->stats_started = false;
+        bool update = false;
 
         bnx2x_stats_comp(bp);
 
@@ -1381,8 +1336,6 @@ static void bnx2x_stats_stop(struct bnx2x *bp)
                 bnx2x_hw_stats_post(bp);
                 bnx2x_stats_comp(bp);
         }
-
-        up(&bp->stats_sema);
 }
 
 static void bnx2x_stats_do_nothing(struct bnx2x *bp)
@@ -1410,18 +1363,28 @@ static const struct {
 
 void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event)
 {
-        enum bnx2x_stats_state state;
-        void (*action)(struct bnx2x *bp);
+        enum bnx2x_stats_state state = bp->stats_state;
+
         if (unlikely(bp->panic))
                 return;
 
-        spin_lock_bh(&bp->stats_lock);
-        state = bp->stats_state;
+        /* Statistics update run from timer context, and we don't want to stop
+         * that context in case someone is in the middle of a transition.
+         * For other events, wait a bit until lock is taken.
+         */
+        if (!mutex_trylock(&bp->stats_lock)) {
+                if (event == STATS_EVENT_UPDATE)
+                        return;
+
+                DP(BNX2X_MSG_STATS,
+                   "Unlikely stats' lock contention [event %d]\n", event);
+                mutex_lock(&bp->stats_lock);
+        }
+
+        bnx2x_stats_stm[state][event].action(bp);
         bp->stats_state = bnx2x_stats_stm[state][event].next_state;
-        action = bnx2x_stats_stm[state][event].action;
-        spin_unlock_bh(&bp->stats_lock);
 
-        action(bp);
+        mutex_unlock(&bp->stats_lock);
 
         if ((event != STATS_EVENT_UPDATE) || netif_msg_timer(bp))
                 DP(BNX2X_MSG_STATS, "state %d -> event %d -> state %d\n",
@@ -1998,13 +1961,34 @@ void bnx2x_afex_collect_stats(struct bnx2x *bp, void *void_afex_stats,
         }
 }
 
-void bnx2x_stats_safe_exec(struct bnx2x *bp,
-                           void (func_to_exec)(void *cookie),
-                           void *cookie){
-        if (down_timeout(&bp->stats_sema, HZ/10))
-                BNX2X_ERR("Unable to acquire stats lock\n");
+int bnx2x_stats_safe_exec(struct bnx2x *bp,
+                          void (func_to_exec)(void *cookie),
+                          void *cookie)
+{
+        int cnt = 10, rc = 0;
+
+        /* Wait for statistics to end [while blocking further requests],
+         * then run supplied function 'safely'.
+         */
+        mutex_lock(&bp->stats_lock);
+
         bnx2x_stats_comp(bp);
+        while (bp->stats_pending && cnt--)
+                if (bnx2x_storm_stats_update(bp))
+                        usleep_range(1000, 2000);
+        if (bp->stats_pending) {
+                BNX2X_ERR("Failed to wait for stats pending to clear [possibly FW is stuck]\n");
+                rc = -EBUSY;
+                goto out;
+        }
+
         func_to_exec(cookie);
-        __bnx2x_stats_start(bp);
-        up(&bp->stats_sema);
+
+out:
+        /* No need to restart statistics - if they're enabled, the timer
+         * will restart the statistics.
+         */
+        mutex_unlock(&bp->stats_lock);
+
+        return rc;
 }
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
index 2beceaefdeea..965539a9dabe 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
@@ -539,9 +539,9 @@ struct bnx2x;
 void bnx2x_memset_stats(struct bnx2x *bp);
 void bnx2x_stats_init(struct bnx2x *bp);
 void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event);
-void bnx2x_stats_safe_exec(struct bnx2x *bp,
-                           void (func_to_exec)(void *cookie),
-                           void *cookie);
+int bnx2x_stats_safe_exec(struct bnx2x *bp,
+                          void (func_to_exec)(void *cookie),
+                          void *cookie);
 
 /**
  * bnx2x_save_statistics - save statistics when unloading.
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 97842d03675b..c6ff4890d171 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -376,8 +376,6 @@ enum {
 enum {
         INGQ_EXTRAS = 2,        /* firmware event queue and */
                                 /*   forwarded interrupts */
-        MAX_EGRQ = MAX_ETH_QSETS*2 + MAX_OFLD_QSETS*2
-                   + MAX_CTRL_QUEUES + MAX_RDMA_QUEUES + MAX_ISCSI_QUEUES,
         MAX_INGQ = MAX_ETH_QSETS + MAX_OFLD_QSETS + MAX_RDMA_QUEUES
                    + MAX_RDMA_CIQS + MAX_ISCSI_QUEUES + INGQ_EXTRAS,
 };
@@ -616,11 +614,13 @@ struct sge {
         unsigned int idma_qid[2];   /* SGE IDMA Hung Ingress Queue ID */
 
         unsigned int egr_start;
+        unsigned int egr_sz;
         unsigned int ingr_start;
-        void *egr_map[MAX_EGRQ];    /* qid->queue egress queue map */
-        struct sge_rspq *ingr_map[MAX_INGQ]; /* qid->queue ingress queue map */
-        DECLARE_BITMAP(starving_fl, MAX_EGRQ);
-        DECLARE_BITMAP(txq_maperr, MAX_EGRQ);
+        unsigned int ingr_sz;
+        void **egr_map;    /* qid->queue egress queue map */
+        struct sge_rspq **ingr_map; /* qid->queue ingress queue map */
+        unsigned long *starving_fl;
+        unsigned long *txq_maperr;
         struct timer_list rx_timer; /* refills starving FLs */
         struct timer_list tx_timer; /* checks Tx queues */
 };
@@ -1136,6 +1136,8 @@ int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter,
 
 unsigned int qtimer_val(const struct adapter *adap,
                         const struct sge_rspq *q);
+
+int t4_init_devlog_params(struct adapter *adapter);
 int t4_init_sge_params(struct adapter *adapter);
 int t4_init_tp_params(struct adapter *adap);
 int t4_filter_field_shift(const struct adapter *adap, int filter_sel);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
index 78854ceb0870..dcb047945290 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
@@ -670,9 +670,13 @@ static int cctrl_tbl_show(struct seq_file *seq, void *v)
                 "0.9375" };
 
         int i;
-        u16 incr[NMTUS][NCCTRL_WIN];
+        u16 (*incr)[NCCTRL_WIN];
         struct adapter *adap = seq->private;
 
+        incr = kmalloc(sizeof(*incr) * NMTUS, GFP_KERNEL);
+        if (!incr)
+                return -ENOMEM;
+
         t4_read_cong_tbl(adap, incr);
 
         for (i = 0; i < NCCTRL_WIN; ++i) {
@@ -685,6 +689,8 @@ static int cctrl_tbl_show(struct seq_file *seq, void *v)
                            adap->params.a_wnd[i],
                            dec_fac[adap->params.b_wnd[i]]);
         }
+
+        kfree(incr);
         return 0;
 }
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index a22cf932ca35..d92995138f7e 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -920,7 +920,7 @@ static void quiesce_rx(struct adapter *adap)
 {
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(adap->sge.ingr_map); i++) {
+        for (i = 0; i < adap->sge.ingr_sz; i++) {
                 struct sge_rspq *q = adap->sge.ingr_map[i];
 
                 if (q && q->handler) {
@@ -934,6 +934,21 @@ static void quiesce_rx(struct adapter *adap)
         }
 }
 
+/* Disable interrupt and napi handler */
+static void disable_interrupts(struct adapter *adap)
+{
+        if (adap->flags & FULL_INIT_DONE) {
+                t4_intr_disable(adap);
+                if (adap->flags & USING_MSIX) {
+                        free_msix_queue_irqs(adap);
+                        free_irq(adap->msix_info[0].vec, adap);
+                } else {
+                        free_irq(adap->pdev->irq, adap);
+                }
+                quiesce_rx(adap);
+        }
+}
+
 /*
  * Enable NAPI scheduling and interrupt generation for all Rx queues.
  */
@@ -941,7 +956,7 @@ static void enable_rx(struct adapter *adap)
 {
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(adap->sge.ingr_map); i++) {
+        for (i = 0; i < adap->sge.ingr_sz; i++) {
                 struct sge_rspq *q = adap->sge.ingr_map[i];
 
                 if (!q)
@@ -970,8 +985,8 @@ static int setup_sge_queues(struct adapter *adap)
         int err, msi_idx, i, j;
         struct sge *s = &adap->sge;
 
-        bitmap_zero(s->starving_fl, MAX_EGRQ);
-        bitmap_zero(s->txq_maperr, MAX_EGRQ);
+        bitmap_zero(s->starving_fl, s->egr_sz);
+        bitmap_zero(s->txq_maperr, s->egr_sz);
 
         if (adap->flags & USING_MSIX)
                 msi_idx = 1;         /* vector 0 is for non-queue interrupts */
@@ -983,6 +998,19 @@ static int setup_sge_queues(struct adapter *adap)
                 msi_idx = -((int)s->intrq.abs_id + 1);
         }
 
+        /* NOTE: If you add/delete any Ingress/Egress Queue allocations in here,
+         * don't forget to update the following which need to be
+         * synchronized to and changes here.
+         *
+         * 1. The calculations of MAX_INGQ in cxgb4.h.
+         *
+         * 2. Update enable_msix/name_msix_vecs/request_msix_queue_irqs
+         *    to accommodate any new/deleted Ingress Queues
+         *    which need MSI-X Vectors.
+         *
+         * 3. Update sge_qinfo_show() to include information on the
+         *    new/deleted queues.
+         */
         err = t4_sge_alloc_rxq(adap, &s->fw_evtq, true, adap->port[0],
                                msi_idx, NULL, fwevtq_handler);
         if (err) {
@@ -4244,19 +4272,12 @@ static int cxgb_up(struct adapter *adap)
 
 static void cxgb_down(struct adapter *adapter)
 {
-        t4_intr_disable(adapter);
         cancel_work_sync(&adapter->tid_release_task);
         cancel_work_sync(&adapter->db_full_task);
         cancel_work_sync(&adapter->db_drop_task);
         adapter->tid_release_task_busy = false;
         adapter->tid_release_head = NULL;
 
-        if (adapter->flags & USING_MSIX) {
-                free_msix_queue_irqs(adapter);
-                free_irq(adapter->msix_info[0].vec, adapter);
-        } else
-                free_irq(adapter->pdev->irq, adapter);
-        quiesce_rx(adapter);
         t4_sge_stop(adapter);
         t4_free_sge_resources(adapter);
         adapter->flags &= ~FULL_INIT_DONE;
@@ -4733,8 +4754,9 @@ static int adap_init1(struct adapter *adap, struct fw_caps_config_cmd *c)
         if (ret < 0)
                 return ret;
 
-        ret = t4_cfg_pfvf(adap, adap->fn, adap->fn, 0, MAX_EGRQ, 64, MAX_INGQ,
-                          0, 0, 4, 0xf, 0xf, 16, FW_CMD_CAP_PF, FW_CMD_CAP_PF);
+        ret = t4_cfg_pfvf(adap, adap->fn, adap->fn, 0, adap->sge.egr_sz, 64,
+                          MAX_INGQ, 0, 0, 4, 0xf, 0xf, 16, FW_CMD_CAP_PF,
+                          FW_CMD_CAP_PF);
         if (ret < 0)
                 return ret;
 
@@ -5088,10 +5110,15 @@ static int adap_init0(struct adapter *adap)
         enum dev_state state;
         u32 params[7], val[7];
         struct fw_caps_config_cmd caps_cmd;
-        struct fw_devlog_cmd devlog_cmd;
-        u32 devlog_meminfo;
         int reset = 1;
 
+        /* Grab Firmware Device Log parameters as early as possible so we have
+         * access to it for debugging, etc.
+         */
+        ret = t4_init_devlog_params(adap);
+        if (ret < 0)
+                return ret;
+
         /* Contact FW, advertising Master capability */
         ret = t4_fw_hello(adap, adap->mbox, adap->mbox, MASTER_MAY, &state);
         if (ret < 0) {
@@ -5169,30 +5196,6 @@ static int adap_init0(struct adapter *adap)
         if (ret < 0)
                 goto bye;
 
-        /* Read firmware device log parameters.  We really need to find a way
-         * to get these parameters initialized with some default values (which
-         * are likely to be correct) for the case where we either don't
-         * attache to the firmware or it's crashed when we probe the adapter.
-         * That way we'll still be able to perform early firmware startup
-         * debugging ...  If the request to get the Firmware's Device Log
-         * parameters fails, we'll live so we don't make that a fatal error.
-         */
-        memset(&devlog_cmd, 0, sizeof(devlog_cmd));
-        devlog_cmd.op_to_write = htonl(FW_CMD_OP_V(FW_DEVLOG_CMD) |
-                                       FW_CMD_REQUEST_F | FW_CMD_READ_F);
-        devlog_cmd.retval_len16 = htonl(FW_LEN16(devlog_cmd));
-        ret = t4_wr_mbox(adap, adap->mbox, &devlog_cmd, sizeof(devlog_cmd),
-                         &devlog_cmd);
-        if (ret == 0) {
-                devlog_meminfo =
-                        ntohl(devlog_cmd.memtype_devlog_memaddr16_devlog);
-                adap->params.devlog.memtype =
-                        FW_DEVLOG_CMD_MEMTYPE_DEVLOG_G(devlog_meminfo);
-                adap->params.devlog.start =
-                        FW_DEVLOG_CMD_MEMADDR16_DEVLOG_G(devlog_meminfo) << 4;
-                adap->params.devlog.size = ntohl(devlog_cmd.memsize_devlog);
-        }
-
         /*
          * Find out what ports are available to us.  Note that we need to do
          * this before calling adap_init0_no_config() since it needs nports
@@ -5293,6 +5296,51 @@ static int adap_init0(struct adapter *adap)
         adap->tids.nftids = val[4] - val[3] + 1;
         adap->sge.ingr_start = val[5];
 
+        /* qids (ingress/egress) returned from firmware can be anywhere
+         * in the range from EQ(IQFLINT)_START to EQ(IQFLINT)_END.
+         * Hence driver needs to allocate memory for this range to
+         * store the queue info. Get the highest IQFLINT/EQ index returned
+         * in FW_EQ_*_CMD.alloc command.
+         */
+        params[0] = FW_PARAM_PFVF(EQ_END);
+        params[1] = FW_PARAM_PFVF(IQFLINT_END);
+        ret = t4_query_params(adap, adap->mbox, adap->fn, 0, 2, params, val);
+        if (ret < 0)
+                goto bye;
+        adap->sge.egr_sz = val[0] - adap->sge.egr_start + 1;
+        adap->sge.ingr_sz = val[1] - adap->sge.ingr_start + 1;
+
+        adap->sge.egr_map = kcalloc(adap->sge.egr_sz,
+                                    sizeof(*adap->sge.egr_map), GFP_KERNEL);
+        if (!adap->sge.egr_map) {
+                ret = -ENOMEM;
+                goto bye;
+        }
+
+        adap->sge.ingr_map = kcalloc(adap->sge.ingr_sz,
+                                     sizeof(*adap->sge.ingr_map), GFP_KERNEL);
+        if (!adap->sge.ingr_map) {
+                ret = -ENOMEM;
+                goto bye;
+        }
+
+        /* Allocate the memory for the vaious egress queue bitmaps
+         * ie starving_fl and txq_maperr.
+         */
+        adap->sge.starving_fl = kcalloc(BITS_TO_LONGS(adap->sge.egr_sz),
+                                        sizeof(long), GFP_KERNEL);
+        if (!adap->sge.starving_fl) {
+                ret = -ENOMEM;
+                goto bye;
+        }
+
+        adap->sge.txq_maperr = kcalloc(BITS_TO_LONGS(adap->sge.egr_sz),
+                                       sizeof(long), GFP_KERNEL);
+        if (!adap->sge.txq_maperr) {
+                ret = -ENOMEM;
+                goto bye;
+        }
+
         params[0] = FW_PARAM_PFVF(CLIP_START);
         params[1] = FW_PARAM_PFVF(CLIP_END);
         ret = t4_query_params(adap, adap->mbox, adap->fn, 0, 2, params, val);
@@ -5501,6 +5549,10 @@ static int adap_init0(struct adapter *adap)
          * happened to HW/FW, stop issuing commands.
          */
 bye:
+        kfree(adap->sge.egr_map);
+        kfree(adap->sge.ingr_map);
+        kfree(adap->sge.starving_fl);
+        kfree(adap->sge.txq_maperr);
         if (ret != -ETIMEDOUT && ret != -EIO)
                 t4_fw_bye(adap, adap->mbox);
         return ret;
@@ -5528,6 +5580,7 @@ static pci_ers_result_t eeh_err_detected(struct pci_dev *pdev,
                 netif_carrier_off(dev);
         }
         spin_unlock(&adap->stats_lock);
+        disable_interrupts(adap);
         if (adap->flags & FULL_INIT_DONE)
                 cxgb_down(adap);
         rtnl_unlock();
@@ -5912,6 +5965,10 @@ static void free_some_resources(struct adapter *adapter)
 
         t4_free_mem(adapter->l2t);
         t4_free_mem(adapter->tids.tid_tab);
+        kfree(adapter->sge.egr_map);
+        kfree(adapter->sge.ingr_map);
+        kfree(adapter->sge.starving_fl);
+        kfree(adapter->sge.txq_maperr);
         disable_msi(adapter);
 
         for_each_port(adapter, i)
@@ -6237,6 +6294,8 @@ static void remove_one(struct pci_dev *pdev)
                 if (is_offload(adapter))
                         detach_ulds(adapter);
 
+                disable_interrupts(adapter);
+
                 for_each_port(adapter, i)
                         if (adapter->port[i]->reg_state == NETREG_REGISTERED)
                                 unregister_netdev(adapter->port[i]);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index b4b9f6048fe7..b688b32c21fe 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -2171,7 +2171,7 @@ static void sge_rx_timer_cb(unsigned long data)
         struct adapter *adap = (struct adapter *)data;
         struct sge *s = &adap->sge;
 
-        for (i = 0; i < ARRAY_SIZE(s->starving_fl); i++)
+        for (i = 0; i < BITS_TO_LONGS(s->egr_sz); i++)
                 for (m = s->starving_fl[i]; m; m &= m - 1) {
                         struct sge_eth_rxq *rxq;
                         unsigned int id = __ffs(m) + i * BITS_PER_LONG;
@@ -2259,7 +2259,7 @@ static void sge_tx_timer_cb(unsigned long data)
         struct adapter *adap = (struct adapter *)data;
         struct sge *s = &adap->sge;
 
-        for (i = 0; i < ARRAY_SIZE(s->txq_maperr); i++)
+        for (i = 0; i < BITS_TO_LONGS(s->egr_sz); i++)
                 for (m = s->txq_maperr[i]; m; m &= m - 1) {
                         unsigned long id = __ffs(m) + i * BITS_PER_LONG;
                         struct sge_ofld_txq *txq = s->egr_map[id];
@@ -2741,7 +2741,8 @@ void t4_free_sge_resources(struct adapter *adap)
                 free_rspq_fl(adap, &adap->sge.intrq, NULL);
 
         /* clear the reverse egress queue map */
-        memset(adap->sge.egr_map, 0, sizeof(adap->sge.egr_map));
+        memset(adap->sge.egr_map, 0,
+               adap->sge.egr_sz * sizeof(*adap->sge.egr_map));
 }
 
 void t4_sge_start(struct adapter *adap)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 1abdfa123c6c..ee394dc68303 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -4459,6 +4459,59 @@ int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter,
 }
 
 /**
+ *      t4_init_devlog_params - initialize adapter->params.devlog
+ *      @adap: the adapter
+ *
+ *      Initialize various fields of the adapter's Firmware Device Log
+ *      Parameters structure.
+ */
+int t4_init_devlog_params(struct adapter *adap)
+{
+        struct devlog_params *dparams = &adap->params.devlog;
+        u32 pf_dparams;
+        unsigned int devlog_meminfo;
+        struct fw_devlog_cmd devlog_cmd;
+        int ret;
+
+        /* If we're dealing with newer firmware, the Device Log Paramerters
+         * are stored in a designated register which allows us to access the
+         * Device Log even if we can't talk to the firmware.
+         */
+        pf_dparams =
+                t4_read_reg(adap, PCIE_FW_REG(PCIE_FW_PF_A, PCIE_FW_PF_DEVLOG));
+        if (pf_dparams) {
+                unsigned int nentries, nentries128;
+
+                dparams->memtype = PCIE_FW_PF_DEVLOG_MEMTYPE_G(pf_dparams);
+                dparams->start = PCIE_FW_PF_DEVLOG_ADDR16_G(pf_dparams) << 4;
+
+                nentries128 = PCIE_FW_PF_DEVLOG_NENTRIES128_G(pf_dparams);
+                nentries = (nentries128 + 1) * 128;
+                dparams->size = nentries * sizeof(struct fw_devlog_e);
+
+                return 0;
+        }
+
+        /* Otherwise, ask the firmware for it's Device Log Parameters.
+         */
+        memset(&devlog_cmd, 0, sizeof(devlog_cmd));
+        devlog_cmd.op_to_write = htonl(FW_CMD_OP_V(FW_DEVLOG_CMD) |
+                                       FW_CMD_REQUEST_F | FW_CMD_READ_F);
+        devlog_cmd.retval_len16 = htonl(FW_LEN16(devlog_cmd));
+        ret = t4_wr_mbox(adap, adap->mbox, &devlog_cmd, sizeof(devlog_cmd),
+                         &devlog_cmd);
+        if (ret)
+                return ret;
+
+        devlog_meminfo = ntohl(devlog_cmd.memtype_devlog_memaddr16_devlog);
+        dparams->memtype = FW_DEVLOG_CMD_MEMTYPE_DEVLOG_G(devlog_meminfo);
+        dparams->start = FW_DEVLOG_CMD_MEMADDR16_DEVLOG_G(devlog_meminfo) << 4;
+        dparams->size = ntohl(devlog_cmd.memsize_devlog);
+
+        return 0;
+}
+
+/**
  *      t4_init_sge_params - initialize adap->params.sge
  *      @adapter: the adapter
  *
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
index 231a725f6d5d..326674b19983 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
@@ -63,6 +63,8 @@
 #define MC_BIST_STATUS_REG(reg_addr, idx) ((reg_addr) + (idx) * 4)
 #define EDC_BIST_STATUS_REG(reg_addr, idx) ((reg_addr) + (idx) * 4)
 
+#define PCIE_FW_REG(reg_addr, idx) ((reg_addr) + (idx) * 4)
+
 #define SGE_PF_KDOORBELL_A 0x0
 
 #define QID_S    15
@@ -707,6 +709,7 @@
 #define PFNUM_V(x) ((x) << PFNUM_S)
 
 #define PCIE_FW_A 0x30b8
+#define PCIE_FW_PF_A 0x30bc
 
 #define PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS_A 0x5908
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
index 9b353a88cbda..a4a19e0ec7f5 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
@@ -101,7 +101,7 @@ enum fw_wr_opcodes {
         FW_RI_BIND_MW_WR               = 0x18,
         FW_RI_FR_NSMR_WR               = 0x19,
         FW_RI_INV_LSTAG_WR             = 0x1a,
-        FW_LASTC2E_WR                  = 0x40
+        FW_LASTC2E_WR                  = 0x70
 };
 
 struct fw_wr_hdr {
@@ -993,6 +993,7 @@ enum fw_memtype_cf {
         FW_MEMTYPE_CF_EXTMEM            = 0x2,
         FW_MEMTYPE_CF_FLASH             = 0x4,
         FW_MEMTYPE_CF_INTERNAL          = 0x5,
+        FW_MEMTYPE_CF_EXTMEM1           = 0x6,
 };
 
 struct fw_caps_config_cmd {
@@ -1035,6 +1036,7 @@ enum fw_params_mnem {
         FW_PARAMS_MNEM_PFVF             = 2,    /* function params */
         FW_PARAMS_MNEM_REG              = 3,    /* limited register access */
         FW_PARAMS_MNEM_DMAQ             = 4,    /* dma queue params */
+        FW_PARAMS_MNEM_CHNET            = 5,    /* chnet params */
         FW_PARAMS_MNEM_LAST
 };
 
@@ -3102,7 +3104,8 @@ enum fw_devlog_facility {
         FW_DEVLOG_FACILITY_FCOE         = 0x2E,
         FW_DEVLOG_FACILITY_FOISCSI      = 0x30,
         FW_DEVLOG_FACILITY_FOFCOE       = 0x32,
-        FW_DEVLOG_FACILITY_MAX          = 0x32,
+        FW_DEVLOG_FACILITY_CHNET        = 0x34,
+        FW_DEVLOG_FACILITY_MAX          = 0x34,
 };
 
 /* log message format */
@@ -3139,4 +3142,36 @@ struct fw_devlog_cmd {
         (((x) >> FW_DEVLOG_CMD_MEMADDR16_DEVLOG_S) & \
          FW_DEVLOG_CMD_MEMADDR16_DEVLOG_M)
 
+/* P C I E   F W   P F 7   R E G I S T E R */
+
+/* PF7 stores the Firmware Device Log parameters which allows Host Drivers to
+ * access the "devlog" which needing to contact firmware.  The encoding is
+ * mostly the same as that returned by the DEVLOG command except for the size
+ * which is encoded as the number of entries in multiples-1 of 128 here rather
+ * than the memory size as is done in the DEVLOG command.  Thus, 0 means 128
+ * and 15 means 2048.  This of course in turn constrains the allowed values
+ * for the devlog size ...
+ */
+#define PCIE_FW_PF_DEVLOG               7
+
+#define PCIE_FW_PF_DEVLOG_NENTRIES128_S 28
+#define PCIE_FW_PF_DEVLOG_NENTRIES128_M 0xf
+#define PCIE_FW_PF_DEVLOG_NENTRIES128_V(x) \
+        ((x) << PCIE_FW_PF_DEVLOG_NENTRIES128_S)
+#define PCIE_FW_PF_DEVLOG_NENTRIES128_G(x) \
+        (((x) >> PCIE_FW_PF_DEVLOG_NENTRIES128_S) & \
+         PCIE_FW_PF_DEVLOG_NENTRIES128_M)
+
+#define PCIE_FW_PF_DEVLOG_ADDR16_S      4
+#define PCIE_FW_PF_DEVLOG_ADDR16_M      0xffffff
+#define PCIE_FW_PF_DEVLOG_ADDR16_V(x)   ((x) << PCIE_FW_PF_DEVLOG_ADDR16_S)
+#define PCIE_FW_PF_DEVLOG_ADDR16_G(x) \
+        (((x) >> PCIE_FW_PF_DEVLOG_ADDR16_S) & PCIE_FW_PF_DEVLOG_ADDR16_M)
+
+#define PCIE_FW_PF_DEVLOG_MEMTYPE_S     0
+#define PCIE_FW_PF_DEVLOG_MEMTYPE_M     0xf
+#define PCIE_FW_PF_DEVLOG_MEMTYPE_V(x)  ((x) << PCIE_FW_PF_DEVLOG_MEMTYPE_S)
+#define PCIE_FW_PF_DEVLOG_MEMTYPE_G(x) \
+        (((x) >> PCIE_FW_PF_DEVLOG_MEMTYPE_S) & PCIE_FW_PF_DEVLOG_MEMTYPE_M)
+
 #endif /* _T4FW_INTERFACE_H_ */
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h
index e2bd3f747858..b9d1cbac0eee 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h
@@ -36,13 +36,13 @@
 #define __T4FW_VERSION_H__
 
 #define T4FW_VERSION_MAJOR 0x01
-#define T4FW_VERSION_MINOR 0x0C
-#define T4FW_VERSION_MICRO 0x19
+#define T4FW_VERSION_MINOR 0x0D
+#define T4FW_VERSION_MICRO 0x20
 #define T4FW_VERSION_BUILD 0x00
 
 #define T5FW_VERSION_MAJOR 0x01
-#define T5FW_VERSION_MINOR 0x0C
-#define T5FW_VERSION_MICRO 0x19
+#define T5FW_VERSION_MINOR 0x0D
+#define T5FW_VERSION_MICRO 0x20
 #define T5FW_VERSION_BUILD 0x00
 
 #endif
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index 0545f0de1c52..e0d711071afb 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
@@ -1004,7 +1004,7 @@ static inline void ring_tx_db(struct adapter *adapter, struct sge_txq *tq,
                                               ? (tq->pidx - 1)
                                               : (tq->size - 1));
                         __be64 *src = (__be64 *)&tq->desc[index];
-                        __be64 __iomem *dst = (__be64 *)(tq->bar2_addr +
+                        __be64 __iomem *dst = (__be64 __iomem *)(tq->bar2_addr +
                                                          SGE_UDB_WCDOORBELL);
                         unsigned int count = EQ_UNIT / sizeof(__be64);
 
@@ -1018,7 +1018,11 @@ static inline void ring_tx_db(struct adapter *adapter, struct sge_txq *tq,
                          * DMA.
                          */
                         while (count) {
-                                writeq(*src, dst);
+                                /* the (__force u64) is because the compiler
+                                 * doesn't understand the endian swizzling
+                                 * going on
+                                 */
+                                writeq((__force u64)*src, dst);
                                 src++;
                                 dst++;
                                 count--;
@@ -1252,8 +1256,8 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
         BUG_ON(DIV_ROUND_UP(ETHTXQ_MAX_HDR, TXD_PER_EQ_UNIT) > 1);
         wr = (void *)&txq->q.desc[txq->q.pidx];
         wr->equiq_to_len16 = cpu_to_be32(wr_mid);
-        wr->r3[0] = cpu_to_be64(0);
-        wr->r3[1] = cpu_to_be64(0);
+        wr->r3[0] = cpu_to_be32(0);
+        wr->r3[1] = cpu_to_be32(0);
         skb_copy_from_linear_data(skb, (void *)wr->ethmacdst, fw_hdr_copy_len);
         end = (u64 *)wr + flits;
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
index 1b5506df35b1..280b4a215849 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
@@ -210,10 +210,10 @@ int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size,
 
                         if (rpl) {
                                 /* request bit in high-order BE word */
-                                WARN_ON((be32_to_cpu(*(const u32 *)cmd)
+                                WARN_ON((be32_to_cpu(*(const __be32 *)cmd)
                                          & FW_CMD_REQUEST_F) == 0);
                                 get_mbox_rpl(adapter, rpl, size, mbox_data);
-                                WARN_ON((be32_to_cpu(*(u32 *)rpl)
+                                WARN_ON((be32_to_cpu(*(__be32 *)rpl)
                                          & FW_CMD_REQUEST_F) != 0);
                         }
                         t4_write_reg(adapter, mbox_ctl,
@@ -484,7 +484,7 @@ int t4_bar2_sge_qregs(struct adapter *adapter,
          *  o The BAR2 Queue ID.
          *  o The BAR2 Queue ID Offset into the BAR2 page.
          */
-        bar2_page_offset = ((qid >> qpp_shift) << page_shift);
+        bar2_page_offset = ((u64)(qid >> qpp_shift) << page_shift);
         bar2_qid = qid & qpp_mask;
         bar2_qid_offset = bar2_qid * SGE_UDB_SIZE;
 
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 78e1ce09b1ab..f6a3a7abd468 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1954,6 +1954,7 @@ static int fec_enet_mii_init(struct platform_device *pdev)
         struct fec_enet_private *fep = netdev_priv(ndev);
         struct device_node *node;
         int err = -ENXIO, i;
+        u32 mii_speed, holdtime;
 
         /*
          * The i.MX28 dual fec interfaces are not equal.
@@ -1991,10 +1992,33 @@ static int fec_enet_mii_init(struct platform_device *pdev)
          * Reference Manual has an error on this, and gets fixed on i.MX6Q
          * document.
          */
-        fep->phy_speed = DIV_ROUND_UP(clk_get_rate(fep->clk_ipg), 5000000);
+        mii_speed = DIV_ROUND_UP(clk_get_rate(fep->clk_ipg), 5000000);
         if (fep->quirks & FEC_QUIRK_ENET_MAC)
-                fep->phy_speed--;
-        fep->phy_speed <<= 1;
+                mii_speed--;
+        if (mii_speed > 63) {
+                dev_err(&pdev->dev,
+                        "fec clock (%lu) to fast to get right mii speed\n",
+                        clk_get_rate(fep->clk_ipg));
+                err = -EINVAL;
+                goto err_out;
+        }
+
+        /*
+         * The i.MX28 and i.MX6 types have another filed in the MSCR (aka
+         * MII_SPEED) register that defines the MDIO output hold time. Earlier
+         * versions are RAZ there, so just ignore the difference and write the
+         * register always.
+         * The minimal hold time according to IEE802.3 (clause 22) is 10 ns.
+         * HOLDTIME + 1 is the number of clk cycles the fec is holding the
+         * output.
+         * The HOLDTIME bitfield takes values between 0 and 7 (inclusive).
+         * Given that ceil(clkrate / 5000000) <= 64, the calculation for
+         * holdtime cannot result in a value greater than 3.
+         */
+        holdtime = DIV_ROUND_UP(clk_get_rate(fep->clk_ipg), 100000000) - 1;
+
+        fep->phy_speed = mii_speed << 1 | holdtime << 8;
+
         writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
 
         fep->mii_bus = mdiobus_alloc();
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 357e8b576905..56b774d3a13d 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3893,6 +3893,9 @@ static int ucc_geth_probe(struct platform_device* ofdev)
         ugeth->phy_interface = phy_interface;
         ugeth->max_speed = max_speed;
 
+        /* Carrier starts down, phylib will bring it up */
+        netif_carrier_off(dev);
+
         err = register_netdev(dev);
         if (err) {
                 if (netif_msg_probe(ugeth))
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 96208f17bb53..2db653225a0e 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2658,16 +2658,11 @@ static int mvneta_stop(struct net_device *dev)
 static int mvneta_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
         struct mvneta_port *pp = netdev_priv(dev);
-        int ret;
 
         if (!pp->phy_dev)
                 return -ENOTSUPP;
 
-        ret = phy_mii_ioctl(pp->phy_dev, ifr, cmd);
-        if (!ret)
-                mvneta_adjust_link(dev);
-
-        return ret;
+        return phy_mii_ioctl(pp->phy_dev, ifr, cmd);
 }
 
 /* Ethtool methods */
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index a681d7c0bb9f..546ca4226916 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -724,7 +724,8 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
                  * on the host, we deprecate the error message for this
                  * specific command/input_mod/opcode_mod/fw-status to be debug.
                  */
-                if (op == MLX4_CMD_SET_PORT && in_modifier == 1 &&
+                if (op == MLX4_CMD_SET_PORT &&
+                    (in_modifier == 1 || in_modifier == 2) &&
                     op_modifier == 0 && context->fw_status == CMD_STAT_BAD_SIZE)
                         mlx4_dbg(dev, "command 0x%x failed: fw status = 0x%x\n",
                                  op, context->fw_status);
@@ -1993,7 +1994,6 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd,
                         goto reset_slave;
                 slave_state[slave].vhcr_dma = ((u64) param) << 48;
                 priv->mfunc.master.slave_state[slave].cookie = 0;
-                mutex_init(&priv->mfunc.master.gen_eqe_mutex[slave]);
                 break;
         case MLX4_COMM_CMD_VHCR1:
                 if (slave_state[slave].last_cmd != MLX4_COMM_CMD_VHCR0)
@@ -2225,6 +2225,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
                 for (i = 0; i < dev->num_slaves; ++i) {
                         s_state = &priv->mfunc.master.slave_state[i];
                         s_state->last_cmd = MLX4_COMM_CMD_RESET;
+                        mutex_init(&priv->mfunc.master.gen_eqe_mutex[i]);
                         for (j = 0; j < MLX4_EVENT_TYPES_NUM; ++j)
                                 s_state->event_eq[j].eqn = -1;
                         __raw_writel((__force u32) 0,
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index ebce5bb24df9..3485acf03014 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2805,13 +2805,6 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         netif_carrier_off(dev);
         mlx4_en_set_default_moderation(priv);
 
-        err = register_netdev(dev);
-        if (err) {
-                en_err(priv, "Netdev registration failed for port %d\n", port);
-                goto out;
-        }
-        priv->registered = 1;
-
         en_warn(priv, "Using %d TX rings\n", prof->tx_ring_num);
         en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
 
@@ -2853,6 +2846,14 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
 
         mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);
 
+        err = register_netdev(dev);
+        if (err) {
+                en_err(priv, "Netdev registration failed for port %d\n", port);
+                goto out;
+        }
+
+        priv->registered = 1;
+
         return 0;
 
 out:
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index 264bc15c1ff2..6e70ffee8e87 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -153,12 +153,10 @@ void mlx4_gen_slave_eqe(struct work_struct *work)
 
                 /* All active slaves need to receive the event */
                 if (slave == ALL_SLAVES) {
-                        for (i = 0; i < dev->num_slaves; i++) {
-                                if (i != dev->caps.function &&
-                                    master->slave_state[i].active)
-                                        if (mlx4_GEN_EQE(dev, i, eqe))
-                                                mlx4_warn(dev, "Failed to generate event for slave %d\n",
-                                                          i);
+                        for (i = 0; i <= dev->persist->num_vfs; i++) {
+                                if (mlx4_GEN_EQE(dev, i, eqe))
+                                        mlx4_warn(dev, "Failed to generate event for slave %d\n",
+                                                  i);
                         }
                 } else {
                         if (mlx4_GEN_EQE(dev, slave, eqe))
@@ -203,13 +201,11 @@ static void mlx4_slave_event(struct mlx4_dev *dev, int slave,
                              struct mlx4_eqe *eqe)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
-        struct mlx4_slave_state *s_slave =
-                &priv->mfunc.master.slave_state[slave];
 
-        if (!s_slave->active) {
-                /*mlx4_warn(dev, "Trying to pass event to inactive slave\n");*/
+        if (slave < 0 || slave > dev->persist->num_vfs ||
+            slave == dev->caps.function ||
+            !priv->mfunc.master.slave_state[slave].active)
                 return;
-        }
 
         slave_event(dev, slave, eqe);
 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index d97ca88c55b5..6e413ac4e940 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -3095,6 +3095,12 @@ int mlx4_GEN_EQE(struct mlx4_dev *dev, int slave, struct mlx4_eqe *eqe)
         if (!priv->mfunc.master.slave_state)
                 return -EINVAL;
 
+        /* check for slave valid, slave not PF, and slave active */
+        if (slave < 0 || slave > dev->persist->num_vfs ||
+            slave == dev->caps.function ||
+            !priv->mfunc.master.slave_state[slave].active)
+                return 0;
+
         event_eq = &priv->mfunc.master.slave_state[slave].event_eq[eqe->type];
 
         /* Create the event only if the slave is registered */
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 9fb6948e14c6..5cecec282aba 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4468,10 +4468,16 @@ static int rocker_port_master_changed(struct net_device *dev)
         struct net_device *master = netdev_master_upper_dev_get(dev);
         int err = 0;
 
+        /* There are currently three cases handled here:
+         * 1. Joining a bridge
+         * 2. Leaving a previously joined bridge
+         * 3. Other, e.g. being added to or removed from a bond or openvswitch,
+         *    in which case nothing is done
+         */
         if (master && master->rtnl_link_ops &&
             !strcmp(master->rtnl_link_ops->kind, "bridge"))
                 err = rocker_port_bridge_join(rocker_port, master);
-        else
+        else if (rocker_port_is_bridged(rocker_port))
                 err = rocker_port_bridge_leave(rocker_port);
 
         return err;
diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
index 924ea98bd531..54549a6223dd 100644
--- a/drivers/net/ipvlan/ipvlan.h
+++ b/drivers/net/ipvlan/ipvlan.h
@@ -114,7 +114,9 @@ unsigned int ipvlan_mac_hash(const unsigned char *addr);
 rx_handler_result_t ipvlan_handle_frame(struct sk_buff **pskb);
 int ipvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev);
 void ipvlan_ht_addr_add(struct ipvl_dev *ipvlan, struct ipvl_addr *addr);
-bool ipvlan_addr_busy(struct ipvl_dev *ipvlan, void *iaddr, bool is_v6);
+struct ipvl_addr *ipvlan_find_addr(const struct ipvl_dev *ipvlan,
+                                   const void *iaddr, bool is_v6);
+bool ipvlan_addr_busy(struct ipvl_port *port, void *iaddr, bool is_v6);
 struct ipvl_addr *ipvlan_ht_addr_lookup(const struct ipvl_port *port,
                                         const void *iaddr, bool is_v6);
 void ipvlan_ht_addr_del(struct ipvl_addr *addr, bool sync);
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
index 2a175006028b..b7877a194cfe 100644
--- a/drivers/net/ipvlan/ipvlan_core.c
+++ b/drivers/net/ipvlan/ipvlan_core.c
@@ -81,19 +81,20 @@ void ipvlan_ht_addr_add(struct ipvl_dev *ipvlan, struct ipvl_addr *addr)
         hash = (addr->atype == IPVL_IPV6) ?
                ipvlan_get_v6_hash(&addr->ip6addr) :
                ipvlan_get_v4_hash(&addr->ip4addr);
-        hlist_add_head_rcu(&addr->hlnode, &port->hlhead[hash]);
+        if (hlist_unhashed(&addr->hlnode))
+                hlist_add_head_rcu(&addr->hlnode, &port->hlhead[hash]);
 }
 
 void ipvlan_ht_addr_del(struct ipvl_addr *addr, bool sync)
 {
-        hlist_del_rcu(&addr->hlnode);
+        hlist_del_init_rcu(&addr->hlnode);
         if (sync)
                 synchronize_rcu();
 }
 
-bool ipvlan_addr_busy(struct ipvl_dev *ipvlan, void *iaddr, bool is_v6)
+struct ipvl_addr *ipvlan_find_addr(const struct ipvl_dev *ipvlan,
+                                   const void *iaddr, bool is_v6)
 {
-        struct ipvl_port *port = ipvlan->port;
         struct ipvl_addr *addr;
 
         list_for_each_entry(addr, &ipvlan->addrs, anode) {
@@ -101,12 +102,21 @@ bool ipvlan_addr_busy(struct ipvl_dev *ipvlan, void *iaddr, bool is_v6)
                     ipv6_addr_equal(&addr->ip6addr, iaddr)) ||
                     (!is_v6 && addr->atype == IPVL_IPV4 &&
                     addr->ip4addr.s_addr == ((struct in_addr *)iaddr)->s_addr))
-                        return true;
+                        return addr;
         }
+        return NULL;
+}
+
+bool ipvlan_addr_busy(struct ipvl_port *port, void *iaddr, bool is_v6)
+{
+        struct ipvl_dev *ipvlan;
 
-        if (ipvlan_ht_addr_lookup(port, iaddr, is_v6))
-                return true;
+        ASSERT_RTNL();
 
+        list_for_each_entry(ipvlan, &port->ipvlans, pnode) {
+                if (ipvlan_find_addr(ipvlan, iaddr, is_v6))
+                        return true;
+        }
         return false;
 }
 
@@ -192,7 +202,8 @@ static void ipvlan_multicast_frame(struct ipvl_port *port, struct sk_buff *skb,
         if (skb->protocol == htons(ETH_P_PAUSE))
                 return;
 
-        list_for_each_entry(ipvlan, &port->ipvlans, pnode) {
+        rcu_read_lock();
+        list_for_each_entry_rcu(ipvlan, &port->ipvlans, pnode) {
                 if (local && (ipvlan == in_dev))
                         continue;
 
@@ -219,6 +230,7 @@ static void ipvlan_multicast_frame(struct ipvl_port *port, struct sk_buff *skb,
 mcast_acct:
                 ipvlan_count_rx(ipvlan, len, ret == NET_RX_SUCCESS, true);
         }
+        rcu_read_unlock();
 
         /* Locally generated? ...Forward a copy to the main-device as
          * well. On the RX side we'll ignore it (wont give it to any
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 4f4099d5603d..4fa14208d799 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -505,7 +505,7 @@ static void ipvlan_link_delete(struct net_device *dev, struct list_head *head)
         if (ipvlan->ipv6cnt > 0 || ipvlan->ipv4cnt > 0) {
                 list_for_each_entry_safe(addr, next, &ipvlan->addrs, anode) {
                         ipvlan_ht_addr_del(addr, !dev->dismantle);
-                        list_del_rcu(&addr->anode);
+                        list_del(&addr->anode);
                 }
         }
         list_del_rcu(&ipvlan->pnode);
@@ -607,7 +607,7 @@ static int ipvlan_add_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)
 {
         struct ipvl_addr *addr;
 
-        if (ipvlan_addr_busy(ipvlan, ip6_addr, true)) {
+        if (ipvlan_addr_busy(ipvlan->port, ip6_addr, true)) {
                 netif_err(ipvlan, ifup, ipvlan->dev,
                           "Failed to add IPv6=%pI6c addr for %s intf\n",
                           ip6_addr, ipvlan->dev->name);
@@ -620,9 +620,13 @@ static int ipvlan_add_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)
         addr->master = ipvlan;
         memcpy(&addr->ip6addr, ip6_addr, sizeof(struct in6_addr));
         addr->atype = IPVL_IPV6;
-        list_add_tail_rcu(&addr->anode, &ipvlan->addrs);
+        list_add_tail(&addr->anode, &ipvlan->addrs);
         ipvlan->ipv6cnt++;
-        ipvlan_ht_addr_add(ipvlan, addr);
+        /* If the interface is not up, the address will be added to the hash
+         * list by ipvlan_open.
+         */
+        if (netif_running(ipvlan->dev))
+                ipvlan_ht_addr_add(ipvlan, addr);
 
         return 0;
 }
@@ -631,12 +635,12 @@ static void ipvlan_del_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)
 {
         struct ipvl_addr *addr;
 
-        addr = ipvlan_ht_addr_lookup(ipvlan->port, ip6_addr, true);
+        addr = ipvlan_find_addr(ipvlan, ip6_addr, true);
         if (!addr)
                 return;
 
         ipvlan_ht_addr_del(addr, true);
-        list_del_rcu(&addr->anode);
+        list_del(&addr->anode);
         ipvlan->ipv6cnt--;
         WARN_ON(ipvlan->ipv6cnt < 0);
         kfree_rcu(addr, rcu);
@@ -675,7 +679,7 @@ static int ipvlan_add_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr)
 {
         struct ipvl_addr *addr;
 
-        if (ipvlan_addr_busy(ipvlan, ip4_addr, false)) {
+        if (ipvlan_addr_busy(ipvlan->port, ip4_addr, false)) {
                 netif_err(ipvlan, ifup, ipvlan->dev,
                           "Failed to add IPv4=%pI4 on %s intf.\n",
                           ip4_addr, ipvlan->dev->name);
@@ -688,9 +692,13 @@ static int ipvlan_add_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr)
         addr->master = ipvlan;
         memcpy(&addr->ip4addr, ip4_addr, sizeof(struct in_addr));
         addr->atype = IPVL_IPV4;
-        list_add_tail_rcu(&addr->anode, &ipvlan->addrs);
+        list_add_tail(&addr->anode, &ipvlan->addrs);
         ipvlan->ipv4cnt++;
-        ipvlan_ht_addr_add(ipvlan, addr);
+        /* If the interface is not up, the address will be added to the hash
+         * list by ipvlan_open.
+         */
+        if (netif_running(ipvlan->dev))
+                ipvlan_ht_addr_add(ipvlan, addr);
         ipvlan_set_broadcast_mac_filter(ipvlan, true);
 
         return 0;
@@ -700,12 +708,12 @@ static void ipvlan_del_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr)
 {
         struct ipvl_addr *addr;
 
-        addr = ipvlan_ht_addr_lookup(ipvlan->port, ip4_addr, false);
+        addr = ipvlan_find_addr(ipvlan, ip4_addr, false);
         if (!addr)
                 return;
 
         ipvlan_ht_addr_del(addr, true);
-        list_del_rcu(&addr->anode);
+        list_del(&addr->anode);
         ipvlan->ipv4cnt--;
         WARN_ON(ipvlan->ipv4cnt < 0);
         if (!ipvlan->ipv4cnt)
diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index 5c55f11572ba..75d6f26729a3 100644
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -188,6 +188,8 @@ struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
                 memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
                 skb_put(skb, sizeof(padbytes));
         }
+
+        usbnet_set_skb_tx_stats(skb, 1, 0);
         return skb;
 }
 
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 9311a08565be..4545e78840b0 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -522,6 +522,7 @@ static const struct driver_info wwan_info = {
 #define DELL_VENDOR_ID          0x413C
 #define REALTEK_VENDOR_ID       0x0bda
 #define SAMSUNG_VENDOR_ID       0x04e8
+#define LENOVO_VENDOR_ID        0x17ef
 
 static const struct usb_device_id       products[] = {
 /* BLACKLIST !!
@@ -702,6 +703,13 @@ static const struct usb_device_id	products[] = {
         .driver_info = 0,
 },
 
+/* Lenovo Thinkpad USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */
+{
+        USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x7205, USB_CLASS_COMM,
+                        USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
+        .driver_info = 0,
+},
+
 /* WHITELIST!!!
  *
  * CDC Ether uses two interfaces, not necessarily consecutive.
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 80a844e0ae03..c3e4da9e79ca 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1172,17 +1172,17 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign)
 
         /* return skb */
         ctx->tx_curr_skb = NULL;
-        dev->net->stats.tx_packets += ctx->tx_curr_frame_num;
 
         /* keep private stats: framing overhead and number of NTBs */
         ctx->tx_overhead += skb_out->len - ctx->tx_curr_frame_payload;
         ctx->tx_ntbs++;
 
-        /* usbnet has already counted all the framing overhead.
+        /* usbnet will count all the framing overhead by default.
          * Adjust the stats so that the tx_bytes counter show real
          * payload data instead.
          */
-        dev->net->stats.tx_bytes -= skb_out->len - ctx->tx_curr_frame_payload;
+        usbnet_set_skb_tx_stats(skb_out, n,
+                                ctx->tx_curr_frame_payload - skb_out->len);
 
         return skb_out;
 
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 438fc6bcaef1..9f7c0ab3b349 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -492,6 +492,7 @@ enum rtl8152_flags {
 /* Define these values to match your device */
 #define VENDOR_ID_REALTEK               0x0bda
 #define VENDOR_ID_SAMSUNG               0x04e8
+#define VENDOR_ID_LENOVO                0x17ef
 
 #define MCU_TYPE_PLA                    0x0100
 #define MCU_TYPE_USB                    0x0000
@@ -4037,6 +4038,7 @@ static struct usb_device_id rtl8152_table[] = {
         {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8152)},
         {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
         {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
+        {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO,  0x7205)},
         {}
 };
 
diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c
index b94a0fbb8b3b..953de13267df 100644
--- a/drivers/net/usb/sr9800.c
+++ b/drivers/net/usb/sr9800.c
@@ -144,6 +144,7 @@ static struct sk_buff *sr_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
                 skb_put(skb, sizeof(padbytes));
         }
 
+        usbnet_set_skb_tx_stats(skb, 1, 0);
         return skb;
 }
 
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 449835f4331e..777757ae1973 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1188,8 +1188,7 @@ static void tx_complete (struct urb *urb)
         struct usbnet           *dev = entry->dev;
 
         if (urb->status == 0) {
-                if (!(dev->driver_info->flags & FLAG_MULTI_PACKET))
-                        dev->net->stats.tx_packets++;
+                dev->net->stats.tx_packets += entry->packets;
                 dev->net->stats.tx_bytes += entry->length;
         } else {
                 dev->net->stats.tx_errors++;
@@ -1347,7 +1346,19 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
                 } else
                         urb->transfer_flags |= URB_ZERO_PACKET;
         }
-        entry->length = urb->transfer_buffer_length = length;
+        urb->transfer_buffer_length = length;
+
+        if (info->flags & FLAG_MULTI_PACKET) {
+                /* Driver has set number of packets and a length delta.
+                 * Calculate the complete length and ensure that it's
+                 * positive.
+                 */
+                entry->length += length;
+                if (WARN_ON_ONCE(entry->length <= 0))
+                        entry->length = length;
+        } else {
+                usbnet_set_skb_tx_stats(skb, 1, length);
+        }
 
         spin_lock_irqsave(&dev->txq.lock, flags);
         retval = usb_autopm_get_interface_async(dev->intf);
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index cb366adc820b..f50a6bc5d06e 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -219,12 +219,15 @@ void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_vif *avp = (void *)vif->drv_priv;
         struct ath_buf *bf = avp->av_bcbuf;
+        struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;
 
         ath_dbg(common, CONFIG, "Removing interface at beacon slot: %d\n",
                 avp->av_bslot);
 
         tasklet_disable(&sc->bcon_tasklet);
 
+        cur_conf->enable_beacon &= ~BIT(avp->av_bslot);
+
         if (bf && bf->bf_mpdu) {
                 struct sk_buff *skb = bf->bf_mpdu;
                 dma_unmap_single(sc->dev, bf->bf_buf_addr,
@@ -521,8 +524,7 @@ static bool ath9k_allow_beacon_config(struct ath_softc *sc,
         }
 
         if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
-                if ((vif->type != NL80211_IFTYPE_AP) ||
-                    (sc->nbcnvifs > 1)) {
+                if (vif->type != NL80211_IFTYPE_AP) {
                         ath_dbg(common, CONFIG,
                                 "An AP interface is already present !\n");
                         return false;
@@ -616,12 +618,14 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
          * enabling/disabling SWBA.
          */
         if (changed & BSS_CHANGED_BEACON_ENABLED) {
-                if (!bss_conf->enable_beacon &&
-                    (sc->nbcnvifs <= 1)) {
-                        cur_conf->enable_beacon = false;
-                } else if (bss_conf->enable_beacon) {
-                        cur_conf->enable_beacon = true;
-                        ath9k_cache_beacon_config(sc, ctx, bss_conf);
+                bool enabled = cur_conf->enable_beacon;
+
+                if (!bss_conf->enable_beacon) {
+                        cur_conf->enable_beacon &= ~BIT(avp->av_bslot);
+                } else {
+                        cur_conf->enable_beacon |= BIT(avp->av_bslot);
+                        if (!enabled)
+                                ath9k_cache_beacon_config(sc, ctx, bss_conf);
                 }
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h
index 2b79a568e803..d23737342f4f 100644
--- a/drivers/net/wireless/ath/ath9k/common.h
+++ b/drivers/net/wireless/ath/ath9k/common.h
@@ -54,7 +54,7 @@ struct ath_beacon_config {
         u16 dtim_period;
         u16 bmiss_timeout;
         u8 dtim_count;
-        bool enable_beacon;
+        u8 enable_beacon;
         bool ibss_creator;
         u32 nexttbtt;
         u32 intval;
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 60aa8d71e753..8529014e1a5e 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -424,7 +424,7 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah)
         ah->power_mode = ATH9K_PM_UNDEFINED;
         ah->htc_reset_init = true;
 
-        ah->tpc_enabled = true;
+        ah->tpc_enabled = false;
 
         ah->ani_function = ATH9K_ANI_ALL;
         if (!AR_SREV_9300_20_OR_LATER(ah))
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/brcm80211/brcmfmac/feature.c
index defb7a44e0bc..7748a1ccf14f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/feature.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.c
@@ -126,7 +126,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
         brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MCHAN, "mchan");
         if (drvr->bus_if->wowl_supported)
                 brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_WOWL, "wowl");
-        brcmf_feat_iovar_int_set(ifp, BRCMF_FEAT_MBSS, "mbss", 0);
+        if (drvr->bus_if->chip != BRCM_CC_43362_CHIP_ID)
+                brcmf_feat_iovar_int_set(ifp, BRCMF_FEAT_MBSS, "mbss", 0);
 
         /* set chip related quirks */
         switch (drvr->bus_if->chip) {
diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h
index a6f22c32a279..3811878ab9cd 100644
--- a/drivers/net/wireless/iwlwifi/dvm/dev.h
+++ b/drivers/net/wireless/iwlwifi/dvm/dev.h
@@ -708,7 +708,6 @@ struct iwl_priv {
         unsigned long reload_jiffies;
         int reload_count;
         bool ucode_loaded;
-        bool init_ucode_run;            /* Don't run init uCode again */
 
         u8 plcp_delta_threshold;
 
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 47e64e8b9517..cceb026e0793 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -1114,16 +1114,17 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         scd_queues &= ~(BIT(IWL_IPAN_CMD_QUEUE_NUM) |
                         BIT(IWL_DEFAULT_CMD_QUEUE_NUM));
 
-        if (vif)
-                scd_queues &= ~BIT(vif->hw_queue[IEEE80211_AC_VO]);
-
-        IWL_DEBUG_TX_QUEUES(priv, "Flushing SCD queues: 0x%x\n", scd_queues);
-        if (iwlagn_txfifo_flush(priv, scd_queues)) {
-                IWL_ERR(priv, "flush request fail\n");
-                goto done;
+        if (drop) {
+                IWL_DEBUG_TX_QUEUES(priv, "Flushing SCD queues: 0x%x\n",
+                                    scd_queues);
+                if (iwlagn_txfifo_flush(priv, scd_queues)) {
+                        IWL_ERR(priv, "flush request fail\n");
+                        goto done;
+                }
         }
+
         IWL_DEBUG_TX_QUEUES(priv, "wait transmit/flush all frames\n");
-        iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);
+        iwl_trans_wait_tx_queue_empty(priv->trans, scd_queues);
 done:
         mutex_unlock(&priv->mutex);
         IWL_DEBUG_MAC80211(priv, "leave\n");
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c
index 4dbef7e58c2e..5244e43bfafb 100644
--- a/drivers/net/wireless/iwlwifi/dvm/ucode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c
@@ -418,9 +418,6 @@ int iwl_run_init_ucode(struct iwl_priv *priv)
         if (!priv->fw->img[IWL_UCODE_INIT].sec[0].len)
                 return 0;
 
-        if (priv->init_ucode_run)
-                return 0;
-
         iwl_init_notification_wait(&priv->notif_wait, &calib_wait,
                                    calib_complete, ARRAY_SIZE(calib_complete),
                                    iwlagn_wait_calib, priv);
@@ -440,8 +437,6 @@ int iwl_run_init_ucode(struct iwl_priv *priv)
          */
         ret = iwl_wait_notification(&priv->notif_wait, &calib_wait,
                                         UCODE_CALIB_TIMEOUT);
-        if (!ret)
-                priv->init_ucode_run = true;
 
         goto out;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 996e7f16adf9..c7154ac42c8c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -1257,6 +1257,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
                                 op->name, err);
 #endif
         }
+        kfree(pieces);
         return;
 
  try_again:
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index efa9688a4cf1..078f24cf4af3 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -1278,6 +1278,9 @@ static void rs_mac80211_tx_status(void *mvm_r,
         struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
 
+        if (!iwl_mvm_sta_from_mac80211(sta)->vif)
+                return;
+
         if (!ieee80211_is_data(hdr->frame_control) ||
             info->flags & IEEE80211_TX_CTL_NO_ACK)
                 return;
@@ -2511,6 +2514,14 @@ static void rs_get_rate(void *mvm_r, struct ieee80211_sta *sta, void *mvm_sta,
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct iwl_lq_sta *lq_sta = mvm_sta;
 
+        if (sta && !iwl_mvm_sta_from_mac80211(sta)->vif) {
+                /* if vif isn't initialized mvm doesn't know about
+                 * this station, so don't do anything with the it
+                 */
+                sta = NULL;
+                mvm_sta = NULL;
+        }
+
         /* TODO: handle rate_idx_mask and rate_idx_mcs_mask */
 
         /* Treat uninitialized rate scaling data same as non-existing. */
@@ -2827,6 +2838,9 @@ static void rs_rate_update(void *mvm_r,
                         (struct iwl_op_mode *)mvm_r;
         struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
 
+        if (!iwl_mvm_sta_from_mac80211(sta)->vif)
+                return;
+
         /* Stop any ongoing aggregations as rs starts off assuming no agg */
         for (tid = 0; tid < IWL_MAX_TID_COUNT; tid++)
                 ieee80211_stop_tx_ba_session(sta, tid);
@@ -3587,9 +3601,15 @@ static ssize_t iwl_dbgfs_ss_force_write(struct iwl_lq_sta *lq_sta, char *buf,
 
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(ss_force, 32);
 
-static void rs_add_debugfs(void *mvm, void *mvm_sta, struct dentry *dir)
+static void rs_add_debugfs(void *mvm, void *priv_sta, struct dentry *dir)
 {
-        struct iwl_lq_sta *lq_sta = mvm_sta;
+        struct iwl_lq_sta *lq_sta = priv_sta;
+        struct iwl_mvm_sta *mvmsta;
+
+        mvmsta = container_of(lq_sta, struct iwl_mvm_sta, lq_sta);
+
+        if (!mvmsta->vif)
+                return;
 
         debugfs_create_file("rate_scale_table", S_IRUSR | S_IWUSR, dir,
                             lq_sta, &rs_sta_dbgfs_scale_table_ops);
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c
index f8d6f306dd76..4b81c0bf63b0 100644
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@ -197,6 +197,8 @@ iwl_mvm_te_handle_notify_csa(struct iwl_mvm *mvm,
                              struct iwl_time_event_notif *notif)
 {
         if (!le32_to_cpu(notif->status)) {
+                if (te_data->vif->type == NL80211_IFTYPE_STATION)
+                        ieee80211_connection_loss(te_data->vif);
                 IWL_DEBUG_TE(mvm, "CSA time event failed to start\n");
                 iwl_mvm_te_clear_data(mvm, te_data);
                 return;
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
index 07304e1fd64a..96a05406babf 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@ -949,8 +949,10 @@ int iwl_mvm_rx_ba_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb,
         mvmsta = iwl_mvm_sta_from_mac80211(sta);
         tid_data = &mvmsta->tid_data[tid];
 
-        if (WARN_ONCE(tid_data->txq_id != scd_flow, "Q %d, tid %d, flow %d",
-                      tid_data->txq_id, tid, scd_flow)) {
+        if (tid_data->txq_id != scd_flow) {
+                IWL_ERR(mvm,
+                        "invalid BA notification: Q %d, tid %d, flow %d\n",
+                        tid_data->txq_id, tid, scd_flow);
                 rcu_read_unlock();
                 return 0;
         }
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index dbd6bcf52205..686dd301cd53 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -368,10 +368,12 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
 /* 3165 Series */
         {IWL_PCI_DEVICE(0x3165, 0x4010, iwl3165_2ac_cfg)},
         {IWL_PCI_DEVICE(0x3165, 0x4012, iwl3165_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x3165, 0x4110, iwl3165_2ac_cfg)},
-        {IWL_PCI_DEVICE(0x3165, 0x4210, iwl3165_2ac_cfg)},
         {IWL_PCI_DEVICE(0x3165, 0x4410, iwl3165_2ac_cfg)},
         {IWL_PCI_DEVICE(0x3165, 0x4510, iwl3165_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x3165, 0x4110, iwl3165_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x3166, 0x4310, iwl3165_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x3166, 0x4210, iwl3165_2ac_cfg)},
+        {IWL_PCI_DEVICE(0x3165, 0x8010, iwl3165_2ac_cfg)},
 
 /* 7265 Series */
         {IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index a62170ea0481..8c45cf44ce24 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1124,12 +1124,22 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
         /*This is for new trx flow*/
         struct rtl_tx_buffer_desc *pbuffer_desc = NULL;
         u8 temp_one = 1;
+        u8 *entry;
 
         memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
         ring = &rtlpci->tx_ring[BEACON_QUEUE];
         pskb = __skb_dequeue(&ring->queue);
-        if (pskb)
+        if (rtlpriv->use_new_trx_flow)
+                entry = (u8 *)(&ring->buffer_desc[ring->idx]);
+        else
+                entry = (u8 *)(&ring->desc[ring->idx]);
+        if (pskb) {
+                pci_unmap_single(rtlpci->pdev,
+                                 rtlpriv->cfg->ops->get_desc(
+                                 (u8 *)entry, true, HW_DESC_TXBUFF_ADDR),
+                                 pskb->len, PCI_DMA_TODEVICE);
                 kfree_skb(pskb);
+        }
 
         /*NB: the beacon data buffer must be 32-bit aligned. */
         pskb = ieee80211_beacon_get(hw, mac->vif);
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index e9b960f0ff32..720aaf6313d2 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1008,8 +1008,7 @@ err:
 
 static int xennet_change_mtu(struct net_device *dev, int mtu)
 {
-        int max = xennet_can_sg(dev) ?
-                XEN_NETIF_MAX_TX_SIZE - MAX_TCP_HEADER : ETH_DATA_LEN;
+        int max = xennet_can_sg(dev) ? XEN_NETIF_MAX_TX_SIZE : ETH_DATA_LEN;
 
         if (mtu > max)
                 return -EINVAL;
@@ -1279,8 +1278,6 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
         netdev->ethtool_ops = &xennet_ethtool_ops;
         SET_NETDEV_DEV(netdev, &dev->dev);
 
-        netif_set_gso_max_size(netdev, XEN_NETIF_MAX_TX_SIZE - MAX_TCP_HEADER);
-
         np->netdev = netdev;
 
         netif_carrier_off(netdev);
diff --git a/drivers/of/address.c b/drivers/of/address.c
index ad2906919d45..78a7dcbec7d8 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -450,12 +450,17 @@ static struct of_bus *of_match_bus(struct device_node *np)
         return NULL;
 }
 
-static int of_empty_ranges_quirk(void)
+static int of_empty_ranges_quirk(struct device_node *np)
 {
         if (IS_ENABLED(CONFIG_PPC)) {
-                /* To save cycles, we cache the result */
+                /* To save cycles, we cache the result for global "Mac" setting */
                 static int quirk_state = -1;
 
+                /* PA-SEMI sdc DT bug */
+                if (of_device_is_compatible(np, "1682m-sdc"))
+                        return true;
+
+                /* Make quirk cached */
                 if (quirk_state < 0)
                         quirk_state =
                                 of_machine_is_compatible("Power Macintosh") ||
@@ -490,7 +495,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
          * This code is only enabled on powerpc. --gcl
          */
         ranges = of_get_property(parent, rprop, &rlen);
-        if (ranges == NULL && !of_empty_ranges_quirk()) {
+        if (ranges == NULL && !of_empty_ranges_quirk(parent)) {
                 pr_debug("OF: no ranges; cannot translate\n");
                 return 1;
         }
diff --git a/drivers/regulator/devres.c b/drivers/regulator/devres.c
index 8f785bc9e510..6ec1d400adae 100644
--- a/drivers/regulator/devres.c
+++ b/drivers/regulator/devres.c
@@ -413,3 +413,88 @@ void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
                 devm_regulator_unregister_supply_alias(dev, id[i]);
 }
 EXPORT_SYMBOL_GPL(devm_regulator_bulk_unregister_supply_alias);
+
+struct regulator_notifier_match {
+        struct regulator *regulator;
+        struct notifier_block *nb;
+};
+
+static int devm_regulator_match_notifier(struct device *dev, void *res,
+                                         void *data)
+{
+        struct regulator_notifier_match *match = res;
+        struct regulator_notifier_match *target = data;
+
+        return match->regulator == target->regulator && match->nb == target->nb;
+}
+
+static void devm_regulator_destroy_notifier(struct device *dev, void *res)
+{
+        struct regulator_notifier_match *match = res;
+
+        regulator_unregister_notifier(match->regulator, match->nb);
+}
+
+/**
+ * devm_regulator_register_notifier - Resource managed
+ * regulator_register_notifier
+ *
+ * @regulator: regulator source
+ * @nb: notifier block
+ *
+ * The notifier will be registers under the consumer device and be
+ * automatically be unregistered when the source device is unbound.
+ */
+int devm_regulator_register_notifier(struct regulator *regulator,
+                                     struct notifier_block *nb)
+{
+        struct regulator_notifier_match *match;
+        int ret;
+
+        match = devres_alloc(devm_regulator_destroy_notifier,
+                             sizeof(struct regulator_notifier_match),
+                             GFP_KERNEL);
+        if (!match)
+                return -ENOMEM;
+
+        match->regulator = regulator;
+        match->nb = nb;
+
+        ret = regulator_register_notifier(regulator, nb);
+        if (ret < 0) {
+                devres_free(match);
+                return ret;
+        }
+
+        devres_add(regulator->dev, match);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(devm_regulator_register_notifier);
+
+/**
+ * devm_regulator_unregister_notifier - Resource managed
+ * regulator_unregister_notifier()
+ *
+ * @regulator: regulator source
+ * @nb: notifier block
+ *
+ * Unregister a notifier registered with devm_regulator_register_notifier().
+ * Normally this function will not need to be called and the resource
+ * management code will ensure that the resource is freed.
+ */
+void devm_regulator_unregister_notifier(struct regulator *regulator,
+                                        struct notifier_block *nb)
+{
+        struct regulator_notifier_match match;
+        int rc;
+
+        match.regulator = regulator;
+        match.nb = nb;
+
+        rc = devres_release(regulator->dev, devm_regulator_destroy_notifier,
+                            devm_regulator_match_notifier, &match);
+        if (rc != 0)
+                WARN_ON(rc);
+}
+EXPORT_SYMBOL_GPL(devm_regulator_unregister_notifier);
diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig
index 24183028bd71..6d5b38d69578 100644
--- a/drivers/staging/iio/Kconfig
+++ b/drivers/staging/iio/Kconfig
@@ -38,6 +38,7 @@ config IIO_SIMPLE_DUMMY_EVENTS
 config IIO_SIMPLE_DUMMY_BUFFER
         bool "Buffered capture support"
         select IIO_BUFFER
+        select IIO_TRIGGER
         select IIO_KFIFO_BUF
         help
           Add buffered data capture to the simple dummy driver.
diff --git a/drivers/staging/iio/magnetometer/hmc5843_core.c b/drivers/staging/iio/magnetometer/hmc5843_core.c
index fd171d8b38fb..90cc18b703cf 100644
--- a/drivers/staging/iio/magnetometer/hmc5843_core.c
+++ b/drivers/staging/iio/magnetometer/hmc5843_core.c
@@ -592,6 +592,7 @@ int hmc5843_common_probe(struct device *dev, struct regmap *regmap,
         mutex_init(&data->lock);
 
         indio_dev->dev.parent = dev;
+        indio_dev->name = dev->driver->name;
         indio_dev->info = &hmc5843_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
         indio_dev->channels = data->variant->channels;
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index b1893f3f88f1..3ad1458bfeb0 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -921,6 +921,9 @@ static void lpuart_setup_watermark(struct lpuart_port *sport)
         writeb(val | UARTPFIFO_TXFE | UARTPFIFO_RXFE,
                         sport->port.membase + UARTPFIFO);
 
+        /* explicitly clear RDRF */
+        readb(sport->port.membase + UARTSR1);
+
         /* flush Tx and Rx FIFO */
         writeb(UARTCFIFO_TXFLUSH | UARTCFIFO_RXFLUSH,
                         sport->port.membase + UARTCFIFO);
@@ -1076,6 +1079,8 @@ static int lpuart_startup(struct uart_port *port)
         sport->txfifo_size = 0x1 << (((temp >> UARTPFIFO_TXSIZE_OFF) &
                 UARTPFIFO_FIFOSIZE_MASK) + 1);
 
+        sport->port.fifosize = sport->txfifo_size;
+
         sport->rxfifo_size = 0x1 << (((temp >> UARTPFIFO_RXSIZE_OFF) &
                 UARTPFIFO_FIFOSIZE_MASK) + 1);
 
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index af821a908720..cf08876922f1 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -963,6 +963,7 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
                         free_irq(ourport->tx_irq, ourport);
                 tx_enabled(port) = 0;
                 ourport->tx_claimed = 0;
+                ourport->tx_mode = 0;
         }
 
         if (ourport->rx_claimed) {
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index a7865c4b0498..0827d7c96527 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -387,6 +387,10 @@ static void xhci_clear_port_change_bit(struct xhci_hcd *xhci, u16 wValue,
                 status = PORT_PLC;
                 port_change_bit = "link state";
                 break;
+        case USB_PORT_FEAT_C_PORT_CONFIG_ERROR:
+                status = PORT_CEC;
+                port_change_bit = "config error";
+                break;
         default:
                 /* Should never happen */
                 return;
@@ -588,6 +592,8 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
                         status |= USB_PORT_STAT_C_LINK_STATE << 16;
                 if ((raw_port_status & PORT_WRC))
                         status |= USB_PORT_STAT_C_BH_RESET << 16;
+                if ((raw_port_status & PORT_CEC))
+                        status |= USB_PORT_STAT_C_CONFIG_ERROR << 16;
         }
 
         if (hcd->speed != HCD_USB3) {
@@ -1005,6 +1011,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 case USB_PORT_FEAT_C_OVER_CURRENT:
                 case USB_PORT_FEAT_C_ENABLE:
                 case USB_PORT_FEAT_C_PORT_LINK_STATE:
+                case USB_PORT_FEAT_C_PORT_CONFIG_ERROR:
                         xhci_clear_port_change_bit(xhci, wValue, wIndex,
                                         port_array[wIndex], temp);
                         break;
@@ -1069,7 +1076,7 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
          */
         status = bus_state->resuming_ports;
 
-        mask = PORT_CSC | PORT_PEC | PORT_OCC | PORT_PLC | PORT_WRC;
+        mask = PORT_CSC | PORT_PEC | PORT_OCC | PORT_PLC | PORT_WRC | PORT_CEC;
 
         spin_lock_irqsave(&xhci->lock, flags);
         /* For each port, did anything change?  If so, set that bit in buf. */
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index fd53c9ebd662..2af32e26fafc 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -115,6 +115,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
         if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
                 xhci->quirks |= XHCI_LPM_SUPPORT;
                 xhci->quirks |= XHCI_INTEL_HOST;
+                xhci->quirks |= XHCI_AVOID_BEI;
         }
         if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
                         pdev->device == PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI) {
@@ -130,7 +131,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
                  * PPT chipsets.
                  */
                 xhci->quirks |= XHCI_SPURIOUS_REBOOT;
-                xhci->quirks |= XHCI_AVOID_BEI;
         }
         if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
                 pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI) {
diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
index f32c292cc868..3fc4fe770253 100644
--- a/drivers/usb/isp1760/isp1760-udc.c
+++ b/drivers/usb/isp1760/isp1760-udc.c
@@ -1203,7 +1203,7 @@ static int isp1760_udc_start(struct usb_gadget *gadget,
 
         if (udc->driver) {
                 dev_err(udc->isp->dev, "UDC already has a gadget driver\n");
-                spin_unlock(&udc->lock);
+                spin_unlock_irqrestore(&udc->lock, flags);
                 return -EBUSY;
         }
 
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 3086dec0ef53..8eb68a31cab6 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -604,6 +604,7 @@ static const struct usb_device_id id_table_combined[] = {
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+        { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) },
         /*
          * ELV devices:
          */
@@ -1883,8 +1884,12 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
 {
         struct usb_device *udev = serial->dev;
 
-        if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ||
-            (udev->product && !strcmp(udev->product, "BeagleBone/XDS100V2")))
+        if (udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems"))
+                return ftdi_jtag_probe(serial);
+
+        if (udev->product &&
+                (!strcmp(udev->product, "BeagleBone/XDS100V2") ||
+                 !strcmp(udev->product, "SNAP Connect E10")))
                 return ftdi_jtag_probe(serial);
 
         return 0;
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 56b1b55c4751..4e4f46f3c89c 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -561,6 +561,12 @@
  */
 #define FTDI_NT_ORIONLXM_PID    0x7c90  /* OrionLXm Substation Automation Platform */
 
+/*
+ * Synapse Wireless product ids (FTDI_VID)
+ * http://www.synapse-wireless.com
+ */
+#define FTDI_SYNAPSE_SS200_PID 0x9090 /* SS200 - SNAP Stick 200 */
+
 
 /********************************/
 /** third-party VID/PID combos **/
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index dd97d8b572c3..4f7e072e4e00 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -61,6 +61,7 @@ struct keyspan_pda_private {
 /* For Xircom PGSDB9 and older Entrega version of the same device */
 #define XIRCOM_VENDOR_ID                0x085a
 #define XIRCOM_FAKE_ID                  0x8027
+#define XIRCOM_FAKE_ID_2                0x8025 /* "PGMFHUB" serial */
 #define ENTREGA_VENDOR_ID               0x1645
 #define ENTREGA_FAKE_ID                 0x8093
 
@@ -70,6 +71,7 @@ static const struct usb_device_id id_table_combined[] = {
 #endif
 #ifdef XIRCOM
         { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
+        { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID_2) },
         { USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },
 #endif
         { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) },
@@ -93,6 +95,7 @@ static const struct usb_device_id id_table_fake[] = {
 #ifdef XIRCOM
 static const struct usb_device_id id_table_fake_xircom[] = {
         { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
+        { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID_2) },
         { USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },
         { }
 };
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index b812462083fc..94d96809e686 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -55,6 +55,23 @@ config XEN_BALLOON_MEMORY_HOTPLUG
 
           In that case step 3 should be omitted.
 
+config XEN_BALLOON_MEMORY_HOTPLUG_LIMIT
+        int "Hotplugged memory limit (in GiB) for a PV guest"
+        default 512 if X86_64
+        default 4 if X86_32
+        range 0 64 if X86_32
+        depends on XEN_HAVE_PVMMU
+        depends on XEN_BALLOON_MEMORY_HOTPLUG
+        help
+          Maxmium amount of memory (in GiB) that a PV guest can be
+          expanded to when using memory hotplug.
+
+          A PV guest can have more memory than this limit if is
+          started with a larger maximum.
+
+          This value is used to allocate enough space in internal
+          tables needed for physical memory administration.
+
 config XEN_SCRUB_PAGES
         bool "Scrub pages before returning them to system"
         depends on XEN_BALLOON
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 0b52d92cb2e5..fd933695f232 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -229,6 +229,29 @@ static enum bp_state reserve_additional_memory(long credit)
         balloon_hotplug = round_up(balloon_hotplug, PAGES_PER_SECTION);
         nid = memory_add_physaddr_to_nid(hotplug_start_paddr);
 
+#ifdef CONFIG_XEN_HAVE_PVMMU
+        /*
+         * add_memory() will build page tables for the new memory so
+         * the p2m must contain invalid entries so the correct
+         * non-present PTEs will be written.
+         *
+         * If a failure occurs, the original (identity) p2m entries
+         * are not restored since this region is now known not to
+         * conflict with any devices.
+         */ 
+        if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+                unsigned long pfn, i;
+
+                pfn = PFN_DOWN(hotplug_start_paddr);
+                for (i = 0; i < balloon_hotplug; i++) {
+                        if (!set_phys_to_machine(pfn + i, INVALID_P2M_ENTRY)) {
+                                pr_warn("set_phys_to_machine() failed, no memory added\n");
+                                return BP_ECANCELED;
+                        }
+                }
+        }
+#endif
+
         rc = add_memory(nid, hotplug_start_paddr, balloon_hotplug << PAGE_SHIFT);
 
         if (rc) {
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
index 4ac7445e6ec7..aa0dc2573374 100644
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/cifs/cifsencrypt.c
@@ -1,6 +1,9 @@
 /*
  *   fs/cifs/cifsencrypt.c
  *
+ *   Encryption and hashing operations relating to NTLM, NTLMv2.  See MS-NLMP
+ *   for more detailed information
+ *
  *   Copyright (C) International Business Machines  Corp., 2005,2013
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
@@ -515,7 +518,8 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
                                  __func__);
                         return rc;
                 }
-        } else if (ses->serverName) {
+        } else {
+                /* We use ses->serverName if no domain name available */
                 len = strlen(ses->serverName);
 
                 server = kmalloc(2 + (len * 2), GFP_KERNEL);
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index d3aa999ab785..480cf9c81d50 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1599,6 +1599,8 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                                 pr_warn("CIFS: username too long\n");
                                 goto cifs_parse_mount_err;
                         }
+
+                        kfree(vol->username);
                         vol->username = kstrdup(string, GFP_KERNEL);
                         if (!vol->username)
                                 goto cifs_parse_mount_err;
@@ -1700,6 +1702,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                                 goto cifs_parse_mount_err;
                         }
 
+                        kfree(vol->domainname);
                         vol->domainname = kstrdup(string, GFP_KERNEL);
                         if (!vol->domainname) {
                                 pr_warn("CIFS: no memory for domainname\n");
@@ -1731,6 +1734,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                         }
 
                          if (strncasecmp(string, "default", 7) != 0) {
+                                kfree(vol->iocharset);
                                 vol->iocharset = kstrdup(string,
                                                          GFP_KERNEL);
                                 if (!vol->iocharset) {
@@ -2913,8 +2917,7 @@ ip_rfc1001_connect(struct TCP_Server_Info *server)
                  * calling name ends in null (byte 16) from old smb
                  * convention.
                  */
-                if (server->workstation_RFC1001_name &&
-                    server->workstation_RFC1001_name[0] != 0)
+                if (server->workstation_RFC1001_name[0] != 0)
                         rfc1002mangle(ses_init_buf->trailer.
                                       session_req.calling_name,
                                       server->workstation_RFC1001_name,
@@ -3692,6 +3695,12 @@ CIFSTCon(const unsigned int xid, struct cifs_ses *ses,
 #endif /* CIFS_WEAK_PW_HASH */
                 rc = SMBNTencrypt(tcon->password, ses->server->cryptkey,
                                         bcc_ptr, nls_codepage);
+                if (rc) {
+                        cifs_dbg(FYI, "%s Can't generate NTLM rsp. Error: %d\n",
+                                 __func__, rc);
+                        cifs_buf_release(smb_buffer);
+                        return rc;
+                }
 
                 bcc_ptr += CIFS_AUTH_RESP_SIZE;
                 if (ses->capabilities & CAP_UNICODE) {
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index a94b3e673182..ca30c391a894 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1823,6 +1823,7 @@ refind_writable:
                         cifsFileInfo_put(inv_file);
                         spin_lock(&cifs_file_list_lock);
                         ++refind;
+                        inv_file = NULL;
                         goto refind_writable;
                 }
         }
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 2d4f37235ed0..3e126d7bb2ea 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -771,6 +771,8 @@ cifs_get_inode_info(struct inode **inode, const char *full_path,
                                 cifs_buf_release(srchinf->ntwrk_buf_start);
                         }
                         kfree(srchinf);
+                        if (rc)
+                                goto cgii_exit;
         } else
                 goto cgii_exit;
 
diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c
index 689f035915cf..22dfdf17d065 100644
--- a/fs/cifs/smb2misc.c
+++ b/fs/cifs/smb2misc.c
@@ -322,7 +322,7 @@ smb2_get_data_area_len(int *off, int *len, struct smb2_hdr *hdr)
 
         /* return pointer to beginning of data area, ie offset from SMB start */
         if ((*off != 0) && (*len != 0))
-                return hdr->ProtocolId + *off;
+                return (char *)(&hdr->ProtocolId[0]) + *off;
         else
                 return NULL;
 }
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 96b5d40a2ece..eab05e1aa587 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -684,7 +684,8 @@ smb2_clone_range(const unsigned int xid,
 
                         /* No need to change MaxChunks since already set to 1 */
                         chunk_sizes_updated = true;
-                }
+                } else
+                        goto cchunk_out;
         }
 
 cchunk_out:
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 3417340bf89e..65cd7a84c8bc 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1218,7 +1218,7 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
         struct smb2_ioctl_req *req;
         struct smb2_ioctl_rsp *rsp;
         struct TCP_Server_Info *server;
-        struct cifs_ses *ses = tcon->ses;
+        struct cifs_ses *ses;
         struct kvec iov[2];
         int resp_buftype;
         int num_iovecs;
@@ -1233,6 +1233,11 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
         if (plen)
                 *plen = 0;
 
+        if (tcon)
+                ses = tcon->ses;
+        else
+                return -EIO;
+
         if (ses && (ses->server))
                 server = ses->server;
         else
@@ -1296,14 +1301,12 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
         rsp = (struct smb2_ioctl_rsp *)iov[0].iov_base;
 
         if ((rc != 0) && (rc != -EINVAL)) {
-                if (tcon)
-                        cifs_stats_fail_inc(tcon, SMB2_IOCTL_HE);
+                cifs_stats_fail_inc(tcon, SMB2_IOCTL_HE);
                 goto ioctl_exit;
         } else if (rc == -EINVAL) {
                 if ((opcode != FSCTL_SRV_COPYCHUNK_WRITE) &&
                     (opcode != FSCTL_SRV_COPYCHUNK)) {
-                        if (tcon)
-                                cifs_stats_fail_inc(tcon, SMB2_IOCTL_HE);
+                        cifs_stats_fail_inc(tcon, SMB2_IOCTL_HE);
                         goto ioctl_exit;
                 }
         }
@@ -1629,7 +1632,7 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
 
         rc = SendReceive2(xid, ses, iov, 1, &resp_buftype, 0);
 
-        if ((rc != 0) && tcon)
+        if (rc != 0)
                 cifs_stats_fail_inc(tcon, SMB2_FLUSH_HE);
 
         free_rsp_buf(resp_buftype, iov[0].iov_base);
@@ -2114,7 +2117,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
         struct kvec iov[2];
         int rc = 0;
         int len;
-        int resp_buftype;
+        int resp_buftype = CIFS_NO_BUFFER;
         unsigned char *bufptr;
         struct TCP_Server_Info *server;
         struct cifs_ses *ses = tcon->ses;
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index e907052eeadb..32a8bbd7a9ad 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -53,6 +53,18 @@ struct wb_writeback_work {
         struct completion *done;        /* set if the caller waits */
 };
 
+/*
+ * If an inode is constantly having its pages dirtied, but then the
+ * updates stop dirtytime_expire_interval seconds in the past, it's
+ * possible for the worst case time between when an inode has its
+ * timestamps updated and when they finally get written out to be two
+ * dirtytime_expire_intervals.  We set the default to 12 hours (in
+ * seconds), which means most of the time inodes will have their
+ * timestamps written to disk after 12 hours, but in the worst case a
+ * few inodes might not their timestamps updated for 24 hours.
+ */
+unsigned int dirtytime_expire_interval = 12 * 60 * 60;
+
 /**
  * writeback_in_progress - determine whether there is writeback in progress
  * @bdi: the device's backing_dev_info structure.
@@ -275,8 +287,8 @@ static int move_expired_inodes(struct list_head *delaying_queue,
 
         if ((flags & EXPIRE_DIRTY_ATIME) == 0)
                 older_than_this = work->older_than_this;
-        else if ((work->reason == WB_REASON_SYNC) == 0) {
-                expire_time = jiffies - (HZ * 86400);
+        else if (!work->for_sync) {
+                expire_time = jiffies - (dirtytime_expire_interval * HZ);
                 older_than_this = &expire_time;
         }
         while (!list_empty(delaying_queue)) {
@@ -458,6 +470,7 @@ static void requeue_inode(struct inode *inode, struct bdi_writeback *wb,
                  */
                 redirty_tail(inode, wb);
         } else if (inode->i_state & I_DIRTY_TIME) {
+                inode->dirtied_when = jiffies;
                 list_move(&inode->i_wb_list, &wb->b_dirty_time);
         } else {
                 /* The inode is clean. Remove from writeback lists. */
@@ -505,12 +518,17 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
         spin_lock(&inode->i_lock);
 
         dirty = inode->i_state & I_DIRTY;
-        if (((dirty & (I_DIRTY_SYNC | I_DIRTY_DATASYNC)) &&
-             (inode->i_state & I_DIRTY_TIME)) ||
-            (inode->i_state & I_DIRTY_TIME_EXPIRED)) {
-                dirty |= I_DIRTY_TIME | I_DIRTY_TIME_EXPIRED;
-                trace_writeback_lazytime(inode);
-        }
+        if (inode->i_state & I_DIRTY_TIME) {
+                if ((dirty & (I_DIRTY_SYNC | I_DIRTY_DATASYNC)) ||
+                    unlikely(inode->i_state & I_DIRTY_TIME_EXPIRED) ||
+                    unlikely(time_after(jiffies,
+                                        (inode->dirtied_time_when +
+                                         dirtytime_expire_interval * HZ)))) {
+                        dirty |= I_DIRTY_TIME | I_DIRTY_TIME_EXPIRED;
+                        trace_writeback_lazytime(inode);
+                }
+        } else
+                inode->i_state &= ~I_DIRTY_TIME_EXPIRED;
         inode->i_state &= ~dirty;
 
         /*
@@ -1131,6 +1149,56 @@ void wakeup_flusher_threads(long nr_pages, enum wb_reason reason)
         rcu_read_unlock();
 }
 
+/*
+ * Wake up bdi's periodically to make sure dirtytime inodes gets
+ * written back periodically.  We deliberately do *not* check the
+ * b_dirtytime list in wb_has_dirty_io(), since this would cause the
+ * kernel to be constantly waking up once there are any dirtytime
+ * inodes on the system.  So instead we define a separate delayed work
+ * function which gets called much more rarely.  (By default, only
+ * once every 12 hours.)
+ *
+ * If there is any other write activity going on in the file system,
+ * this function won't be necessary.  But if the only thing that has
+ * happened on the file system is a dirtytime inode caused by an atime
+ * update, we need this infrastructure below to make sure that inode
+ * eventually gets pushed out to disk.
+ */
+static void wakeup_dirtytime_writeback(struct work_struct *w);
+static DECLARE_DELAYED_WORK(dirtytime_work, wakeup_dirtytime_writeback);
+
+static void wakeup_dirtytime_writeback(struct work_struct *w)
+{
+        struct backing_dev_info *bdi;
+
+        rcu_read_lock();
+        list_for_each_entry_rcu(bdi, &bdi_list, bdi_list) {
+                if (list_empty(&bdi->wb.b_dirty_time))
+                        continue;
+                bdi_wakeup_thread(bdi);
+        }
+        rcu_read_unlock();
+        schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);
+}
+
+static int __init start_dirtytime_writeback(void)
+{
+        schedule_delayed_work(&dirtytime_work, dirtytime_expire_interval * HZ);
+        return 0;
+}
+__initcall(start_dirtytime_writeback);
+
+int dirtytime_interval_handler(struct ctl_table *table, int write,
+                               void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+        int ret;
+
+        ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
+        if (ret == 0 && write)
+                mod_delayed_work(system_wq, &dirtytime_work, 0);
+        return ret;
+}
+
 static noinline void block_dump___mark_inode_dirty(struct inode *inode)
 {
         if (inode->i_ino || strcmp(inode->i_sb->s_id, "bdev")) {
@@ -1269,8 +1337,13 @@ void __mark_inode_dirty(struct inode *inode, int flags)
                         }
 
                         inode->dirtied_when = jiffies;
-                        list_move(&inode->i_wb_list, dirtytime ?
-                                  &bdi->wb.b_dirty_time : &bdi->wb.b_dirty);
+                        if (dirtytime)
+                                inode->dirtied_time_when = jiffies;
+                        if (inode->i_state & (I_DIRTY_INODE | I_DIRTY_PAGES))
+                                list_move(&inode->i_wb_list, &bdi->wb.b_dirty);
+                        else
+                                list_move(&inode->i_wb_list,
+                                          &bdi->wb.b_dirty_time);
                         spin_unlock(&bdi->wb.list_lock);
                         trace_writeback_dirty_inode_enqueue(inode);
 
diff --git a/fs/locks.c b/fs/locks.c
index 528fedfda15e..40bc384728c0 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1388,9 +1388,8 @@ any_leases_conflict(struct inode *inode, struct file_lock *breaker)
 int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
 {
         int error = 0;
-        struct file_lock *new_fl;
         struct file_lock_context *ctx = inode->i_flctx;
-        struct file_lock *fl;
+        struct file_lock *new_fl, *fl, *tmp;
         unsigned long break_time;
         int want_write = (mode & O_ACCMODE) != O_RDONLY;
         LIST_HEAD(dispose);
@@ -1420,7 +1419,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
                         break_time++;   /* so that 0 means no break time */
         }
 
-        list_for_each_entry(fl, &ctx->flc_lease, fl_list) {
+        list_for_each_entry_safe(fl, tmp, &ctx->flc_lease, fl_list) {
                 if (!leases_conflict(fl, new_fl))
                         continue;
                 if (want_write) {
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index cdbc78c72542..03d647bf195d 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -137,7 +137,7 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,
         seg->offset = iomap.offset;
         seg->length = iomap.length;
 
-        dprintk("GET: %lld:%lld %d\n", bex->foff, bex->len, bex->es);
+        dprintk("GET: 0x%llx:0x%llx %d\n", bex->foff, bex->len, bex->es);
         return 0;
 
 out_error:
diff --git a/fs/nfsd/blocklayoutxdr.c b/fs/nfsd/blocklayoutxdr.c
index 9da89fddab33..9aa2796da90d 100644
--- a/fs/nfsd/blocklayoutxdr.c
+++ b/fs/nfsd/blocklayoutxdr.c
@@ -122,19 +122,19 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,
 
                 p = xdr_decode_hyper(p, &bex.foff);
                 if (bex.foff & (block_size - 1)) {
-                        dprintk("%s: unaligned offset %lld\n",
+                        dprintk("%s: unaligned offset 0x%llx\n",
                                 __func__, bex.foff);
                         goto fail;
                 }
                 p = xdr_decode_hyper(p, &bex.len);
                 if (bex.len & (block_size - 1)) {
-                        dprintk("%s: unaligned length %lld\n",
+                        dprintk("%s: unaligned length 0x%llx\n",
                                 __func__, bex.foff);
                         goto fail;
                 }
                 p = xdr_decode_hyper(p, &bex.soff);
                 if (bex.soff & (block_size - 1)) {
-                        dprintk("%s: unaligned disk offset %lld\n",
+                        dprintk("%s: unaligned disk offset 0x%llx\n",
                                 __func__, bex.soff);
                         goto fail;
                 }
diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 1028a0629543..6904213a4363 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -118,7 +118,7 @@ void nfsd4_setup_layout_type(struct svc_export *exp)
 {
         struct super_block *sb = exp->ex_path.mnt->mnt_sb;
 
-        if (exp->ex_flags & NFSEXP_NOPNFS)
+        if (!(exp->ex_flags & NFSEXP_PNFS))
                 return;
 
         if (sb->s_export_op->get_uuid &&
@@ -440,15 +440,14 @@ nfsd4_return_file_layout(struct nfs4_layout *lp, struct nfsd4_layout_seg *seg,
                         list_move_tail(&lp->lo_perstate, reaplist);
                         return;
                 }
-                end = seg->offset;
+                lo->offset = layout_end(seg);
         } else {
                 /* retain the whole layout segment on a split. */
                 if (layout_end(seg) < end) {
                         dprintk("%s: split not supported\n", __func__);
                         return;
                 }
-
-                lo->offset = layout_end(seg);
+                end = seg->offset;
         }
 
         layout_update_len(lo, end);
@@ -513,6 +512,9 @@ nfsd4_return_client_layouts(struct svc_rqst *rqstp,
 
         spin_lock(&clp->cl_lock);
         list_for_each_entry_safe(ls, n, &clp->cl_lo_states, ls_perclnt) {
+                if (ls->ls_layout_type != lrp->lr_layout_type)
+                        continue;
+
                 if (lrp->lr_return_type == RETURN_FSID &&
                     !fh_fsid_match(&ls->ls_stid.sc_file->fi_fhandle,
                                    &cstate->current_fh.fh_handle))
@@ -587,6 +589,8 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls)
 
         rpc_ntop((struct sockaddr *)&clp->cl_addr, addr_str, sizeof(addr_str));
 
+        trace_layout_recall_fail(&ls->ls_stid.sc_stateid);
+
         printk(KERN_WARNING
                 "nfsd: client %s failed to respond to layout recall. "
                 "  Fencing..\n", addr_str);
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index d30bea8d0277..92b9d97aff4f 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1237,8 +1237,8 @@ nfsd4_getdeviceinfo(struct svc_rqst *rqstp,
                 nfserr = ops->proc_getdeviceinfo(exp->ex_path.mnt->mnt_sb, gdp);
 
         gdp->gd_notify_types &= ops->notify_types;
-        exp_put(exp);
 out:
+        exp_put(exp);
         return nfserr;
 }
 
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d2f2c37dc2db..8ba1d888f1e6 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3221,7 +3221,7 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfsd4_open *open,
         } else
                 nfs4_free_openowner(&oo->oo_owner);
         spin_unlock(&clp->cl_lock);
-        return oo;
+        return ret;
 }
 
 static void init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp, struct nfsd4_open *open) {
@@ -5062,7 +5062,7 @@ alloc_init_lock_stateowner(unsigned int strhashval, struct nfs4_client *clp,
         } else
                 nfs4_free_lockowner(&lo->lo_owner);
         spin_unlock(&clp->cl_lock);
-        return lo;
+        return ret;
 }
 
 static void
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index df5e66caf100..5fb7e78169a6 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1562,7 +1562,11 @@ nfsd4_decode_layoutget(struct nfsd4_compoundargs *argp,
         p = xdr_decode_hyper(p, &lgp->lg_seg.offset);
         p = xdr_decode_hyper(p, &lgp->lg_seg.length);
         p = xdr_decode_hyper(p, &lgp->lg_minlength);
-        nfsd4_decode_stateid(argp, &lgp->lg_sid);
+
+        status = nfsd4_decode_stateid(argp, &lgp->lg_sid);
+        if (status)
+                return status;
+
         READ_BUF(4);
         lgp->lg_maxcount = be32_to_cpup(p++);
 
@@ -1580,7 +1584,11 @@ nfsd4_decode_layoutcommit(struct nfsd4_compoundargs *argp,
         p = xdr_decode_hyper(p, &lcp->lc_seg.offset);
         p = xdr_decode_hyper(p, &lcp->lc_seg.length);
         lcp->lc_reclaim = be32_to_cpup(p++);
-        nfsd4_decode_stateid(argp, &lcp->lc_sid);
+
+        status = nfsd4_decode_stateid(argp, &lcp->lc_sid);
+        if (status)
+                return status;
+
         READ_BUF(4);
         lcp->lc_newoffset = be32_to_cpup(p++);
         if (lcp->lc_newoffset) {
@@ -1628,7 +1636,11 @@ nfsd4_decode_layoutreturn(struct nfsd4_compoundargs *argp,
                 READ_BUF(16);
                 p = xdr_decode_hyper(p, &lrp->lr_seg.offset);
                 p = xdr_decode_hyper(p, &lrp->lr_seg.length);
-                nfsd4_decode_stateid(argp, &lrp->lr_sid);
+
+                status = nfsd4_decode_stateid(argp, &lrp->lr_sid);
+                if (status)
+                        return status;
+
                 READ_BUF(4);
                 lrp->lrf_body_len = be32_to_cpup(p++);
                 if (lrp->lrf_body_len > 0) {
@@ -4123,7 +4135,7 @@ nfsd4_encode_layoutreturn(struct nfsd4_compoundres *resp, __be32 nfserr,
                 return nfserr_resource;
         *p++ = cpu_to_be32(lrp->lrs_present);
         if (lrp->lrs_present)
-                nfsd4_encode_stateid(xdr, &lrp->lr_sid);
+                return nfsd4_encode_stateid(xdr, &lrp->lr_sid);
         return nfs_ok;
 }
 #endif /* CONFIG_NFSD_PNFS */
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index 83a9694ec485..46ec934f5dee 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -165,13 +165,17 @@ int nfsd_reply_cache_init(void)
 {
         unsigned int hashsize;
         unsigned int i;
+        int status = 0;
 
         max_drc_entries = nfsd_cache_size_limit();
         atomic_set(&num_drc_entries, 0);
         hashsize = nfsd_hashsize(max_drc_entries);
         maskbits = ilog2(hashsize);
 
-        register_shrinker(&nfsd_reply_cache_shrinker);
+        status = register_shrinker(&nfsd_reply_cache_shrinker);
+        if (status)
+                return status;
+
         drc_slab = kmem_cache_create("nfsd_drc", sizeof(struct svc_cacherep),
                                         0, 0, NULL);
         if (!drc_slab)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index b4d71b5e1ff2..f4131e8ead74 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -604,6 +604,7 @@ struct inode {
         struct mutex            i_mutex;
 
         unsigned long           dirtied_when;   /* jiffies of first dirtying */
+        unsigned long           dirtied_time_when;
 
         struct hlist_node       i_hash;
         struct list_head        i_wb_list;      /* backing dev IO list */
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
index 781974afff9f..ffbc034c8810 100644
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h
@@ -126,8 +126,23 @@
 #define GICR_PROPBASER_WaWb             (5U << 7)
 #define GICR_PROPBASER_RaWaWt           (6U << 7)
 #define GICR_PROPBASER_RaWaWb           (7U << 7)
+#define GICR_PROPBASER_CACHEABILITY_MASK (7U << 7)
 #define GICR_PROPBASER_IDBITS_MASK      (0x1f)
 
+#define GICR_PENDBASER_NonShareable     (0U << 10)
+#define GICR_PENDBASER_InnerShareable   (1U << 10)
+#define GICR_PENDBASER_OuterShareable   (2U << 10)
+#define GICR_PENDBASER_SHAREABILITY_MASK (3UL << 10)
+#define GICR_PENDBASER_nCnB             (0U << 7)
+#define GICR_PENDBASER_nC               (1U << 7)
+#define GICR_PENDBASER_RaWt             (2U << 7)
+#define GICR_PENDBASER_RaWb             (3U << 7)
+#define GICR_PENDBASER_WaWt             (4U << 7)
+#define GICR_PENDBASER_WaWb             (5U << 7)
+#define GICR_PENDBASER_RaWaWt           (6U << 7)
+#define GICR_PENDBASER_RaWaWb           (7U << 7)
+#define GICR_PENDBASER_CACHEABILITY_MASK (7U << 7)
+
 /*
  * Re-Distributor registers, offsets from SGI_base
  */
@@ -182,6 +197,7 @@
 #define GITS_CBASER_WaWb                (5UL << 59)
 #define GITS_CBASER_RaWaWt              (6UL << 59)
 #define GITS_CBASER_RaWaWb              (7UL << 59)
+#define GITS_CBASER_CACHEABILITY_MASK   (7UL << 59)
 #define GITS_CBASER_NonShareable        (0UL << 10)
 #define GITS_CBASER_InnerShareable      (1UL << 10)
 #define GITS_CBASER_OuterShareable      (2UL << 10)
@@ -198,6 +214,7 @@
 #define GITS_BASER_WaWb                 (5UL << 59)
 #define GITS_BASER_RaWaWt               (6UL << 59)
 #define GITS_BASER_RaWaWb               (7UL << 59)
+#define GITS_BASER_CACHEABILITY_MASK    (7UL << 59)
 #define GITS_BASER_TYPE_SHIFT           (56)
 #define GITS_BASER_TYPE(r)              (((r) >> GITS_BASER_TYPE_SHIFT) & 7)
 #define GITS_BASER_ENTRY_SIZE_SHIFT     (48)
diff --git a/include/linux/lcm.h b/include/linux/lcm.h
index 7bf01d779b45..1ce79a7f1daa 100644
--- a/include/linux/lcm.h
+++ b/include/linux/lcm.h
@@ -4,5 +4,6 @@
 #include <linux/compiler.h>
 
 unsigned long lcm(unsigned long a, unsigned long b) __attribute_const__;
+unsigned long lcm_not_zero(unsigned long a, unsigned long b) __attribute_const__;
 
 #endif /* _LCM_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index dcf6ec27739b..278738873703 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2185,6 +2185,12 @@ void netdev_freemem(struct net_device *dev);
 void synchronize_net(void);
 int init_dummy_netdev(struct net_device *dev);
 
+DECLARE_PER_CPU(int, xmit_recursion);
+static inline int dev_recursion_level(void)
+{
+        return this_cpu_read(xmit_recursion);
+}
+
 struct net_device *dev_get_by_index(struct net *net, int ifindex);
 struct net_device *__dev_get_by_index(struct net *net, int ifindex);
 struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index d17e1ff7ad01..bd631ee5f1da 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -252,8 +252,12 @@ int regulator_list_hardware_vsel(struct regulator *regulator,
 /* regulator notifier block */
 int regulator_register_notifier(struct regulator *regulator,
                               struct notifier_block *nb);
+int devm_regulator_register_notifier(struct regulator *regulator,
+                                     struct notifier_block *nb);
 int regulator_unregister_notifier(struct regulator *regulator,
                                 struct notifier_block *nb);
+void devm_regulator_unregister_notifier(struct regulator *regulator,
+                                        struct notifier_block *nb);
 
 /* driver data - core doesn't touch */
 void *regulator_get_drvdata(struct regulator *regulator);
@@ -515,12 +519,24 @@ static inline int regulator_register_notifier(struct regulator *regulator,
         return 0;
 }
 
+static inline int devm_regulator_register_notifier(struct regulator *regulator,
+                                                   struct notifier_block *nb)
+{
+        return 0;
+}
+
 static inline int regulator_unregister_notifier(struct regulator *regulator,
                                 struct notifier_block *nb)
 {
         return 0;
 }
 
+static inline int devm_regulator_unregister_notifier(struct regulator *regulator,
+                                                     struct notifier_block *nb)
+{
+        return 0;
+}
+
 static inline void *regulator_get_drvdata(struct regulator *regulator)
 {
         return NULL;
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index c57d8ea0716c..59a7889e15db 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -60,17 +60,17 @@ struct rpc_xprt;
 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
 void            rpc_register_sysctl(void);
 void            rpc_unregister_sysctl(void);
-int             sunrpc_debugfs_init(void);
+void            sunrpc_debugfs_init(void);
 void            sunrpc_debugfs_exit(void);
-int             rpc_clnt_debugfs_register(struct rpc_clnt *);
+void            rpc_clnt_debugfs_register(struct rpc_clnt *);
 void            rpc_clnt_debugfs_unregister(struct rpc_clnt *);
-int             rpc_xprt_debugfs_register(struct rpc_xprt *);
+void            rpc_xprt_debugfs_register(struct rpc_xprt *);
 void            rpc_xprt_debugfs_unregister(struct rpc_xprt *);
 #else
-static inline int
+static inline void
 sunrpc_debugfs_init(void)
 {
-        return 0;
+        return;
 }
 
 static inline void
@@ -79,10 +79,10 @@ sunrpc_debugfs_exit(void)
         return;
 }
 
-static inline int
+static inline void
 rpc_clnt_debugfs_register(struct rpc_clnt *clnt)
 {
-        return 0;
+        return;
 }
 
 static inline void
@@ -91,10 +91,10 @@ rpc_clnt_debugfs_unregister(struct rpc_clnt *clnt)
         return;
 }
 
-static inline int
+static inline void
 rpc_xprt_debugfs_register(struct rpc_xprt *xprt)
 {
-        return 0;
+        return;
 }
 
 static inline void
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index d9a4905e01d0..6e0ce8c7b8cb 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -227,9 +227,23 @@ struct skb_data {	/* skb->cb is one of these */
         struct urb              *urb;
         struct usbnet           *dev;
         enum skb_state          state;
-        size_t                  length;
+        long                    length;
+        unsigned long           packets;
 };
 
+/* Drivers that set FLAG_MULTI_PACKET must call this in their
+ * tx_fixup method before returning an skb.
+ */
+static inline void
+usbnet_set_skb_tx_stats(struct sk_buff *skb,
+                        unsigned long packets, long bytes_delta)
+{
+        struct skb_data *entry = (struct skb_data *) skb->cb;
+
+        entry->packets = packets;
+        entry->length = bytes_delta;
+}
+
 extern int usbnet_open(struct net_device *net);
 extern int usbnet_stop(struct net_device *net);
 extern netdev_tx_t usbnet_start_xmit(struct sk_buff *skb,
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 00048339c23e..b2dd371ec0ca 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -130,6 +130,7 @@ extern int vm_dirty_ratio;
 extern unsigned long vm_dirty_bytes;
 extern unsigned int dirty_writeback_interval;
 extern unsigned int dirty_expire_interval;
+extern unsigned int dirtytime_expire_interval;
 extern int vm_highmem_is_dirtyable;
 extern int block_dump;
 extern int laptop_mode;
@@ -146,6 +147,8 @@ extern int dirty_ratio_handler(struct ctl_table *table, int write,
 extern int dirty_bytes_handler(struct ctl_table *table, int write,
                 void __user *buffer, size_t *lenp,
                 loff_t *ppos);
+int dirtytime_interval_handler(struct ctl_table *table, int write,
+                               void __user *buffer, size_t *lenp, loff_t *ppos);
 
 struct ctl_table;
 int dirty_writeback_centisecs_handler(struct ctl_table *, int,
diff --git a/include/net/ip.h b/include/net/ip.h
index 025c61c0dffb..6cc1eafb153a 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -453,22 +453,6 @@ static __inline__ void inet_reset_saddr(struct sock *sk)
 
 #endif
 
-static inline int sk_mc_loop(struct sock *sk)
-{
-        if (!sk)
-                return 1;
-        switch (sk->sk_family) {
-        case AF_INET:
-                return inet_sk(sk)->mc_loop;
-#if IS_ENABLED(CONFIG_IPV6)
-        case AF_INET6:
-                return inet6_sk(sk)->mc_loop;
-#endif
-        }
-        WARN_ON(1);
-        return 1;
-}
-
 bool ip_call_ra_chain(struct sk_buff *skb);
 
 /*
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 1d09b46c1e48..eda131d179d9 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -174,7 +174,8 @@ int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
 
 static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
 {
-        struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL;
+        struct ipv6_pinfo *np = skb->sk && !dev_recursion_level() ?
+                                inet6_sk(skb->sk) : NULL;
 
         return (np && np->pmtudisc >= IPV6_PMTUDISC_PROBE) ?
                skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb));
diff --git a/include/net/sock.h b/include/net/sock.h
index ab186b1d31ff..e4079c28e6b8 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1762,6 +1762,8 @@ struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie);
 
 struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie);
 
+bool sk_mc_loop(struct sock *sk);
+
 static inline bool sk_can_gso(const struct sock *sk)
 {
         return net_gso_ok(sk->sk_route_caps, sk->sk_gso_type);
diff --git a/include/sound/rt5670.h b/include/sound/rt5670.h
index bd311197a3b5..b7d60510819b 100644
--- a/include/sound/rt5670.h
+++ b/include/sound/rt5670.h
@@ -14,6 +14,7 @@
 struct rt5670_platform_data {
         int jd_mode;
         bool in2_diff;
+        bool dev_gpio;
 
         bool dmic_en;
         unsigned int dmic1_data_pin;
diff --git a/include/sound/simple_card.h b/include/sound/simple_card.h
index 1255ddb1d3e2..b9b4f289fe6b 100644
--- a/include/sound/simple_card.h
+++ b/include/sound/simple_card.h
@@ -16,7 +16,6 @@
 
 struct asoc_simple_dai {
         const char *name;
-        unsigned int fmt;
         unsigned int sysclk;
         int slots;
         int slot_width;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8d7416e46861..0bc83647d3fa 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -378,6 +378,7 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
 void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);
 int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
                          const struct snd_soc_pcm_stream *params,
+                         unsigned int num_params,
                          struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink);
 
@@ -440,7 +441,6 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card);
 int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
         struct snd_soc_dapm_widget_list **list);
 
-struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol);
 struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(
         struct snd_kcontrol *kcontrol);
 
@@ -531,6 +531,8 @@ struct snd_soc_dapm_widget {
         void *priv;                             /* widget specific data */
         struct regulator *regulator;            /* attached regulator */
         const struct snd_soc_pcm_stream *params; /* params for dai links */
+        unsigned int num_params; /* number of params for dai links */
+        unsigned int params_select; /* currently selected param for dai link */
 
         /* dapm control */
         int reg;                                /* negative reg = no direct dapm */
@@ -586,8 +588,6 @@ struct snd_soc_dapm_update {
 /* DAPM context */
 struct snd_soc_dapm_context {
         enum snd_soc_bias_level bias_level;
-        enum snd_soc_bias_level suspend_bias_level;
-        struct delayed_work delayed_work;
         unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
         /* Go to BIAS_OFF in suspend if the DAPM context is idle */
         unsigned int suspend_bias_off:1;
diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h
index 98f2ade0266e..806059052bfc 100644
--- a/include/sound/soc-dpcm.h
+++ b/include/sound/soc-dpcm.h
@@ -135,7 +135,7 @@ void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream,
 
 /* internal use only */
 int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute);
-int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
+void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
 int soc_dpcm_runtime_update(struct snd_soc_card *);
 
 int dpcm_path_get(struct snd_soc_pcm_runtime *fe,
diff --git a/include/sound/soc.h b/include/sound/soc.h
index b371aef9819f..fcb312b3f258 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -943,6 +943,7 @@ struct snd_soc_dai_link {
         int be_id;      /* optional ID for machine driver BE identification */
 
         const struct snd_soc_pcm_stream *params;
+        unsigned int num_params;
 
         unsigned int dai_fmt;           /* format to set on init */
 
@@ -1268,6 +1269,19 @@ static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(
         return component->dapm_ptr;
 }
 
+/**
+ * snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol
+ * @kcontrol: The kcontrol
+ *
+ * This function must only be used on DAPM contexts that are known to be part of
+ * a CODEC (e.g. in a CODEC driver). Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(
+        struct snd_kcontrol *kcontrol)
+{
+        return snd_soc_dapm_to_codec(snd_soc_dapm_kcontrol_dapm(kcontrol));
+}
+
 /* codec IO */
 unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
 int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index b0a813079852..2f62ab2d7bf9 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -973,7 +973,8 @@ struct input_keymap_entry {
  */
 #define MT_TOOL_FINGER          0
 #define MT_TOOL_PEN             1
-#define MT_TOOL_MAX             1
+#define MT_TOOL_PALM            2
+#define MT_TOOL_MAX             2
 
 /*
  * Values describing the status of a force-feedback effect
diff --git a/include/uapi/linux/nfsd/export.h b/include/uapi/linux/nfsd/export.h
index 4742f2cb42f2..d3bd6ffec041 100644
--- a/include/uapi/linux/nfsd/export.h
+++ b/include/uapi/linux/nfsd/export.h
@@ -47,7 +47,7 @@
  * exported filesystem.
  */
 #define NFSEXP_V4ROOT           0x10000
-#define NFSEXP_NOPNFS           0x20000
+#define NFSEXP_PNFS             0x20000
 
 /* All flags that we claim to support.  (Note we don't support NOACL.) */
 #define NFSEXP_ALLFLAGS         0x3FE7F
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 88ea2d6e0031..ce410bb9f2e1 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1228,6 +1228,14 @@ static struct ctl_table vm_table[] = {
                 .extra1         = &zero,
         },
         {
+                .procname       = "dirtytime_expire_seconds",
+                .data           = &dirtytime_expire_interval,
+                .maxlen         = sizeof(dirty_expire_interval),
+                .mode           = 0644,
+                .proc_handler   = dirtytime_interval_handler,
+                .extra1         = &zero,
+        },
+        {
                 .procname       = "nr_pdflush_threads",
                 .mode           = 0444 /* read-only */,
                 .proc_handler   = pdflush_proc_obsolete,
diff --git a/lib/lcm.c b/lib/lcm.c
index e97dbd51e756..03d7fcb420b5 100644
--- a/lib/lcm.c
+++ b/lib/lcm.c
@@ -12,3 +12,14 @@ unsigned long lcm(unsigned long a, unsigned long b)
                 return 0;
 }
 EXPORT_SYMBOL_GPL(lcm);
+
+unsigned long lcm_not_zero(unsigned long a, unsigned long b)
+{
+        unsigned long l = lcm(a, b);
+
+        if (l)
+                return l;
+
+        return (b ? : a);
+}
+EXPORT_SYMBOL_GPL(lcm_not_zero);
diff --git a/lib/nlattr.c b/lib/nlattr.c
index 76a1b59523ab..f5907d23272d 100644
--- a/lib/nlattr.c
+++ b/lib/nlattr.c
@@ -279,6 +279,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
         int minlen = min_t(int, count, nla_len(src));
 
         memcpy(dest, nla_data(src), minlen);
+        if (count > minlen)
+                memset(dest + minlen, 0, count - minlen);
 
         return minlen;
 }
diff --git a/net/core/dev.c b/net/core/dev.c
index 962ee9d71964..45109b70664e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2848,7 +2848,9 @@ static void skb_update_prio(struct sk_buff *skb)
 #define skb_update_prio(skb)
 #endif
 
-static DEFINE_PER_CPU(int, xmit_recursion);
+DEFINE_PER_CPU(int, xmit_recursion);
+EXPORT_SYMBOL(xmit_recursion);
+
 #define RECURSION_LIMIT 10
 
 /**
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 44706e81b2e0..e4fdc9dfb2c7 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -175,9 +175,9 @@ void fib_rules_unregister(struct fib_rules_ops *ops)
 
         spin_lock(&net->rules_mod_lock);
         list_del_rcu(&ops->list);
-        fib_rules_cleanup_ops(ops);
         spin_unlock(&net->rules_mod_lock);
 
+        fib_rules_cleanup_ops(ops);
         call_rcu(&ops->rcu, fib_rules_put_rcu);
 }
 EXPORT_SYMBOL_GPL(fib_rules_unregister);
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index cb5290b8c428..70d3450588b2 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -198,8 +198,10 @@ static int __peernet2id(struct net *net, struct net *peer, bool alloc)
  */
 int peernet2id(struct net *net, struct net *peer)
 {
-        int id = __peernet2id(net, peer, true);
+        bool alloc = atomic_read(&peer->count) == 0 ? false : true;
+        int id;
 
+        id = __peernet2id(net, peer, alloc);
         return id >= 0 ? id : NETNSA_NSID_NOT_ASSIGNED;
 }
 EXPORT_SYMBOL(peernet2id);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index ee0608bb3bc0..7ebed55b5f7d 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1932,10 +1932,10 @@ static int rtnl_group_changelink(const struct sk_buff *skb,
                 struct ifinfomsg *ifm,
                 struct nlattr **tb)
 {
-        struct net_device *dev;
+        struct net_device *dev, *aux;
         int err;
 
-        for_each_netdev(net, dev) {
+        for_each_netdev_safe(net, dev, aux) {
                 if (dev->group == group) {
                         err = do_setlink(skb, dev, ifm, tb, NULL, 0);
                         if (err < 0)
diff --git a/net/core/sock.c b/net/core/sock.c
index 78e89eb7eb70..71e3e5f1eaa0 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -653,6 +653,25 @@ static inline void sock_valbool_flag(struct sock *sk, int bit, int valbool)
                 sock_reset_flag(sk, bit);
 }
 
+bool sk_mc_loop(struct sock *sk)
+{
+        if (dev_recursion_level())
+                return false;
+        if (!sk)
+                return true;
+        switch (sk->sk_family) {
+        case AF_INET:
+                return inet_sk(sk)->mc_loop;
+#if IS_ENABLED(CONFIG_IPV6)
+        case AF_INET6:
+                return inet6_sk(sk)->mc_loop;
+#endif
+        }
+        WARN_ON(1);
+        return true;
+}
+EXPORT_SYMBOL(sk_mc_loop);
+
 /*
  *      This is meant for all protocols to use and covers goings on
  *      at the socket level. Everything here is generic.
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index faf7cc3483fe..9d66a0f72f90 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -248,7 +248,9 @@ void __init dn_fib_rules_init(void)
 
 void __exit dn_fib_rules_cleanup(void)
 {
+        rtnl_lock();
         fib_rules_unregister(dn_fib_rules_ops);
+        rtnl_unlock();
         rcu_barrier();
 }
 
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 2173402d87e0..4dea2e0681d1 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -501,12 +501,10 @@ static struct net_device *dev_to_net_device(struct device *dev)
 #ifdef CONFIG_OF
 static int dsa_of_setup_routing_table(struct dsa_platform_data *pd,
                                         struct dsa_chip_data *cd,
-                                        int chip_index,
+                                        int chip_index, int port_index,
                                         struct device_node *link)
 {
-        int ret;
         const __be32 *reg;
-        int link_port_addr;
         int link_sw_addr;
         struct device_node *parent_sw;
         int len;
@@ -519,6 +517,10 @@ static int dsa_of_setup_routing_table(struct dsa_platform_data *pd,
         if (!reg || (len != sizeof(*reg) * 2))
                 return -EINVAL;
 
+        /*
+         * Get the destination switch number from the second field of its 'reg'
+         * property, i.e. for "reg = <0x19 1>" sw_addr is '1'.
+         */
         link_sw_addr = be32_to_cpup(reg + 1);
 
         if (link_sw_addr >= pd->nr_chips)
@@ -535,20 +537,9 @@ static int dsa_of_setup_routing_table(struct dsa_platform_data *pd,
                 memset(cd->rtable, -1, pd->nr_chips * sizeof(s8));
         }
 
-        reg = of_get_property(link, "reg", NULL);
-        if (!reg) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        link_port_addr = be32_to_cpup(reg);
-
-        cd->rtable[link_sw_addr] = link_port_addr;
+        cd->rtable[link_sw_addr] = port_index;
 
         return 0;
-out:
-        kfree(cd->rtable);
-        return ret;
 }
 
 static void dsa_of_free_platform_data(struct dsa_platform_data *pd)
@@ -658,7 +649,7 @@ static int dsa_of_probe(struct platform_device *pdev)
                         if (!strcmp(port_name, "dsa") && link &&
                                         pd->nr_chips > 1) {
                                 ret = dsa_of_setup_routing_table(pd, cd,
-                                                chip_index, link);
+                                                chip_index, port_index, link);
                                 if (ret)
                                         goto out_free_chip;
                         }
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 57be71dd6a9e..23b9b3e86f4c 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -1111,11 +1111,10 @@ static void ip_fib_net_exit(struct net *net)
 {
         unsigned int i;
 
+        rtnl_lock();
 #ifdef CONFIG_IP_MULTIPLE_TABLES
         fib4_rules_exit(net);
 #endif
-
-        rtnl_lock();
         for (i = 0; i < FIB_TABLE_HASHSZ; i++) {
                 struct fib_table *tb;
                 struct hlist_head *head;
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 9d78427652d2..fe54eba6d00d 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -268,7 +268,7 @@ static int __net_init ipmr_rules_init(struct net *net)
         return 0;
 
 err2:
-        kfree(mrt);
+        ipmr_free_table(mrt);
 err1:
         fib_rules_unregister(ops);
         return err;
@@ -278,11 +278,13 @@ static void __net_exit ipmr_rules_exit(struct net *net)
 {
         struct mr_table *mrt, *next;
 
+        rtnl_lock();
         list_for_each_entry_safe(mrt, next, &net->ipv4.mr_tables, list) {
                 list_del(&mrt->list);
                 ipmr_free_table(mrt);
         }
         fib_rules_unregister(net->ipv4.mr_rules_ops);
+        rtnl_unlock();
 }
 #else
 #define ipmr_for_each_table(mrt, net) \
@@ -308,7 +310,10 @@ static int __net_init ipmr_rules_init(struct net *net)
 
 static void __net_exit ipmr_rules_exit(struct net *net)
 {
+        rtnl_lock();
         ipmr_free_table(net->ipv4.mrt);
+        net->ipv4.mrt = NULL;
+        rtnl_unlock();
 }
 #endif
 
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index fb4cf8b8e121..f501ac048366 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3105,10 +3105,11 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets,
                         if (!first_ackt.v64)
                                 first_ackt = last_ackt;
 
-                        if (!(sacked & TCPCB_SACKED_ACKED))
+                        if (!(sacked & TCPCB_SACKED_ACKED)) {
                                 reord = min(pkts_acked, reord);
-                        if (!after(scb->end_seq, tp->high_seq))
-                                flag |= FLAG_ORIG_SACK_ACKED;
+                                if (!after(scb->end_seq, tp->high_seq))
+                                        flag |= FLAG_ORIG_SACK_ACKED;
+                        }
                 }
 
                 if (sacked & TCPCB_SACKED_ACKED)
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 5a2dfed4783b..f1756ee02207 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1518,7 +1518,7 @@ void tcp_v4_early_demux(struct sk_buff *skb)
                 skb->sk = sk;
                 skb->destructor = sock_edemux;
                 if (sk->sk_state != TCP_TIME_WAIT) {
-                        struct dst_entry *dst = sk->sk_rx_dst;
+                        struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst);
 
                         if (dst)
                                 dst = dst_check(dst, 0);
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 27ca79682efb..70bc6abc0639 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -322,7 +322,9 @@ out_fib6_rules_ops:
 
 static void __net_exit fib6_rules_net_exit(struct net *net)
 {
+        rtnl_lock();
         fib_rules_unregister(net->ipv6.fib6_rules_ops);
+        rtnl_unlock();
 }
 
 static struct pernet_operations fib6_rules_net_ops = {
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 7e80b61b51ff..36cf0ab685a0 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -542,7 +542,8 @@ int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
 {
         struct sk_buff *frag;
         struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);
-        struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL;
+        struct ipv6_pinfo *np = skb->sk && !dev_recursion_level() ?
+                                inet6_sk(skb->sk) : NULL;
         struct ipv6hdr *tmp_hdr;
         struct frag_hdr *fh;
         unsigned int mtu, hlen, left, len;
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 34b682617f50..312e0ff47339 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -252,7 +252,7 @@ static int __net_init ip6mr_rules_init(struct net *net)
         return 0;
 
 err2:
-        kfree(mrt);
+        ip6mr_free_table(mrt);
 err1:
         fib_rules_unregister(ops);
         return err;
@@ -267,8 +267,8 @@ static void __net_exit ip6mr_rules_exit(struct net *net)
                 list_del(&mrt->list);
                 ip6mr_free_table(mrt);
         }
-        rtnl_unlock();
         fib_rules_unregister(net->ipv6.mr6_rules_ops);
+        rtnl_unlock();
 }
 #else
 #define ip6mr_for_each_table(mrt, net) \
@@ -336,7 +336,7 @@ static struct mr6_table *ip6mr_new_table(struct net *net, u32 id)
 
 static void ip6mr_free_table(struct mr6_table *mrt)
 {
-        del_timer(&mrt->ipmr_expire_timer);
+        del_timer_sync(&mrt->ipmr_expire_timer);
         mroute_clean_tables(mrt);
         kfree(mrt);
 }
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 471ed24aabae..14ecdaf06bf7 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1218,7 +1218,14 @@ static void ndisc_router_discovery(struct sk_buff *skb)
         if (rt)
                 rt6_set_expires(rt, jiffies + (HZ * lifetime));
         if (ra_msg->icmph.icmp6_hop_limit) {
-                in6_dev->cnf.hop_limit = ra_msg->icmph.icmp6_hop_limit;
+                /* Only set hop_limit on the interface if it is higher than
+                 * the current hop_limit.
+                 */
+                if (in6_dev->cnf.hop_limit < ra_msg->icmph.icmp6_hop_limit) {
+                        in6_dev->cnf.hop_limit = ra_msg->icmph.icmp6_hop_limit;
+                } else {
+                        ND_PRINTK(2, warn, "RA: Got route advertisement with lower hop_limit than current\n");
+                }
                 if (rt)
                         dst_metric_set(&rt->dst, RTAX_HOPLIMIT,
                                        ra_msg->icmph.icmp6_hop_limit);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 5d46832c6f72..1f5e62229aaa 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1411,6 +1411,15 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const struct ipv6hdr *hdr,
         TCP_SKB_CB(skb)->sacked = 0;
 }
 
+static void tcp_v6_restore_cb(struct sk_buff *skb)
+{
+        /* We need to move header back to the beginning if xfrm6_policy_check()
+         * and tcp_v6_fill_cb() are going to be called again.
+         */
+        memmove(IP6CB(skb), &TCP_SKB_CB(skb)->header.h6,
+                sizeof(struct inet6_skb_parm));
+}
+
 static int tcp_v6_rcv(struct sk_buff *skb)
 {
         const struct tcphdr *th;
@@ -1543,6 +1552,7 @@ do_time_wait:
                         inet_twsk_deschedule(tw, &tcp_death_row);
                         inet_twsk_put(tw);
                         sk = sk2;
+                        tcp_v6_restore_cb(skb);
                         goto process;
                 }
                 /* Fall through to ACK */
@@ -1551,6 +1561,7 @@ do_time_wait:
                 tcp_v6_timewait_ack(sk, skb);
                 break;
         case TCP_TW_RST:
+                tcp_v6_restore_cb(skb);
                 goto no_tcp_socket;
         case TCP_TW_SUCCESS:
                 ;
@@ -1585,7 +1596,7 @@ static void tcp_v6_early_demux(struct sk_buff *skb)
                 skb->sk = sk;
                 skb->destructor = sock_edemux;
                 if (sk->sk_state != TCP_TIME_WAIT) {
-                        struct dst_entry *dst = sk->sk_rx_dst;
+                        struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst);
 
                         if (dst)
                                 dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie);
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 2e9953b2db84..53d931172088 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1114,10 +1114,8 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
                         noblock, &err);
         else
                 skb = sock_alloc_send_skb(sk, len, noblock, &err);
-        if (!skb) {
-                err = -ENOMEM;
+        if (!skb)
                 goto out;
-        }
         if (iucv->transport == AF_IUCV_TRANS_HIPER)
                 skb_reserve(skb, sizeof(struct af_iucv_trans_hdr) + ETH_HLEN);
         if (memcpy_from_msg(skb_put(skb, len), msg, len)) {
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 895348e44c7d..a29a504492af 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1871,6 +1871,7 @@ static int __init l2tp_init(void)
         l2tp_wq = alloc_workqueue("l2tp", WQ_UNBOUND, 0);
         if (!l2tp_wq) {
                 pr_err("alloc_workqueue failed\n");
+                unregister_pernet_device(&l2tp_net_ops);
                 rc = -ENOMEM;
                 goto out;
         }
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index a48bad468880..7702978a4c99 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -49,8 +49,6 @@ static void ieee80211_free_tid_rx(struct rcu_head *h)
                 container_of(h, struct tid_ampdu_rx, rcu_head);
         int i;
 
-        del_timer_sync(&tid_rx->reorder_timer);
-
         for (i = 0; i < tid_rx->buf_size; i++)
                 __skb_queue_purge(&tid_rx->reorder_buf[i]);
         kfree(tid_rx->reorder_buf);
@@ -93,6 +91,12 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
 
         del_timer_sync(&tid_rx->session_timer);
 
+        /* make sure ieee80211_sta_reorder_release() doesn't re-arm the timer */
+        spin_lock_bh(&tid_rx->reorder_lock);
+        tid_rx->removed = true;
+        spin_unlock_bh(&tid_rx->reorder_lock);
+        del_timer_sync(&tid_rx->reorder_timer);
+
         call_rcu(&tid_rx->rcu_head, ieee80211_free_tid_rx);
 }
 
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 944bdc04e913..1eb730bf8752 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -873,9 +873,10 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata,
 
  set_release_timer:
 
-                mod_timer(&tid_agg_rx->reorder_timer,
-                          tid_agg_rx->reorder_time[j] + 1 +
-                          HT_RX_REORDER_BUF_TIMEOUT);
+                if (!tid_agg_rx->removed)
+                        mod_timer(&tid_agg_rx->reorder_timer,
+                                  tid_agg_rx->reorder_time[j] + 1 +
+                                  HT_RX_REORDER_BUF_TIMEOUT);
         } else {
                 del_timer(&tid_agg_rx->reorder_timer);
         }
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 925e68fe64c7..fb0fc1302a58 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -175,6 +175,7 @@ struct tid_ampdu_tx {
  * @reorder_lock: serializes access to reorder buffer, see below.
  * @auto_seq: used for offloaded BA sessions to automatically pick head_seq_and
  *      and ssn.
+ * @removed: this session is removed (but might have been found due to RCU)
  *
  * This structure's lifetime is managed by RCU, assignments to
  * the array holding it must hold the aggregation mutex.
@@ -199,6 +200,7 @@ struct tid_ampdu_rx {
         u16 timeout;
         u8 dialog_token;
         bool auto_seq;
+        bool removed;
 };
 
 /**
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index ec2954ffc690..067a3fff1d2c 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -274,10 +274,8 @@ void ovs_vport_del(struct vport *vport)
         ASSERT_OVSL();
 
         hlist_del_rcu(&vport->hash_node);
-
-        vport->ops->destroy(vport);
-
         module_put(vport->ops->owner);
+        vport->ops->destroy(vport);
 }
 
 /**
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 612aa73bbc60..e6ce1517367f 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -303,9 +303,7 @@ static int rpc_client_register(struct rpc_clnt *clnt,
         struct super_block *pipefs_sb;
         int err;
 
-        err = rpc_clnt_debugfs_register(clnt);
-        if (err)
-                return err;
+        rpc_clnt_debugfs_register(clnt);
 
         pipefs_sb = rpc_get_sb_net(net);
         if (pipefs_sb) {
diff --git a/net/sunrpc/debugfs.c b/net/sunrpc/debugfs.c
index e811f390f9f6..82962f7e6e88 100644
--- a/net/sunrpc/debugfs.c
+++ b/net/sunrpc/debugfs.c
@@ -129,48 +129,52 @@ static const struct file_operations tasks_fops = {
         .release        = tasks_release,
 };
 
-int
+void
 rpc_clnt_debugfs_register(struct rpc_clnt *clnt)
 {
-        int len, err;
+        int len;
         char name[24]; /* enough for "../../rpc_xprt/ + 8 hex digits + NULL */
+        struct rpc_xprt *xprt;
 
         /* Already registered? */
-        if (clnt->cl_debugfs)
-                return 0;
+        if (clnt->cl_debugfs || !rpc_clnt_dir)
+                return;
 
         len = snprintf(name, sizeof(name), "%x", clnt->cl_clid);
         if (len >= sizeof(name))
-                return -EINVAL;
+                return;
 
         /* make the per-client dir */
         clnt->cl_debugfs = debugfs_create_dir(name, rpc_clnt_dir);
         if (!clnt->cl_debugfs)
-                return -ENOMEM;
+                return;
 
         /* make tasks file */
-        err = -ENOMEM;
         if (!debugfs_create_file("tasks", S_IFREG | S_IRUSR, clnt->cl_debugfs,
                                  clnt, &tasks_fops))
                 goto out_err;
 
-        err = -EINVAL;
         rcu_read_lock();
+        xprt = rcu_dereference(clnt->cl_xprt);
+        /* no "debugfs" dentry? Don't bother with the symlink. */
+        if (!xprt->debugfs) {
+                rcu_read_unlock();
+                return;
+        }
         len = snprintf(name, sizeof(name), "../../rpc_xprt/%s",
-                        rcu_dereference(clnt->cl_xprt)->debugfs->d_name.name);
+                        xprt->debugfs->d_name.name);
         rcu_read_unlock();
+
         if (len >= sizeof(name))
                 goto out_err;
 
-        err = -ENOMEM;
         if (!debugfs_create_symlink("xprt", clnt->cl_debugfs, name))
                 goto out_err;
 
-        return 0;
+        return;
 out_err:
         debugfs_remove_recursive(clnt->cl_debugfs);
         clnt->cl_debugfs = NULL;
-        return err;
 }
 
 void
@@ -226,33 +230,33 @@ static const struct file_operations xprt_info_fops = {
         .release        = xprt_info_release,
 };
 
-int
+void
 rpc_xprt_debugfs_register(struct rpc_xprt *xprt)
 {
         int len, id;
         static atomic_t cur_id;
         char            name[9]; /* 8 hex digits + NULL term */
 
+        if (!rpc_xprt_dir)
+                return;
+
         id = (unsigned int)atomic_inc_return(&cur_id);
 
         len = snprintf(name, sizeof(name), "%x", id);
         if (len >= sizeof(name))
-                return -EINVAL;
+                return;
 
         /* make the per-client dir */
         xprt->debugfs = debugfs_create_dir(name, rpc_xprt_dir);
         if (!xprt->debugfs)
-                return -ENOMEM;
+                return;
 
         /* make tasks file */
         if (!debugfs_create_file("info", S_IFREG | S_IRUSR, xprt->debugfs,
                                  xprt, &xprt_info_fops)) {
                 debugfs_remove_recursive(xprt->debugfs);
                 xprt->debugfs = NULL;
-                return -ENOMEM;
         }
-
-        return 0;
 }
 
 void
@@ -266,14 +270,17 @@ void __exit
 sunrpc_debugfs_exit(void)
 {
         debugfs_remove_recursive(topdir);
+        topdir = NULL;
+        rpc_clnt_dir = NULL;
+        rpc_xprt_dir = NULL;
 }
 
-int __init
+void __init
 sunrpc_debugfs_init(void)
 {
         topdir = debugfs_create_dir("sunrpc", NULL);
         if (!topdir)
-                goto out;
+                return;
 
         rpc_clnt_dir = debugfs_create_dir("rpc_clnt", topdir);
         if (!rpc_clnt_dir)
@@ -283,10 +290,9 @@ sunrpc_debugfs_init(void)
         if (!rpc_xprt_dir)
                 goto out_remove;
 
-        return 0;
+        return;
 out_remove:
         debugfs_remove_recursive(topdir);
         topdir = NULL;
-out:
-        return -ENOMEM;
+        rpc_clnt_dir = NULL;
 }
diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c
index e37fbed87956..ee5d3d253102 100644
--- a/net/sunrpc/sunrpc_syms.c
+++ b/net/sunrpc/sunrpc_syms.c
@@ -98,10 +98,7 @@ init_sunrpc(void)
         if (err)
                 goto out4;
 
-        err = sunrpc_debugfs_init();
-        if (err)
-                goto out5;
-
+        sunrpc_debugfs_init();
 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
         rpc_register_sysctl();
 #endif
@@ -109,8 +106,6 @@ init_sunrpc(void)
         init_socket_xprt();     /* clnt sock transport */
         return 0;
 
-out5:
-        unregister_rpc_pipefs();
 out4:
         unregister_pernet_subsys(&sunrpc_net_ops);
 out3:
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index e3015aede0d9..9949722d99ce 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1331,7 +1331,6 @@ static void xprt_init(struct rpc_xprt *xprt, struct net *net)
  */
 struct rpc_xprt *xprt_create_transport(struct xprt_create *args)
 {
-        int err;
         struct rpc_xprt *xprt;
         struct xprt_class *t;
 
@@ -1372,11 +1371,7 @@ found:
                 return ERR_PTR(-ENOMEM);
         }
 
-        err = rpc_xprt_debugfs_register(xprt);
-        if (err) {
-                xprt_destroy(xprt);
-                return ERR_PTR(err);
-        }
+        rpc_xprt_debugfs_register(xprt);
 
         dprintk("RPC:       created transport %p with %u slots\n", xprt,
                         xprt->max_reqs);
diff --git a/net/tipc/core.c b/net/tipc/core.c
index 935205e6bcfe..be1c9fa60b09 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -152,11 +152,11 @@ out_netlink:
 static void __exit tipc_exit(void)
 {
         tipc_bearer_cleanup();
+        unregister_pernet_subsys(&tipc_net_ops);
         tipc_netlink_stop();
         tipc_netlink_compat_stop();
         tipc_socket_stop();
         tipc_unregister_sysctl();
-        unregister_pernet_subsys(&tipc_net_ops);
 
         pr_info("Deactivated\n");
 }
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index dcc79aa0236b..3ba52da18bc6 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -47,6 +47,7 @@ source "sound/soc/kirkwood/Kconfig"
 source "sound/soc/intel/Kconfig"
 source "sound/soc/mxs/Kconfig"
 source "sound/soc/pxa/Kconfig"
+source "sound/soc/qcom/Kconfig"
 source "sound/soc/rockchip/Kconfig"
 source "sound/soc/samsung/Kconfig"
 source "sound/soc/sh/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 5b3c8f67c8db..974ba708b482 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_SND_SOC)	+= nuc900/
 obj-$(CONFIG_SND_SOC)   += omap/
 obj-$(CONFIG_SND_SOC)   += kirkwood/
 obj-$(CONFIG_SND_SOC)   += pxa/
+obj-$(CONFIG_SND_SOC)   += qcom/
 obj-$(CONFIG_SND_SOC)   += rockchip/
 obj-$(CONFIG_SND_SOC)   += samsung/
 obj-$(CONFIG_SND_SOC)   += sh/
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index 1579e994acf8..e7d08806f3e9 100644
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -25,7 +25,8 @@ config SND_ATMEL_SOC_SSC
 
 config SND_AT91_SOC_SAM9G20_WM8731
         tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
-        depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC
+        depends on ARCH_AT91 || COMPILE_TEST
+        depends on ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI
         select SND_ATMEL_SOC_PDC
         select SND_ATMEL_SOC_SSC
         select SND_SOC_WM8731
@@ -35,7 +36,8 @@ config SND_AT91_SOC_SAM9G20_WM8731
 
 config SND_ATMEL_SOC_WM8904
         tristate "Atmel ASoC driver for boards using WM8904 codec"
-        depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC && I2C
+        depends on ARCH_AT91 || COMPILE_TEST
+        depends on ATMEL_SSC && SND_ATMEL_SOC && I2C
         select SND_ATMEL_SOC_SSC
         select SND_ATMEL_SOC_DMA
         select SND_SOC_WM8904
@@ -45,7 +47,8 @@ config SND_ATMEL_SOC_WM8904
 
 config SND_AT91_SOC_SAM9X5_WM8731
         tristate "SoC Audio support for WM8731-based at91sam9x5 board"
-        depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC
+        depends on ARCH_AT91 || COMPILE_TEST
+        depends on ATMEL_SSC && SND_ATMEL_SOC && SND_SOC_I2C_AND_SPI
         select SND_ATMEL_SOC_SSC
         select SND_ATMEL_SOC_DMA
         select SND_SOC_WM8731
diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile
index 466a821da98c..b327e5cc8de3 100644
--- a/sound/soc/atmel/Makefile
+++ b/sound/soc/atmel/Makefile
@@ -1,10 +1,8 @@
 # AT91 Platform Support
-snd-soc-atmel-pcm-objs := atmel-pcm.o
 snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o
 snd-soc-atmel-pcm-dma-objs := atmel-pcm-dma.o
 snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o
 
-obj-$(CONFIG_SND_ATMEL_SOC) += snd-soc-atmel-pcm.o
 obj-$(CONFIG_SND_ATMEL_SOC_PDC) += snd-soc-atmel-pcm-pdc.o
 obj-$(CONFIG_SND_ATMEL_SOC_DMA) += snd-soc-atmel-pcm-dma.o
 obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c
index b8e7bad05eb1..b6625c8c411b 100644
--- a/sound/soc/atmel/atmel-pcm-dma.c
+++ b/sound/soc/atmel/atmel-pcm-dma.c
@@ -54,7 +54,7 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = {
         .period_bytes_max       = 2 * 0xffff,   /* if 2 bytes format */
         .periods_min            = 8,
         .periods_max            = 1024,         /* no limit */
-        .buffer_bytes_max       = ATMEL_SSC_DMABUF_SIZE,
+        .buffer_bytes_max       = 512 * 1024,
 };
 
 /**
@@ -119,7 +119,7 @@ static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream,
 static const struct snd_dmaengine_pcm_config atmel_dmaengine_pcm_config = {
         .prepare_slave_config = atmel_pcm_configure_dma,
         .pcm_hardware = &atmel_pcm_dma_hardware,
-        .prealloc_buffer_size = ATMEL_SSC_DMABUF_SIZE,
+        .prealloc_buffer_size = 64 * 1024,
 };
 
 int atmel_pcm_dma_platform_register(struct device *dev)
diff --git a/sound/soc/atmel/atmel-pcm-pdc.c b/sound/soc/atmel/atmel-pcm-pdc.c
index a366b3503c28..da861b44413f 100644
--- a/sound/soc/atmel/atmel-pcm-pdc.c
+++ b/sound/soc/atmel/atmel-pcm-pdc.c
@@ -47,6 +47,85 @@
 #include "atmel-pcm.h"
 
 
+static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm,
+        int stream)
+{
+        struct snd_pcm_substream *substream = pcm->streams[stream].substream;
+        struct snd_dma_buffer *buf = &substream->dma_buffer;
+        size_t size = ATMEL_SSC_DMABUF_SIZE;
+
+        buf->dev.type = SNDRV_DMA_TYPE_DEV;
+        buf->dev.dev = pcm->card->dev;
+        buf->private_data = NULL;
+        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 *)(long)buf->addr, size);
+
+        if (!buf->area)
+                return -ENOMEM;
+
+        buf->bytes = size;
+        return 0;
+}
+
+static int atmel_pcm_mmap(struct snd_pcm_substream *substream,
+        struct vm_area_struct *vma)
+{
+        return remap_pfn_range(vma, vma->vm_start,
+                       substream->dma_buffer.addr >> PAGE_SHIFT,
+                       vma->vm_end - vma->vm_start, vma->vm_page_prot);
+}
+
+static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_card *card = rtd->card->snd_card;
+        struct snd_pcm *pcm = rtd->pcm;
+        int ret;
+
+        ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));
+        if (ret)
+                return ret;
+
+        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
+                pr_debug("atmel-pcm: allocating PCM playback DMA buffer\n");
+                ret = atmel_pcm_preallocate_dma_buffer(pcm,
+                        SNDRV_PCM_STREAM_PLAYBACK);
+                if (ret)
+                        goto out;
+        }
+
+        if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
+                pr_debug("atmel-pcm: allocating PCM capture DMA buffer\n");
+                ret = atmel_pcm_preallocate_dma_buffer(pcm,
+                        SNDRV_PCM_STREAM_CAPTURE);
+                if (ret)
+                        goto out;
+        }
+ out:
+        return ret;
+}
+
+static void atmel_pcm_free(struct snd_pcm *pcm)
+{
+        struct snd_pcm_substream *substream;
+        struct snd_dma_buffer *buf;
+        int stream;
+
+        for (stream = 0; stream < 2; stream++) {
+                substream = pcm->streams[stream].substream;
+                if (!substream)
+                        continue;
+
+                buf = &substream->dma_buffer;
+                if (!buf->area)
+                        continue;
+                dma_free_coherent(pcm->card->dev, buf->bytes,
+                                  buf->area, buf->addr);
+                buf->area = NULL;
+        }
+}
+
 /*--------------------------------------------------------------------------*\
  * Hardware definition
 \*--------------------------------------------------------------------------*/
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
deleted file mode 100644
index 8ae3fa5ac60a..000000000000
--- a/sound/soc/atmel/atmel-pcm.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * atmel-pcm.c  --  ALSA PCM interface for the Atmel atmel SoC.
- *
- *  Copyright (C) 2005 SAN People
- *  Copyright (C) 2008 Atmel
- *
- * Authors: Sedji Gaouaou <sedji.gaouaou@atmel.com>
- *
- * Based on at91-pcm. by:
- * Frank Mandarino <fmandarino@endrelia.com>
- * Copyright 2006 Endrelia Technologies Inc.
- *
- * Based on pxa2xx-pcm.c by:
- *
- * Author:      Nicolas Pitre
- * Created:     Nov 30, 2004
- * Copyright:   (C) 2004 MontaVista Software, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <linux/module.h>
-#include <linux/dma-mapping.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-#include "atmel-pcm.h"
-
-static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm,
-        int stream)
-{
-        struct snd_pcm_substream *substream = pcm->streams[stream].substream;
-        struct snd_dma_buffer *buf = &substream->dma_buffer;
-        size_t size = ATMEL_SSC_DMABUF_SIZE;
-
-        buf->dev.type = SNDRV_DMA_TYPE_DEV;
-        buf->dev.dev = pcm->card->dev;
-        buf->private_data = NULL;
-        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 *)(long)buf->addr, size);
-
-        if (!buf->area)
-                return -ENOMEM;
-
-        buf->bytes = size;
-        return 0;
-}
-
-int atmel_pcm_mmap(struct snd_pcm_substream *substream,
-        struct vm_area_struct *vma)
-{
-        return remap_pfn_range(vma, vma->vm_start,
-                       substream->dma_buffer.addr >> PAGE_SHIFT,
-                       vma->vm_end - vma->vm_start, vma->vm_page_prot);
-}
-EXPORT_SYMBOL_GPL(atmel_pcm_mmap);
-
-int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_card *card = rtd->card->snd_card;
-        struct snd_pcm *pcm = rtd->pcm;
-        int ret;
-
-        ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));
-        if (ret)
-                return ret;
-
-        if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
-                pr_debug("atmel-pcm: allocating PCM playback DMA buffer\n");
-                ret = atmel_pcm_preallocate_dma_buffer(pcm,
-                        SNDRV_PCM_STREAM_PLAYBACK);
-                if (ret)
-                        goto out;
-        }
-
-        if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
-                pr_debug("atmel-pcm: allocating PCM capture DMA buffer\n");
-                ret = atmel_pcm_preallocate_dma_buffer(pcm,
-                        SNDRV_PCM_STREAM_CAPTURE);
-                if (ret)
-                        goto out;
-        }
- out:
-        return ret;
-}
-EXPORT_SYMBOL_GPL(atmel_pcm_new);
-
-void atmel_pcm_free(struct snd_pcm *pcm)
-{
-        struct snd_pcm_substream *substream;
-        struct snd_dma_buffer *buf;
-        int stream;
-
-        for (stream = 0; stream < 2; stream++) {
-                substream = pcm->streams[stream].substream;
-                if (!substream)
-                        continue;
-
-                buf = &substream->dma_buffer;
-                if (!buf->area)
-                        continue;
-                dma_free_coherent(pcm->card->dev, buf->bytes,
-                                  buf->area, buf->addr);
-                buf->area = NULL;
-        }
-}
-EXPORT_SYMBOL_GPL(atmel_pcm_free);
-
diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h
index 12ae814eff21..6eaf081cad50 100644
--- a/sound/soc/atmel/atmel-pcm.h
+++ b/sound/soc/atmel/atmel-pcm.h
@@ -83,11 +83,6 @@ struct atmel_pcm_dma_params {
 #define ssc_readx(base, reg)            (__raw_readl((base) + (reg)))
 #define ssc_writex(base, reg, value)    __raw_writel((value), (base) + (reg))
 
-int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd);
-void atmel_pcm_free(struct snd_pcm *pcm);
-int atmel_pcm_mmap(struct snd_pcm_substream *substream,
-                struct vm_area_struct *vma);
-
 #if defined(CONFIG_SND_ATMEL_SOC_PDC) || \
         defined(CONFIG_SND_ATMEL_SOC_PDC_MODULE)
 int atmel_pcm_pdc_platform_register(struct device *dev);
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 0bddd929837f..061c46587628 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -70,6 +70,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_MAX98090 if I2C
         select SND_SOC_MAX98095 if I2C
         select SND_SOC_MAX98357A if GPIOLIB
+        select SND_SOC_MAX98925 if I2C
         select SND_SOC_MAX9850 if I2C
         select SND_SOC_MAX9768 if I2C
         select SND_SOC_MAX9877 if I2C
@@ -461,6 +462,9 @@ config SND_SOC_MAX98095
 config SND_SOC_MAX98357A
        tristate
 
+config SND_SOC_MAX98925
+       tristate
+
 config SND_SOC_MAX9850
         tristate
 
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 7acb6c174cb4..abe2d7edf65c 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -65,6 +65,7 @@ snd-soc-max98088-objs := max98088.o
 snd-soc-max98090-objs := max98090.o
 snd-soc-max98095-objs := max98095.o
 snd-soc-max98357a-objs := max98357a.o
+snd-soc-max98925-objs := max98925.o
 snd-soc-max9850-objs := max9850.o
 snd-soc-mc13783-objs := mc13783.o
 snd-soc-ml26124-objs := ml26124.o
@@ -249,6 +250,7 @@ obj-$(CONFIG_SND_SOC_MAX98088)	+= snd-soc-max98088.o
 obj-$(CONFIG_SND_SOC_MAX98090)  += snd-soc-max98090.o
 obj-$(CONFIG_SND_SOC_MAX98095)  += snd-soc-max98095.o
 obj-$(CONFIG_SND_SOC_MAX98357A) += snd-soc-max98357a.o
+obj-$(CONFIG_SND_SOC_MAX98925)  += snd-soc-max98925.o
 obj-$(CONFIG_SND_SOC_MAX9850)   += snd-soc-max9850.o
 obj-$(CONFIG_SND_SOC_MC13783)   += snd-soc-mc13783.o
 obj-$(CONFIG_SND_SOC_ML26124)   += snd-soc-ml26124.o
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 7895689588da..88ca9cb0ce79 100644
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2003,7 +2003,6 @@ static int ab8500_audio_setup_mics(struct snd_soc_codec *codec,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(ab8500_audio_setup_mics);
 
 static int ab8500_audio_set_ear_cmv(struct snd_soc_codec *codec,
                                 enum ear_cm_voltage ear_cmv)
@@ -2036,7 +2035,6 @@ static int ab8500_audio_set_ear_cmv(struct snd_soc_codec *codec,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(ab8500_audio_set_ear_cmv);
 
 static int ab8500_audio_set_bit_delay(struct snd_soc_dai *dai,
                                 unsigned int delay)
diff --git a/sound/soc/codecs/ak4554.c b/sound/soc/codecs/ak4554.c
index 16ce9f9fefa1..298dedc05140 100644
--- a/sound/soc/codecs/ak4554.c
+++ b/sound/soc/codecs/ak4554.c
@@ -84,7 +84,7 @@ static int ak4554_soc_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id ak4554_of_match[] = {
+static const struct of_device_id ak4554_of_match[] = {
         { .compatible = "asahi-kasei,ak4554" },
         {},
 };
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index dde8b49c19ad..13585e88f597 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -97,6 +97,9 @@
 #define PMMP            (1 << 2) /* MPWR pin Power Management */
 #define MGAIN0          (1 << 0) /* MIC amp gain*/
 
+/* SG_SL2 */
+#define LOPS            (1 << 6) /* Stero Line-out Power Save Mode */
+
 /* TIMER */
 #define ZTM(param)      ((param & 0x3) << 4) /* ALC Zero Crossing TimeOut */
 #define WTM(param)      (((param & 0x4) << 4) | ((param & 0x3) << 2))
@@ -168,6 +171,29 @@ static const struct snd_kcontrol_new ak4642_lout_mixer_controls[] = {
         SOC_DAPM_SINGLE("DACL", SG_SL1, 4, 1, 0),
 };
 
+/* event handlers */
+static int ak4642_lout_event(struct snd_soc_dapm_widget *w,
+                             struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMD:
+        case SND_SOC_DAPM_PRE_PMU:
+                /* Power save mode ON */
+                snd_soc_update_bits(codec, SG_SL2, LOPS, LOPS);
+                break;
+        case SND_SOC_DAPM_POST_PMU:
+        case SND_SOC_DAPM_POST_PMD:
+                /* Power save mode OFF */
+                mdelay(300);
+                snd_soc_update_bits(codec, SG_SL2, LOPS, 0);
+                break;
+        }
+
+        return 0;
+}
+
 static const struct snd_soc_dapm_widget ak4642_dapm_widgets[] = {
 
         /* Outputs */
@@ -182,12 +208,15 @@ static const struct snd_soc_dapm_widget ak4642_dapm_widgets[] = {
 
         SND_SOC_DAPM_PGA("DACH", MD_CTL4, 0, 0, NULL, 0),
 
-        SND_SOC_DAPM_MIXER("LINEOUT Mixer", PW_MGMT1, 3, 0,
+        SND_SOC_DAPM_MIXER_E("LINEOUT Mixer", PW_MGMT1, 3, 0,
                            &ak4642_lout_mixer_controls[0],
-                           ARRAY_SIZE(ak4642_lout_mixer_controls)),
+                           ARRAY_SIZE(ak4642_lout_mixer_controls),
+                           ak4642_lout_event,
+                           SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
+                           SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),
 
         /* DAC */
-        SND_SOC_DAPM_DAC("DAC", "HiFi Playback", PW_MGMT1, 2, 0),
+        SND_SOC_DAPM_DAC("DAC", NULL, PW_MGMT1, 2, 0),
 };
 
 static const struct snd_soc_dapm_route ak4642_intercon[] = {
@@ -205,6 +234,8 @@ static const struct snd_soc_dapm_route ak4642_intercon[] = {
         {"DACH", NULL, "DAC"},
 
         {"LINEOUT Mixer", "DACL", "DAC"},
+
+        { "DAC", NULL, "Playback" },
 };
 
 /*
@@ -468,13 +499,13 @@ static struct snd_soc_dai_driver ak4642_dai = {
         .name = "ak4642-hifi",
         .playback = {
                 .stream_name = "Playback",
-                .channels_min = 1,
+                .channels_min = 2,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_48000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE },
         .capture = {
                 .stream_name = "Capture",
-                .channels_min = 1,
+                .channels_min = 2,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_48000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE },
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 29202610dd0d..9015b44a9e11 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1901,7 +1901,7 @@ static int arizona_is_enabled_fll(struct arizona_fll *fll)
 static int arizona_enable_fll(struct arizona_fll *fll)
 {
         struct arizona *arizona = fll->arizona;
-        int ret;
+        unsigned long time_left;
         bool use_sync = false;
         int already_enabled = arizona_is_enabled_fll(fll);
         struct arizona_fll_cfg cfg;
@@ -1977,9 +1977,9 @@ static int arizona_enable_fll(struct arizona_fll *fll)
                 regmap_update_bits_async(arizona->regmap, fll->base + 1,
                                          ARIZONA_FLL1_FREERUN, 0);
 
-        ret = wait_for_completion_timeout(&fll->ok,
+        time_left = wait_for_completion_timeout(&fll->ok,
                                           msecs_to_jiffies(250));
-        if (ret == 0)
+        if (time_left == 0)
                 arizona_fll_warn(fll, "Timed out waiting for lock\n");
 
         return 0;
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 7d3a6accaf9a..e770ee6f36da 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -561,10 +561,10 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec)
         if (gpio_is_valid(cs4271->gpio_nreset)) {
                 /* Reset codec */
                 gpio_direction_output(cs4271->gpio_nreset, 0);
-                udelay(1);
+                mdelay(1);
                 gpio_set_value(cs4271->gpio_nreset, 1);
                 /* Give the codec time to wake up */
-                udelay(1);
+                mdelay(1);
         }
 
         ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index 0b10979513c4..0f334bc1b63c 100644
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -420,7 +420,7 @@ static int cx20442_platform_probe(struct platform_device *pdev)
                         &cx20442_codec_dev, &cx20442_dai, 1);
 }
 
-static int __exit cx20442_platform_remove(struct platform_device *pdev)
+static int cx20442_platform_remove(struct platform_device *pdev)
 {
         snd_soc_unregister_codec(&pdev->dev);
         return 0;
@@ -431,7 +431,7 @@ static struct platform_driver cx20442_platform_driver = {
                 .name = "cx20442-codec",
                 },
         .probe = cx20442_platform_probe,
-        .remove = __exit_p(cx20442_platform_remove),
+        .remove = cx20442_platform_remove,
 };
 
 module_platform_driver(cx20442_platform_driver);
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index b112b1c2c394..3e33ef2acf3c 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2605,8 +2605,24 @@ err_enable:
         return ret;
 }
 
+static void max98090_i2c_shutdown(struct i2c_client *i2c)
+{
+        struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev);
+
+        /*
+         * Enable volume smoothing, disable zero cross.  This will cause
+         * a quick 40ms ramp to mute on shutdown.
+         */
+        regmap_write(max98090->regmap,
+                M98090_REG_LEVEL_CONTROL, M98090_VSENN_MASK);
+        regmap_write(max98090->regmap,
+                M98090_REG_DEVICE_SHUTDOWN, 0x00);
+        msleep(40);
+}
+
 static int max98090_i2c_remove(struct i2c_client *client)
 {
+        max98090_i2c_shutdown(client);
         snd_soc_unregister_codec(&client->dev);
         return 0;
 }
@@ -2696,6 +2712,7 @@ static struct i2c_driver max98090_i2c_driver = {
                 .acpi_match_table = ACPI_PTR(max98090_acpi_match),
         },
         .probe  = max98090_i2c_probe,
+        .shutdown = max98090_i2c_shutdown,
         .remove = max98090_i2c_remove,
         .id_table = max98090_i2c_id,
 };
diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c
new file mode 100644
index 000000000000..9b5a17de4690
--- /dev/null
+++ b/sound/soc/codecs/max98925.c
@@ -0,0 +1,655 @@
+/*
+ * max98925.c -- ALSA SoC Stereo MAX98925 driver
+ * Copyright 2013-15 Maxim Integrated Products
+ * 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.
+ */
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/cdev.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+#include "max98925.h"
+
+static const char *const dai_text[] = {
+        "Left", "Right", "LeftRight", "LeftRightDiv2",
+};
+
+static const char * const max98925_boost_voltage_text[] = {
+        "8.5V", "8.25V", "8.0V", "7.75V", "7.5V", "7.25V", "7.0V", "6.75V",
+        "6.5V", "6.5V", "6.5V", "6.5V", "6.5V", "6.5V", "6.5V", "6.5V"
+};
+
+static SOC_ENUM_SINGLE_DECL(max98925_boost_voltage,
+        MAX98925_CONFIGURATION, M98925_BST_VOUT_SHIFT,
+        max98925_boost_voltage_text);
+
+static const char *const hpf_text[] = {
+        "Disable", "DC Block", "100Hz", "200Hz", "400Hz", "800Hz",
+};
+
+static const struct reg_default max98925_reg[] = {
+        { 0x0B, 0x00 }, /* IRQ Enable0 */
+        { 0x0C, 0x00 }, /* IRQ Enable1 */
+        { 0x0D, 0x00 }, /* IRQ Enable2 */
+        { 0x0E, 0x00 }, /* IRQ Clear0 */
+        { 0x0F, 0x00 }, /* IRQ Clear1 */
+        { 0x10, 0x00 }, /* IRQ Clear2 */
+        { 0x11, 0xC0 }, /* Map0 */
+        { 0x12, 0x00 }, /* Map1 */
+        { 0x13, 0x00 }, /* Map2 */
+        { 0x14, 0xF0 }, /* Map3 */
+        { 0x15, 0x00 }, /* Map4 */
+        { 0x16, 0xAB }, /* Map5 */
+        { 0x17, 0x89 }, /* Map6 */
+        { 0x18, 0x00 }, /* Map7 */
+        { 0x19, 0x00 }, /* Map8 */
+        { 0x1A, 0x06 }, /* DAI Clock Mode 1 */
+        { 0x1B, 0xC0 }, /* DAI Clock Mode 2 */
+        { 0x1C, 0x00 }, /* DAI Clock Divider Denominator MSBs */
+        { 0x1D, 0x00 }, /* DAI Clock Divider Denominator LSBs */
+        { 0x1E, 0xF0 }, /* DAI Clock Divider Numerator MSBs */
+        { 0x1F, 0x00 }, /* DAI Clock Divider Numerator LSBs */
+        { 0x20, 0x50 }, /* Format */
+        { 0x21, 0x00 }, /* TDM Slot Select */
+        { 0x22, 0x00 }, /* DOUT Configuration VMON */
+        { 0x23, 0x00 }, /* DOUT Configuration IMON */
+        { 0x24, 0x00 }, /* DOUT Configuration VBAT */
+        { 0x25, 0x00 }, /* DOUT Configuration VBST */
+        { 0x26, 0x00 }, /* DOUT Configuration FLAG */
+        { 0x27, 0xFF }, /* DOUT HiZ Configuration 1 */
+        { 0x28, 0xFF }, /* DOUT HiZ Configuration 2 */
+        { 0x29, 0xFF }, /* DOUT HiZ Configuration 3 */
+        { 0x2A, 0xFF }, /* DOUT HiZ Configuration 4 */
+        { 0x2B, 0x02 }, /* DOUT Drive Strength */
+        { 0x2C, 0x90 }, /* Filters */
+        { 0x2D, 0x00 }, /* Gain */
+        { 0x2E, 0x02 }, /* Gain Ramping */
+        { 0x2F, 0x00 }, /* Speaker Amplifier */
+        { 0x30, 0x0A }, /* Threshold */
+        { 0x31, 0x00 }, /* ALC Attack */
+        { 0x32, 0x80 }, /* ALC Atten and Release */
+        { 0x33, 0x00 }, /* ALC Infinite Hold Release */
+        { 0x34, 0x92 }, /* ALC Configuration */
+        { 0x35, 0x01 }, /* Boost Converter */
+        { 0x36, 0x00 }, /* Block Enable */
+        { 0x37, 0x00 }, /* Configuration */
+        { 0x38, 0x00 }, /* Global Enable */
+        { 0x3A, 0x00 }, /* Boost Limiter */
+};
+
+static const struct soc_enum max98925_dai_enum =
+        SOC_ENUM_SINGLE(MAX98925_GAIN, 5, ARRAY_SIZE(dai_text), dai_text);
+
+static const struct soc_enum max98925_hpf_enum =
+        SOC_ENUM_SINGLE(MAX98925_FILTERS, 0, ARRAY_SIZE(hpf_text), hpf_text);
+
+static const struct snd_kcontrol_new max98925_hpf_sel_mux =
+        SOC_DAPM_ENUM("Rc Filter MUX Mux", max98925_hpf_enum);
+
+static const struct snd_kcontrol_new max98925_dai_sel_mux =
+        SOC_DAPM_ENUM("DAI IN MUX Mux", max98925_dai_enum);
+
+static int max98925_dac_event(struct snd_soc_dapm_widget *w,
+                struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+        struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);
+
+        switch (event) {
+        case SND_SOC_DAPM_PRE_PMU:
+                regmap_update_bits(max98925->regmap,
+                        MAX98925_BLOCK_ENABLE,
+                        M98925_BST_EN_MASK |
+                        M98925_ADC_IMON_EN_MASK | M98925_ADC_VMON_EN_MASK,
+                        M98925_BST_EN_MASK |
+                        M98925_ADC_IMON_EN_MASK | M98925_ADC_VMON_EN_MASK);
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                regmap_update_bits(max98925->regmap,
+                        MAX98925_BLOCK_ENABLE, M98925_BST_EN_MASK |
+                        M98925_ADC_IMON_EN_MASK | M98925_ADC_VMON_EN_MASK, 0);
+                break;
+        default:
+                return 0;
+        }
+        return 0;
+}
+
+static const struct snd_soc_dapm_widget max98925_dapm_widgets[] = {
+        SND_SOC_DAPM_AIF_IN("DAI_OUT", "HiFi Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_MUX("DAI IN MUX", SND_SOC_NOPM, 0, 0,
+                                &max98925_dai_sel_mux),
+        SND_SOC_DAPM_MUX("Rc Filter MUX", SND_SOC_NOPM, 0, 0,
+                                &max98925_hpf_sel_mux),
+        SND_SOC_DAPM_DAC_E("Amp Enable", NULL, MAX98925_BLOCK_ENABLE,
+                        M98925_SPK_EN_SHIFT, 0, max98925_dac_event,
+                        SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+        SND_SOC_DAPM_SUPPLY("Global Enable", MAX98925_GLOBAL_ENABLE,
+                        M98925_EN_SHIFT, 0, NULL, 0),
+        SND_SOC_DAPM_OUTPUT("BE_OUT"),
+};
+
+static const struct snd_soc_dapm_route max98925_audio_map[] = {
+        {"DAI IN MUX", "Left", "DAI_OUT"},
+        {"DAI IN MUX", "Right", "DAI_OUT"},
+        {"DAI IN MUX", "LeftRight", "DAI_OUT"},
+        {"DAI IN MUX", "LeftRightDiv2", "DAI_OUT"},
+        {"Rc Filter MUX", "Disable", "DAI IN MUX"},
+        {"Rc Filter MUX", "DC Block", "DAI IN MUX"},
+        {"Rc Filter MUX", "100Hz", "DAI IN MUX"},
+        {"Rc Filter MUX", "200Hz", "DAI IN MUX"},
+        {"Rc Filter MUX", "400Hz", "DAI IN MUX"},
+        {"Rc Filter MUX", "800Hz", "DAI IN MUX"},
+        {"Amp Enable", NULL, "Rc Filter MUX"},
+        {"BE_OUT", NULL, "Amp Enable"},
+        {"BE_OUT", NULL, "Global Enable"},
+};
+
+static bool max98925_volatile_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case MAX98925_VBAT_DATA:
+        case MAX98925_VBST_DATA:
+        case MAX98925_LIVE_STATUS0:
+        case MAX98925_LIVE_STATUS1:
+        case MAX98925_LIVE_STATUS2:
+        case MAX98925_STATE0:
+        case MAX98925_STATE1:
+        case MAX98925_STATE2:
+        case MAX98925_FLAG0:
+        case MAX98925_FLAG1:
+        case MAX98925_FLAG2:
+        case MAX98925_REV_VERSION:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static bool max98925_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case MAX98925_IRQ_CLEAR0:
+        case MAX98925_IRQ_CLEAR1:
+        case MAX98925_IRQ_CLEAR2:
+        case MAX98925_ALC_HOLD_RLS:
+                return false;
+        default:
+                return true;
+        }
+}
+
+static DECLARE_TLV_DB_SCALE(max98925_spk_tlv, -600, 100, 0);
+
+static const struct snd_kcontrol_new max98925_snd_controls[] = {
+        SOC_SINGLE_TLV("Speaker Volume", MAX98925_GAIN,
+                M98925_SPK_GAIN_SHIFT, (1<<M98925_SPK_GAIN_WIDTH)-1, 0,
+                max98925_spk_tlv),
+        SOC_SINGLE("Ramp Switch", MAX98925_GAIN_RAMPING,
+                                M98925_SPK_RMP_EN_SHIFT, 1, 0),
+        SOC_SINGLE("ZCD Switch", MAX98925_GAIN_RAMPING,
+                                M98925_SPK_ZCD_EN_SHIFT, 1, 0),
+        SOC_SINGLE("ALC Switch", MAX98925_THRESHOLD,
+                                M98925_ALC_EN_SHIFT, 1, 0),
+        SOC_SINGLE("ALC Threshold", MAX98925_THRESHOLD, M98925_ALC_TH_SHIFT,
+                                (1<<M98925_ALC_TH_WIDTH)-1, 0),
+        SOC_ENUM("Boost Output Voltage", max98925_boost_voltage),
+};
+
+/* codec sample rate and n/m dividers parameter table */
+static const struct {
+        int rate;
+        int  sr;
+        int divisors[3][2];
+} rate_table[] = {
+        {
+                .rate = 8000,
+                .sr = 0,
+                .divisors = { {1, 375}, {5, 1764}, {1, 384} }
+        },
+        {
+                .rate = 11025,
+                .sr = 1,
+                .divisors = { {147, 40000}, {1, 256}, {147, 40960} }
+        },
+        {
+                .rate = 12000,
+                .sr = 2,
+                .divisors = { {1, 250}, {5, 1176}, {1, 256} }
+        },
+        {
+                .rate = 16000,
+                .sr = 3,
+                .divisors = { {2, 375}, {5, 882}, {1, 192} }
+        },
+        {
+                .rate = 22050,
+                .sr = 4,
+                .divisors = { {147, 20000}, {1, 128}, {147, 20480} }
+        },
+        {
+                .rate = 24000,
+                .sr = 5,
+                .divisors = { {1, 125}, {5, 588}, {1, 128} }
+        },
+        {
+                .rate = 32000,
+                .sr = 6,
+                .divisors = { {4, 375}, {5, 441}, {1, 96} }
+        },
+        {
+                .rate = 44100,
+                .sr = 7,
+                .divisors = { {147, 10000}, {1, 64}, {147, 10240} }
+        },
+        {
+                .rate = 48000,
+                .sr = 8,
+                .divisors = { {2, 125}, {5, 294}, {1, 64} }
+        },
+};
+
+static inline int max98925_rate_value(struct snd_soc_codec *codec,
+                int rate, int clock, int *value, int *n, int *m)
+{
+        int ret = -EINVAL;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(rate_table); i++) {
+                if (rate_table[i].rate >= rate) {
+                        *value = rate_table[i].sr;
+                        *n = rate_table[i].divisors[clock][0];
+                        *m = rate_table[i].divisors[clock][1];
+                        ret = 0;
+                        break;
+                }
+        }
+        dev_dbg(codec->dev, "%s: sample rate is %d, returning %d\n",
+                                __func__, rate_table[i].rate, *value);
+        return ret;
+}
+
+static void max98925_set_sense_data(struct max98925_priv *max98925)
+{
+        /* set VMON slots */
+        regmap_update_bits(max98925->regmap,
+                MAX98925_DOUT_CFG_VMON,
+                M98925_DAI_VMON_EN_MASK, M98925_DAI_VMON_EN_MASK);
+        regmap_update_bits(max98925->regmap,
+                MAX98925_DOUT_CFG_VMON,
+                M98925_DAI_VMON_SLOT_MASK,
+                max98925->v_slot << M98925_DAI_VMON_SLOT_SHIFT);
+        /* set IMON slots */
+        regmap_update_bits(max98925->regmap,
+                MAX98925_DOUT_CFG_IMON,
+                M98925_DAI_IMON_EN_MASK, M98925_DAI_IMON_EN_MASK);
+        regmap_update_bits(max98925->regmap,
+                MAX98925_DOUT_CFG_IMON,
+                M98925_DAI_IMON_SLOT_MASK,
+                max98925->i_slot << M98925_DAI_IMON_SLOT_SHIFT);
+}
+
+static int max98925_dai_set_fmt(struct snd_soc_dai *codec_dai,
+                                 unsigned int fmt)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);
+        unsigned int invert = 0;
+
+        dev_dbg(codec->dev, "%s: fmt 0x%08X\n", __func__, fmt);
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBS_CFS:
+                /* set DAI to slave mode */
+                regmap_update_bits(max98925->regmap,
+                        MAX98925_DAI_CLK_MODE2,
+                        M98925_DAI_MAS_MASK, 0);
+                max98925_set_sense_data(max98925);
+                break;
+        case SND_SOC_DAIFMT_CBM_CFM:
+                /*
+                 * set left channel DAI to master mode,
+                 * right channel always slave
+                 */
+                regmap_update_bits(max98925->regmap,
+                        MAX98925_DAI_CLK_MODE2,
+                        M98925_DAI_MAS_MASK, M98925_DAI_MAS_MASK);
+                break;
+        case SND_SOC_DAIFMT_CBS_CFM:
+        case SND_SOC_DAIFMT_CBM_CFS:
+        default:
+                dev_err(codec->dev, "DAI clock mode unsupported");
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                break;
+        case SND_SOC_DAIFMT_NB_IF:
+                invert = M98925_DAI_WCI_MASK;
+                break;
+        case SND_SOC_DAIFMT_IB_NF:
+                invert = M98925_DAI_BCI_MASK;
+                break;
+        case SND_SOC_DAIFMT_IB_IF:
+                invert = M98925_DAI_BCI_MASK | M98925_DAI_WCI_MASK;
+                break;
+        default:
+                dev_err(codec->dev, "DAI invert mode unsupported");
+                return -EINVAL;
+        }
+
+        regmap_update_bits(max98925->regmap, MAX98925_FORMAT,
+                        M98925_DAI_BCI_MASK, invert);
+        return 0;
+}
+
+static int max98925_set_clock(struct max98925_priv *max98925,
+                struct snd_pcm_hw_params *params)
+{
+        unsigned int dai_sr = 0, clock, mdll, n, m;
+        struct snd_soc_codec *codec = max98925->codec;
+        int rate = params_rate(params);
+        /* BCLK/LRCLK ratio calculation */
+        int blr_clk_ratio = params_channels(params) * max98925->ch_size;
+
+        switch (blr_clk_ratio) {
+        case 32:
+                regmap_update_bits(max98925->regmap,
+                        MAX98925_DAI_CLK_MODE2,
+                        M98925_DAI_BSEL_MASK, M98925_DAI_BSEL_32);
+                break;
+        case 48:
+                regmap_update_bits(max98925->regmap,
+                        MAX98925_DAI_CLK_MODE2,
+                        M98925_DAI_BSEL_MASK, M98925_DAI_BSEL_48);
+                break;
+        case 64:
+                regmap_update_bits(max98925->regmap,
+                        MAX98925_DAI_CLK_MODE2,
+                        M98925_DAI_BSEL_MASK, M98925_DAI_BSEL_64);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (max98925->sysclk) {
+        case 6000000:
+                clock = 0;
+                mdll  = M98925_MDLL_MULT_MCLKx16;
+                break;
+        case 11289600:
+                clock = 1;
+                mdll  = M98925_MDLL_MULT_MCLKx8;
+                break;
+        case 12000000:
+                clock = 0;
+                mdll  = M98925_MDLL_MULT_MCLKx8;
+                break;
+        case 12288000:
+                clock = 2;
+                mdll  = M98925_MDLL_MULT_MCLKx8;
+                break;
+        default:
+                dev_info(max98925->codec->dev, "unsupported sysclk %d\n",
+                                        max98925->sysclk);
+                return -EINVAL;
+        }
+
+        if (max98925_rate_value(codec, rate, clock, &dai_sr, &n, &m))
+                return -EINVAL;
+
+        /* set DAI_SR to correct LRCLK frequency */
+        regmap_update_bits(max98925->regmap,
+                        MAX98925_DAI_CLK_MODE2,
+                        M98925_DAI_SR_MASK, dai_sr << M98925_DAI_SR_SHIFT);
+        /* set DAI m divider */
+        regmap_write(max98925->regmap,
+                MAX98925_DAI_CLK_DIV_M_MSBS, m >> 8);
+        regmap_write(max98925->regmap,
+                MAX98925_DAI_CLK_DIV_M_LSBS, m & 0xFF);
+        /* set DAI n divider */
+        regmap_write(max98925->regmap,
+                MAX98925_DAI_CLK_DIV_N_MSBS, n >> 8);
+        regmap_write(max98925->regmap,
+                MAX98925_DAI_CLK_DIV_N_LSBS, n & 0xFF);
+        /* set MDLL */
+        regmap_update_bits(max98925->regmap, MAX98925_DAI_CLK_MODE1,
+                        M98925_MDLL_MULT_MASK, mdll << M98925_MDLL_MULT_SHIFT);
+        return 0;
+}
+
+static int max98925_dai_hw_params(struct snd_pcm_substream *substream,
+                                   struct snd_pcm_hw_params *params,
+                                   struct snd_soc_dai *dai)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);
+
+        switch (snd_pcm_format_width(params_format(params))) {
+        case 16:
+                regmap_update_bits(max98925->regmap,
+                                MAX98925_FORMAT,
+                                M98925_DAI_CHANSZ_MASK, M98925_DAI_CHANSZ_16);
+                max98925->ch_size = 16;
+                break;
+        case 24:
+                regmap_update_bits(max98925->regmap,
+                                MAX98925_FORMAT,
+                                M98925_DAI_CHANSZ_MASK, M98925_DAI_CHANSZ_24);
+                max98925->ch_size = 24;
+                break;
+        case 32:
+                regmap_update_bits(max98925->regmap,
+                                MAX98925_FORMAT,
+                                M98925_DAI_CHANSZ_MASK, M98925_DAI_CHANSZ_32);
+                max98925->ch_size = 32;
+                break;
+        default:
+                pr_err("%s: format unsupported %d",
+                                __func__, params_format(params));
+                return -EINVAL;
+        }
+        dev_dbg(codec->dev, "%s: format supported %d",
+                                __func__, params_format(params));
+        return max98925_set_clock(max98925, params);
+}
+
+static int max98925_dai_set_sysclk(struct snd_soc_dai *dai,
+                                   int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);
+
+        switch (clk_id) {
+        case 0:
+                /* use MCLK for Left channel, right channel always BCLK */
+                regmap_update_bits(max98925->regmap,
+                                MAX98925_DAI_CLK_MODE1,
+                                M98925_DAI_CLK_SOURCE_MASK, 0);
+                break;
+        case 1:
+                /* configure dai clock source to BCLK instead of MCLK */
+                regmap_update_bits(max98925->regmap,
+                                MAX98925_DAI_CLK_MODE1,
+                                M98925_DAI_CLK_SOURCE_MASK,
+                                M98925_DAI_CLK_SOURCE_MASK);
+                break;
+        default:
+                return -EINVAL;
+        }
+        max98925->sysclk = freq;
+        return 0;
+}
+
+#define MAX98925_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
+                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
+
+static const struct snd_soc_dai_ops max98925_dai_ops = {
+        .set_sysclk = max98925_dai_set_sysclk,
+        .set_fmt = max98925_dai_set_fmt,
+        .hw_params = max98925_dai_hw_params,
+};
+
+static struct snd_soc_dai_driver max98925_dai[] = {
+        {
+                .name = "max98925-aif1",
+                .playback = {
+                        .stream_name = "HiFi Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_48000,
+                        .formats = MAX98925_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "HiFi Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = SNDRV_PCM_RATE_8000_48000,
+                        .formats = MAX98925_FORMATS,
+                },
+                .ops = &max98925_dai_ops,
+        }
+};
+
+static int max98925_probe(struct snd_soc_codec *codec)
+{
+        struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);
+
+        max98925->codec = codec;
+        codec->control_data = max98925->regmap;
+        regmap_write(max98925->regmap, MAX98925_GLOBAL_ENABLE, 0x00);
+        /* It's not the default but we need to set DAI_DLY */
+        regmap_write(max98925->regmap,
+                        MAX98925_FORMAT, M98925_DAI_DLY_MASK);
+        regmap_write(max98925->regmap, MAX98925_TDM_SLOT_SELECT, 0xC8);
+        regmap_write(max98925->regmap, MAX98925_DOUT_HIZ_CFG1, 0xFF);
+        regmap_write(max98925->regmap, MAX98925_DOUT_HIZ_CFG2, 0xFF);
+        regmap_write(max98925->regmap, MAX98925_DOUT_HIZ_CFG3, 0xFF);
+        regmap_write(max98925->regmap, MAX98925_DOUT_HIZ_CFG4, 0xF0);
+        regmap_write(max98925->regmap, MAX98925_FILTERS, 0xD8);
+        regmap_write(max98925->regmap, MAX98925_ALC_CONFIGURATION, 0xF8);
+        regmap_write(max98925->regmap, MAX98925_CONFIGURATION, 0xF0);
+        /* Disable ALC muting */
+        regmap_write(max98925->regmap, MAX98925_BOOST_LIMITER, 0xF8);
+        return 0;
+}
+
+static const struct snd_soc_codec_driver soc_codec_dev_max98925 = {
+        .probe            = max98925_probe,
+        .controls = max98925_snd_controls,
+        .num_controls = ARRAY_SIZE(max98925_snd_controls),
+        .dapm_routes = max98925_audio_map,
+        .num_dapm_routes = ARRAY_SIZE(max98925_audio_map),
+        .dapm_widgets = max98925_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(max98925_dapm_widgets),
+};
+
+static const struct regmap_config max98925_regmap = {
+        .reg_bits         = 8,
+        .val_bits         = 8,
+        .max_register     = MAX98925_REV_VERSION,
+        .reg_defaults     = max98925_reg,
+        .num_reg_defaults = ARRAY_SIZE(max98925_reg),
+        .volatile_reg     = max98925_volatile_register,
+        .readable_reg     = max98925_readable_register,
+        .cache_type       = REGCACHE_RBTREE,
+};
+
+static int max98925_i2c_probe(struct i2c_client *i2c,
+                             const struct i2c_device_id *id)
+{
+        int ret, reg;
+        u32 value;
+        struct max98925_priv *max98925;
+
+        max98925 = devm_kzalloc(&i2c->dev,
+                        sizeof(*max98925), GFP_KERNEL);
+        if (!max98925)
+                return -ENOMEM;
+
+        i2c_set_clientdata(i2c, max98925);
+        max98925->regmap = devm_regmap_init_i2c(i2c, &max98925_regmap);
+        if (IS_ERR(max98925->regmap)) {
+                ret = PTR_ERR(max98925->regmap);
+                dev_err(&i2c->dev,
+                                "Failed to allocate regmap: %d\n", ret);
+                goto err_out;
+        }
+
+        if (!of_property_read_u32(i2c->dev.of_node, "vmon-slot-no", &value)) {
+                if (value > M98925_DAI_VMON_SLOT_1E_1F) {
+                        dev_err(&i2c->dev, "vmon slot number is wrong:\n");
+                        return -EINVAL;
+                }
+                max98925->v_slot = value;
+        }
+        if (!of_property_read_u32(i2c->dev.of_node, "imon-slot-no", &value)) {
+                if (value > M98925_DAI_IMON_SLOT_1E_1F) {
+                        dev_err(&i2c->dev, "imon slot number is wrong:\n");
+                        return -EINVAL;
+                }
+                max98925->i_slot = value;
+        }
+        ret = regmap_read(max98925->regmap,
+                        MAX98925_REV_VERSION, &reg);
+        if ((ret < 0) ||
+                ((reg != MAX98925_VERSION) &&
+                (reg != MAX98925_VERSION1))) {
+                dev_err(&i2c->dev,
+                        "device initialization error (%d 0x%02X)\n",
+                        ret, reg);
+                goto err_out;
+        }
+        dev_info(&i2c->dev, "device version 0x%02X\n", reg);
+
+        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98925,
+                        max98925_dai, ARRAY_SIZE(max98925_dai));
+        if (ret < 0)
+                dev_err(&i2c->dev,
+                                "Failed to register codec: %d\n", ret);
+err_out:
+        return ret;
+}
+
+static int max98925_i2c_remove(struct i2c_client *client)
+{
+        snd_soc_unregister_codec(&client->dev);
+        return 0;
+}
+
+static const struct i2c_device_id max98925_i2c_id[] = {
+        { "max98925", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, max98925_i2c_id);
+
+static const struct of_device_id max98925_of_match[] = {
+        { .compatible = "maxim,max98925", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, max98925_of_match);
+
+static struct i2c_driver max98925_i2c_driver = {
+        .driver = {
+                .name = "max98925",
+                .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(max98925_of_match),
+                .pm = NULL,
+        },
+        .probe  = max98925_i2c_probe,
+        .remove = max98925_i2c_remove,
+        .id_table = max98925_i2c_id,
+};
+
+module_i2c_driver(max98925_i2c_driver)
+
+MODULE_DESCRIPTION("ALSA SoC MAX98925 driver");
+MODULE_AUTHOR("Ralph Birt <rdbirt@gmail.com>, Anish kumar <anish.kumar@maximintegrated.com>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/max98925.h b/sound/soc/codecs/max98925.h
new file mode 100644
index 000000000000..3783248f2780
--- /dev/null
+++ b/sound/soc/codecs/max98925.h
@@ -0,0 +1,832 @@
+/*
+ * max98925.h -- MAX98925 ALSA SoC Audio driver
+ *
+ * Copyright 2013-2015 Maxim Integrated Products
+ *
+ * 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 _MAX98925_H
+#define _MAX98925_H
+
+#define MAX98925_VERSION        0x51
+#define MAX98925_VERSION1       0x80
+#define MAX98925_VBAT_DATA              0x00
+#define MAX98925_VBST_DATA              0x01
+#define MAX98925_LIVE_STATUS0           0x02
+#define MAX98925_LIVE_STATUS1           0x03
+#define MAX98925_LIVE_STATUS2           0x04
+#define MAX98925_STATE0                 0x05
+#define MAX98925_STATE1                 0x06
+#define MAX98925_STATE2                 0x07
+#define MAX98925_FLAG0                  0x08
+#define MAX98925_FLAG1                  0x09
+#define MAX98925_FLAG2                  0x0A
+#define MAX98925_IRQ_ENABLE0            0x0B
+#define MAX98925_IRQ_ENABLE1            0x0C
+#define MAX98925_IRQ_ENABLE2            0x0D
+#define MAX98925_IRQ_CLEAR0             0x0E
+#define MAX98925_IRQ_CLEAR1             0x0F
+#define MAX98925_IRQ_CLEAR2             0x10
+#define MAX98925_MAP0                   0x11
+#define MAX98925_MAP1                   0x12
+#define MAX98925_MAP2                   0x13
+#define MAX98925_MAP3                   0x14
+#define MAX98925_MAP4                   0x15
+#define MAX98925_MAP5                   0x16
+#define MAX98925_MAP6                   0x17
+#define MAX98925_MAP7                   0x18
+#define MAX98925_MAP8                   0x19
+#define MAX98925_DAI_CLK_MODE1          0x1A
+#define MAX98925_DAI_CLK_MODE2          0x1B
+#define MAX98925_DAI_CLK_DIV_M_MSBS     0x1C
+#define MAX98925_DAI_CLK_DIV_M_LSBS     0x1D
+#define MAX98925_DAI_CLK_DIV_N_MSBS     0x1E
+#define MAX98925_DAI_CLK_DIV_N_LSBS     0x1F
+#define MAX98925_FORMAT                 0x20
+#define MAX98925_TDM_SLOT_SELECT        0x21
+#define MAX98925_DOUT_CFG_VMON          0x22
+#define MAX98925_DOUT_CFG_IMON          0x23
+#define MAX98925_DOUT_CFG_VBAT          0x24
+#define MAX98925_DOUT_CFG_VBST          0x25
+#define MAX98925_DOUT_CFG_FLAG          0x26
+#define MAX98925_DOUT_HIZ_CFG1          0x27
+#define MAX98925_DOUT_HIZ_CFG2          0x28
+#define MAX98925_DOUT_HIZ_CFG3          0x29
+#define MAX98925_DOUT_HIZ_CFG4          0x2A
+#define MAX98925_DOUT_DRV_STRENGTH      0x2B
+#define MAX98925_FILTERS                0x2C
+#define MAX98925_GAIN                   0x2D
+#define MAX98925_GAIN_RAMPING           0x2E
+#define MAX98925_SPK_AMP                0x2F
+#define MAX98925_THRESHOLD              0x30
+#define MAX98925_ALC_ATTACK             0x31
+#define MAX98925_ALC_ATTEN_RLS          0x32
+#define MAX98925_ALC_HOLD_RLS           0x33
+#define MAX98925_ALC_CONFIGURATION      0x34
+#define MAX98925_BOOST_CONVERTER        0x35
+#define MAX98925_BLOCK_ENABLE           0x36
+#define MAX98925_CONFIGURATION          0x37
+#define MAX98925_GLOBAL_ENABLE          0x38
+#define MAX98925_BOOST_LIMITER          0x3A
+#define MAX98925_REV_VERSION            0xFF
+
+#define MAX98925_REG_CNT               (MAX98925_R03A_BOOST_LIMITER+1)
+
+/* MAX98925 Register Bit Fields */
+
+/* MAX98925_R002_LIVE_STATUS0 */
+#define M98925_THERMWARN_STATUS_MASK                    (1<<3)
+#define M98925_THERMWARN_STATUS_SHIFT                   3
+#define M98925_THERMWARN_STATUS_WIDTH                   1
+#define M98925_THERMSHDN_STATUS_MASK                    (1<<1)
+#define M98925_THERMSHDN_STATUS_SHIFT                   1
+#define M98925_THERMSHDN_STATUS_WIDTH                   1
+
+/* MAX98925_R003_LIVE_STATUS1 */
+#define M98925_SPKCURNT_STATUS_MASK                     (1<<5)
+#define M98925_SPKCURNT_STATUS_SHIFT                    5
+#define M98925_SPKCURNT_STATUS_WIDTH                    1
+#define M98925_WATCHFAIL_STATUS_MASK                    (1<<4)
+#define M98925_WATCHFAIL_STATUS_SHIFT                   4
+#define M98925_WATCHFAIL_STATUS_WIDTH                   1
+#define M98925_ALCINFH_STATUS_MASK                      (1<<3)
+#define M98925_ALCINFH_STATUS_SHIFT                     3
+#define M98925_ALCINFH_STATUS_WIDTH                     1
+#define M98925_ALCACT_STATUS_MASK                       (1<<2)
+#define M98925_ALCACT_STATUS_SHIFT                      2
+#define M98925_ALCACT_STATUS_WIDTH                      1
+#define M98925_ALCMUT_STATUS_MASK                       (1<<1)
+#define M98925_ALCMUT_STATUS_SHIFT                      1
+#define M98925_ALCMUT_STATUS_WIDTH                      1
+#define M98925_ACLP_STATUS_MASK                         (1<<0)
+#define M98925_ACLP_STATUS_SHIFT                        0
+#define M98925_ACLP_STATUS_WIDTH                        1
+
+/* MAX98925_R004_LIVE_STATUS2 */
+#define M98925_SLOTOVRN_STATUS_MASK                     (1<<6)
+#define M98925_SLOTOVRN_STATUS_SHIFT                    6
+#define M98925_SLOTOVRN_STATUS_WIDTH                    1
+#define M98925_INVALSLOT_STATUS_MASK                    (1<<5)
+#define M98925_INVALSLOT_STATUS_SHIFT                   5
+#define M98925_INVALSLOT_STATUS_WIDTH                   1
+#define M98925_SLOTCNFLT_STATUS_MASK                    (1<<4)
+#define M98925_SLOTCNFLT_STATUS_SHIFT                   4
+#define M98925_SLOTCNFLT_STATUS_WIDTH                   1
+#define M98925_VBSTOVFL_STATUS_MASK                     (1<<3)
+#define M98925_VBSTOVFL_STATUS_SHIFT                    3
+#define M98925_VBSTOVFL_STATUS_WIDTH                    1
+#define M98925_VBATOVFL_STATUS_MASK                     (1<<2)
+#define M98925_VBATOVFL_STATUS_SHIFT                    2
+#define M98925_VBATOVFL_STATUS_WIDTH                    1
+#define M98925_IMONOVFL_STATUS_MASK                     (1<<1)
+#define M98925_IMONOVFL_STATUS_SHIFT                    1
+#define M98925_IMONOVFL_STATUS_WIDTH                    1
+#define M98925_VMONOVFL_STATUS_MASK                     (1<<0)
+#define M98925_VMONOVFL_STATUS_SHIFT                    0
+#define M98925_VMONOVFL_STATUS_WIDTH                    1
+
+/* MAX98925_R005_STATE0 */
+#define M98925_THERMWARN_END_STATE_MASK                 (1<<3)
+#define M98925_THERMWARN_END_STATE_SHIFT                3
+#define M98925_THERMWARN_END_STATE_WIDTH                1
+#define M98925_THERMWARN_BGN_STATE_MASK                 (1<<2)
+#define M98925_THERMWARN_BGN_STATE_SHIFT                1
+#define M98925_THERMWARN_BGN_STATE_WIDTH                1
+#define M98925_THERMSHDN_END_STATE_MASK                 (1<<1)
+#define M98925_THERMSHDN_END_STATE_SHIFT                1
+#define M98925_THERMSHDN_END_STATE_WIDTH                1
+#define M98925_THERMSHDN_BGN_STATE_MASK                 (1<<0)
+#define M98925_THERMSHDN_BGN_STATE_SHIFT                0
+#define M98925_THERMSHDN_BGN_STATE_WIDTH                1
+
+/* MAX98925_R006_STATE1 */
+#define M98925_SPRCURNT_STATE_MASK                      (1<<5)
+#define M98925_SPRCURNT_STATE_SHIFT                     5
+#define M98925_SPRCURNT_STATE_WIDTH                     1
+#define M98925_WATCHFAIL_STATE_MASK                     (1<<4)
+#define M98925_WATCHFAIL_STATE_SHIFT                    4
+#define M98925_WATCHFAIL_STATE_WIDTH                    1
+#define M98925_ALCINFH_STATE_MASK                       (1<<3)
+#define M98925_ALCINFH_STATE_SHIFT                      3
+#define M98925_ALCINFH_STATE_WIDTH                      1
+#define M98925_ALCACT_STATE_MASK                        (1<<2)
+#define M98925_ALCACT_STATE_SHIFT                       2
+#define M98925_ALCACT_STATE_WIDTH                       1
+#define M98925_ALCMUT_STATE_MASK                        (1<<1)
+#define M98925_ALCMUT_STATE_SHIFT                       1
+#define M98925_ALCMUT_STATE_WIDTH                       1
+#define M98925_ALCP_STATE_MASK                          (1<<0)
+#define M98925_ALCP_STATE_SHIFT                         0
+#define M98925_ALCP_STATE_WIDTH                         1
+
+/* MAX98925_R007_STATE2 */
+#define M98925_SLOTOVRN_STATE_MASK                      (1<<6)
+#define M98925_SLOTOVRN_STATE_SHIFT                     6
+#define M98925_SLOTOVRN_STATE_WIDTH                     1
+#define M98925_INVALSLOT_STATE_MASK                     (1<<5)
+#define M98925_INVALSLOT_STATE_SHIFT                    5
+#define M98925_INVALSLOT_STATE_WIDTH                    1
+#define M98925_SLOTCNFLT_STATE_MASK                     (1<<4)
+#define M98925_SLOTCNFLT_STATE_SHIFT                    4
+#define M98925_SLOTCNFLT_STATE_WIDTH                    1
+#define M98925_VBSTOVFL_STATE_MASK                      (1<<3)
+#define M98925_VBSTOVFL_STATE_SHIFT                     3
+#define M98925_VBSTOVFL_STATE_WIDTH                     1
+#define M98925_VBATOVFL_STATE_MASK                      (1<<2)
+#define M98925_VBATOVFL_STATE_SHIFT                     2
+#define M98925_VBATOVFL_STATE_WIDTH                     1
+#define M98925_IMONOVFL_STATE_MASK                      (1<<1)
+#define M98925_IMONOVFL_STATE_SHIFT                     1
+#define M98925_IMONOVFL_STATE_WIDTH                     1
+#define M98925_VMONOVFL_STATE_MASK                      (1<<0)
+#define M98925_VMONOVFL_STATE_SHIFT                     0
+#define M98925_VMONOVFL_STATE_WIDTH                     1
+
+/* MAX98925_R008_FLAG0 */
+#define M98925_THERMWARN_END_FLAG_MASK                  (1<<3)
+#define M98925_THERMWARN_END_FLAG_SHIFT                 3
+#define M98925_THERMWARN_END_FLAG_WIDTH                 1
+#define M98925_THERMWARN_BGN_FLAG_MASK                  (1<<2)
+#define M98925_THERMWARN_BGN_FLAG_SHIFT                 2
+#define M98925_THERMWARN_BGN_FLAG_WIDTH                 1
+#define M98925_THERMSHDN_END_FLAG_MASK                  (1<<1)
+#define M98925_THERMSHDN_END_FLAG_SHIFT                 1
+#define M98925_THERMSHDN_END_FLAG_WIDTH                 1
+#define M98925_THERMSHDN_BGN_FLAG_MASK                  (1<<0)
+#define M98925_THERMSHDN_BGN_FLAG_SHIFT                 0
+#define M98925_THERMSHDN_BGN_FLAG_WIDTH                 1
+
+/* MAX98925_R009_FLAG1 */
+#define M98925_SPKCURNT_FLAG_MASK                       (1<<5)
+#define M98925_SPKCURNT_FLAG_SHIFT                      5
+#define M98925_SPKCURNT_FLAG_WIDTH                      1
+#define M98925_WATCHFAIL_FLAG_MASK                      (1<<4)
+#define M98925_WATCHFAIL_FLAG_SHIFT                     4
+#define M98925_WATCHFAIL_FLAG_WIDTH                     1
+#define M98925_ALCINFH_FLAG_MASK                        (1<<3)
+#define M98925_ALCINFH_FLAG_SHIFT                       3
+#define M98925_ALCINFH_FLAG_WIDTH                       1
+#define M98925_ALCACT_FLAG_MASK                         (1<<2)
+#define M98925_ALCACT_FLAG_SHIFT                        2
+#define M98925_ALCACT_FLAG_WIDTH                        1
+#define M98925_ALCMUT_FLAG_MASK                         (1<<1)
+#define M98925_ALCMUT_FLAG_SHIFT                        1
+#define M98925_ALCMUT_FLAG_WIDTH                        1
+#define M98925_ALCP_FLAG_MASK                           (1<<0)
+#define M98925_ALCP_FLAG_SHIFT                          0
+#define M98925_ALCP_FLAG_WIDTH                          1
+
+/* MAX98925_R00A_FLAG2 */
+#define M98925_SLOTOVRN_FLAG_MASK                       (1<<6)
+#define M98925_SLOTOVRN_FLAG_SHIFT                      6
+#define M98925_SLOTOVRN_FLAG_WIDTH                      1
+#define M98925_INVALSLOT_FLAG_MASK                      (1<<5)
+#define M98925_INVALSLOT_FLAG_SHIFT                     5
+#define M98925_INVALSLOT_FLAG_WIDTH                     1
+#define M98925_SLOTCNFLT_FLAG_MASK                      (1<<4)
+#define M98925_SLOTCNFLT_FLAG_SHIFT                     4
+#define M98925_SLOTCNFLT_FLAG_WIDTH                     1
+#define M98925_VBSTOVFL_FLAG_MASK                       (1<<3)
+#define M98925_VBSTOVFL_FLAG_SHIFT                      3
+#define M98925_VBSTOVFL_FLAG_WIDTH                      1
+#define M98925_VBATOVFL_FLAG_MASK                       (1<<2)
+#define M98925_VBATOVFL_FLAG_SHIFT                      2
+#define M98925_VBATOVFL_FLAG_WIDTH                      1
+#define M98925_IMONOVFL_FLAG_MASK                       (1<<1)
+#define M98925_IMONOVFL_FLAG_SHIFT                      1
+#define M98925_IMONOVFL_FLAG_WIDTH                      1
+#define M98925_VMONOVFL_FLAG_MASK                       (1<<0)
+#define M98925_VMONOVFL_FLAG_SHIFT                      0
+#define M98925_VMONOVFL_FLAG_WIDTH                      1
+
+/* MAX98925_R00B_IRQ_ENABLE0 */
+#define M98925_THERMWARN_END_EN_MASK                    (1<<3)
+#define M98925_THERMWARN_END_EN_SHIFT                   3
+#define M98925_THERMWARN_END_EN_WIDTH                   1
+#define M98925_THERMWARN_BGN_EN_MASK                    (1<<2)
+#define M98925_THERMWARN_BGN_EN_SHIFT                   2
+#define M98925_THERMWARN_BGN_EN_WIDTH                   1
+#define M98925_THERMSHDN_END_EN_MASK                    (1<<1)
+#define M98925_THERMSHDN_END_EN_SHIFT                   1
+#define M98925_THERMSHDN_END_EN_WIDTH                   1
+#define M98925_THERMSHDN_BGN_EN_MASK                    (1<<0)
+#define M98925_THERMSHDN_BGN_EN_SHIFT                   0
+#define M98925_THERMSHDN_BGN_EN_WIDTH                   1
+
+/* MAX98925_R00C_IRQ_ENABLE1 */
+#define M98925_SPKCURNT_EN_MASK                         (1<<5)
+#define M98925_SPKCURNT_EN_SHIFT                        5
+#define M98925_SPKCURNT_EN_WIDTH                        1
+#define M98925_WATCHFAIL_EN_MASK                        (1<<4)
+#define M98925_WATCHFAIL_EN_SHIFT                       4
+#define M98925_WATCHFAIL_EN_WIDTH                       1
+#define M98925_ALCINFH_EN_MASK                          (1<<3)
+#define M98925_ALCINFH_EN_SHIFT                         3
+#define M98925_ALCINFH_EN_WIDTH                         1
+#define M98925_ALCACT_EN_MASK                           (1<<2)
+#define M98925_ALCACT_EN_SHIFT                          2
+#define M98925_ALCACT_EN_WIDTH                          1
+#define M98925_ALCMUT_EN_MASK                           (1<<1)
+#define M98925_ALCMUT_EN_SHIFT                          1
+#define M98925_ALCMUT_EN_WIDTH                          1
+#define M98925_ALCP_EN_MASK                                     (1<<0)
+#define M98925_ALCP_EN_SHIFT                            0
+#define M98925_ALCP_EN_WIDTH                            1
+
+/* MAX98925_R00D_IRQ_ENABLE2 */
+#define M98925_SLOTOVRN_EN_MASK                                 (1<<6)
+#define M98925_SLOTOVRN_EN_SHIFT                                6
+#define M98925_SLOTOVRN_EN_WIDTH                                1
+#define M98925_INVALSLOT_EN_MASK                                (1<<5)
+#define M98925_INVALSLOT_EN_SHIFT                               5
+#define M98925_INVALSLOT_EN_WIDTH                               1
+#define M98925_SLOTCNFLT_EN_MASK                                (1<<4)
+#define M98925_SLOTCNFLT_EN_SHIFT                               4
+#define M98925_SLOTCNFLT_EN_WIDTH                               1
+#define M98925_VBSTOVFL_EN_MASK                                 (1<<3)
+#define M98925_VBSTOVFL_EN_SHIFT                                3
+#define M98925_VBSTOVFL_EN_WIDTH                                1
+#define M98925_VBATOVFL_EN_MASK                                 (1<<2)
+#define M98925_VBATOVFL_EN_SHIFT                                2
+#define M98925_VBATOVFL_EN_WIDTH                                1
+#define M98925_IMONOVFL_EN_MASK                                 (1<<1)
+#define M98925_IMONOVFL_EN_SHIFT                                1
+#define M98925_IMONOVFL_EN_WIDTH                                1
+#define M98925_VMONOVFL_EN_MASK                                 (1<<0)
+#define M98925_VMONOVFL_EN_SHIFT                                0
+#define M98925_VMONOVFL_EN_WIDTH                                1
+
+/* MAX98925_R00E_IRQ_CLEAR0 */
+#define M98925_THERMWARN_END_CLR_MASK                   (1<<3)
+#define M98925_THERMWARN_END_CLR_SHIFT                  3
+#define M98925_THERMWARN_END_CLR_WIDTH                  1
+#define M98925_THERMWARN_BGN_CLR_MASK                   (1<<2)
+#define M98925_THERMWARN_BGN_CLR_SHIFT                  2
+#define M98925_THERMWARN_BGN_CLR_WIDTH                  1
+#define M98925_THERMSHDN_END_CLR_MASK                   (1<<1)
+#define M98925_THERMSHDN_END_CLR_SHIFT                  1
+#define M98925_THERMSHDN_END_CLR_WIDTH                  1
+#define M98925_THERMSHDN_BGN_CLR_MASK                   (1<<0)
+#define M98925_THERMSHDN_BGN_CLR_SHIFT                  0
+#define M98925_THERMSHDN_BGN_CLR_WIDTH                  1
+
+/* MAX98925_R00F_IRQ_CLEAR1 */
+#define M98925_SPKCURNT_CLR_MASK                                (1<<5)
+#define M98925_SPKCURNT_CLR_SHIFT                               5
+#define M98925_SPKCURNT_CLR_WIDTH                               1
+#define M98925_WATCHFAIL_CLR_MASK                               (1<<4)
+#define M98925_WATCHFAIL_CLR_SHIFT                              4
+#define M98925_WATCHFAIL_CLR_WIDTH                              1
+#define M98925_ALCINFH_CLR_MASK                                 (1<<3)
+#define M98925_ALCINFH_CLR_SHIFT                                3
+#define M98925_ALCINFH_CLR_WIDTH                                1
+#define M98925_ALCACT_CLR_MASK                                  (1<<2)
+#define M98925_ALCACT_CLR_SHIFT                                 2
+#define M98925_ALCACT_CLR_WIDTH                                 1
+#define M98925_ALCMUT_CLR_MASK                                  (1<<1)
+#define M98925_ALCMUT_CLR_SHIFT                                 1
+#define M98925_ALCMUT_CLR_WIDTH                                 1
+#define M98925_ALCP_CLR_MASK                                    (1<<0)
+#define M98925_ALCP_CLR_SHIFT                                   0
+#define M98925_ALCP_CLR_WIDTH                                   1
+
+/* MAX98925_R010_IRQ_CLEAR2 */
+#define M98925_SLOTOVRN_CLR_MASK                                (1<<6)
+#define M98925_SLOTOVRN_CLR_SHIFT                               6
+#define M98925_SLOTOVRN_CLR_WIDTH                               1
+#define M98925_INVALSLOT_CLR_MASK                               (1<<5)
+#define M98925_INVALSLOT_CLR_SHIFT                              5
+#define M98925_INVALSLOT_CLR_WIDTH                              1
+#define M98925_SLOTCNFLT_CLR_MASK                               (1<<4)
+#define M98925_SLOTCNFLT_CLR_SHIFT                              4
+#define M98925_SLOTCNFLT_CLR_WIDTH                              1
+#define M98925_VBSTOVFL_CLR_MASK                                (1<<3)
+#define M98925_VBSTOVFL_CLR_SHIFT                               3
+#define M98925_VBSTOVFL_CLR_WIDTH                               1
+#define M98925_VBATOVFL_CLR_MASK                                (1<<2)
+#define M98925_VBATOVFL_CLR_SHIFT                               2
+#define M98925_VBATOVFL_CLR_WIDTH                               1
+#define M98925_IMONOVFL_CLR_MASK                                (1<<1)
+#define M98925_IMONOVFL_CLR_SHIFT                               1
+#define M98925_IMONOVFL_CLR_WIDTH                               1
+#define M98925_VMONOVFL_CLR_MASK                                (1<<0)
+#define M98925_VMONOVFL_CLR_SHIFT                               0
+#define M98925_VMONOVFL_CLR_WIDTH                               1
+
+/* MAX98925_R011_MAP0 */
+#define M98925_ER_THERMWARN_EN_MASK                             (1<<7)
+#define M98925_ER_THERMWARN_EN_SHIFT                    7
+#define M98925_ER_THERMWARN_EN_WIDTH                    1
+#define M98925_ER_THERMWARN_MAP_MASK                    (0x07<<4)
+#define M98925_ER_THERMWARN_MAP_SHIFT                   4
+#define M98925_ER_THERMWARN_MAP_WIDTH                   3
+
+/* MAX98925_R012_MAP1 */
+#define M98925_ER_ALCMUT_EN_MASK                                (1<<7)
+#define M98925_ER_ALCMUT_EN_SHIFT                               7
+#define M98925_ER_ALCMUT_EN_WIDTH                               1
+#define M98925_ER_ALCMUT_MAP_MASK                               (0x07<<4)
+#define M98925_ER_ALCMUT_MAP_SHIFT                              4
+#define M98925_ER_ALCMUT_MAP_WIDTH                              3
+#define M98925_ER_ALCP_EN_MASK                                  (1<<3)
+#define M98925_ER_ALCP_EN_SHIFT                                 3
+#define M98925_ER_ALCP_EN_WIDTH                                 1
+#define M98925_ER_ALCP_MAP_MASK                                 (0x07<<0)
+#define M98925_ER_ALCP_MAP_SHIFT                                0
+#define M98925_ER_ALCP_MAP_WIDTH                                3
+
+/* MAX98925_R013_MAP2 */
+#define M98925_ER_ALCINFH_EN_MASK                               (1<<7)
+#define M98925_ER_ALCINFH_EN_SHIFT                              7
+#define M98925_ER_ALCINFH_EN_WIDTH                              1
+#define M98925_ER_ALCINFH_MAP_MASK                              (0x07<<4)
+#define M98925_ER_ALCINFH_MAP_SHIFT                             4
+#define M98925_ER_ALCINFH_MAP_WIDTH                             3
+#define M98925_ER_ALCACT_EN_MASK                                (1<<3)
+#define M98925_ER_ALCACT_EN_SHIFT                               3
+#define M98925_ER_ALCACT_EN_WIDTH                               1
+#define M98925_ER_ALCACT_MAP_MASK                               (0x07<<0)
+#define M98925_ER_ALCACT_MAP_SHIFT                              0
+#define M98925_ER_ALCACT_MAP_WIDTH                              3
+
+/* MAX98925_R014_MAP3 */
+#define M98925_ER_SPKCURNT_EN_MASK                              (1<<7)
+#define M98925_ER_SPKCURNT_EN_SHIFT                             7
+#define M98925_ER_SPKCURNT_EN_WIDTH                             1
+#define M98925_ER_SPKCURNT_MAP_MASK                             (0x07<<4)
+#define M98925_ER_SPKCURNT_MAP_SHIFT                    4
+#define M98925_ER_SPKCURNT_MAP_WIDTH                    3
+
+/* MAX98925_R015_MAP4 */
+/* RESERVED */
+
+/* MAX98925_R016_MAP5 */
+#define M98925_ER_IMONOVFL_EN_MASK                              (1<<7)
+#define M98925_ER_IMONOVFL_EN_SHIFT                             7
+#define M98925_ER_IMONOVFL_EN_WIDTH                             1
+#define M98925_ER_IMONOVFL_MAP_MASK                             (0x07<<4)
+#define M98925_ER_IMONOVFL_MAP_SHIFT                    4
+#define M98925_ER_IMONOVFL_MAP_WIDTH                    3
+#define M98925_ER_VMONOVFL_EN_MASK                              (1<<3)
+#define M98925_ER_VMONOVFL_EN_SHIFT                             3
+#define M98925_ER_VMONOVFL_EN_WIDTH                             1
+#define M98925_ER_VMONOVFL_MAP_MASK                             (0x07<<0)
+#define M98925_ER_VMONOVFL_MAP_SHIFT                    0
+#define M98925_ER_VMONOVFL_MAP_WIDTH                    3
+
+/* MAX98925_R017_MAP6 */
+#define M98925_ER_VBSTOVFL_EN_MASK                              (1<<7)
+#define M98925_ER_VBSTOVFL_EN_SHIFT                             7
+#define M98925_ER_VBSTOVFL_EN_WIDTH                             1
+#define M98925_ER_VBSTOVFL_MAP_MASK                             (0x07<<4)
+#define M98925_ER_VBSTOVFL_MAP_SHIFT                    4
+#define M98925_ER_VBSTOVFL_MAP_WIDTH                    3
+#define M98925_ER_VBATOVFL_EN_MASK                              (1<<3)
+#define M98925_ER_VBATOVFL_EN_SHIFT                             3
+#define M98925_ER_VBATOVFL_EN_WIDTH                             1
+#define M98925_ER_VBATOVFL_MAP_MASK                             (0x07<<0)
+#define M98925_ER_VBATOVFL_MAP_SHIFT                    0
+#define M98925_ER_VBATOVFL_MAP_WIDTH                    3
+
+/* MAX98925_R018_MAP7 */
+#define M98925_ER_INVALSLOT_EN_MASK                             (1<<7)
+#define M98925_ER_INVALSLOT_EN_SHIFT                    7
+#define M98925_ER_INVALSLOT_EN_WIDTH                    1
+#define M98925_ER_INVALSLOT_MAP_MASK                    (0x07<<4)
+#define M98925_ER_INVALSLOT_MAP_SHIFT                   4
+#define M98925_ER_INVALSLOT_MAP_WIDTH                   3
+#define M98925_ER_SLOTCNFLT_EN_MASK                             (1<<3)
+#define M98925_ER_SLOTCNFLT_EN_SHIFT                    3
+#define M98925_ER_SLOTCNFLT_EN_WIDTH                    1
+#define M98925_ER_SLOTCNFLT_MAP_MASK                    (0x07<<0)
+#define M98925_ER_SLOTCNFLT_MAP_SHIFT                   0
+#define M98925_ER_SLOTCNFLT_MAP_WIDTH                   3
+
+/* MAX98925_R019_MAP8 */
+#define M98925_ER_SLOTOVRN_EN_MASK      (1<<3)
+#define M98925_ER_SLOTOVRN_EN_SHIFT     3
+#define M98925_ER_SLOTOVRN_EN_WIDTH     1
+#define M98925_ER_SLOTOVRN_MAP_MASK     (0x07<<0)
+#define M98925_ER_SLOTOVRN_MAP_SHIFT    0
+#define M98925_ER_SLOTOVRN_MAP_WIDTH    3
+
+/* MAX98925_R01A_DAI_CLK_MODE1 */
+#define M98925_DAI_CLK_SOURCE_MASK      (1<<6)
+#define M98925_DAI_CLK_SOURCE_SHIFT     6
+#define M98925_DAI_CLK_SOURCE_WIDTH     1
+#define M98925_MDLL_MULT_MASK           (0x0F<<0)
+#define M98925_MDLL_MULT_SHIFT          0
+#define M98925_MDLL_MULT_WIDTH          4
+
+#define M98925_MDLL_MULT_MCLKx8         6
+#define M98925_MDLL_MULT_MCLKx16        8
+
+/* MAX98925_R01B_DAI_CLK_MODE2 */
+#define M98925_DAI_SR_MASK                      (0x0F<<4)
+#define M98925_DAI_SR_SHIFT                     4
+#define M98925_DAI_SR_WIDTH                     4
+#define M98925_DAI_MAS_MASK                     (1<<3)
+#define M98925_DAI_MAS_SHIFT                    3
+#define M98925_DAI_MAS_WIDTH                    1
+#define M98925_DAI_BSEL_MASK                    (0x07<<0)
+#define M98925_DAI_BSEL_SHIFT                   0
+#define M98925_DAI_BSEL_WIDTH                   3
+
+#define M98925_DAI_BSEL_32 (0 << M98925_DAI_BSEL_SHIFT)
+#define M98925_DAI_BSEL_48 (1 << M98925_DAI_BSEL_SHIFT)
+#define M98925_DAI_BSEL_64 (2 << M98925_DAI_BSEL_SHIFT)
+#define M98925_DAI_BSEL_256 (6 << M98925_DAI_BSEL_SHIFT)
+
+/* MAX98925_R01C_DAI_CLK_DIV_M_MSBS */
+#define M98925_DAI_M_MSBS_MASK                                  (0xFF<<0)
+#define M98925_DAI_M_MSBS_SHIFT                                 0
+#define M98925_DAI_M_MSBS_WIDTH                                 8
+
+/* MAX98925_R01D_DAI_CLK_DIV_M_LSBS */
+#define M98925_DAI_M_LSBS_MASK                                  (0xFF<<0)
+#define M98925_DAI_M_LSBS_SHIFT                                 0
+#define M98925_DAI_M_LSBS_WIDTH                                 8
+
+/* MAX98925_R01E_DAI_CLK_DIV_N_MSBS */
+#define M98925_DAI_N_MSBS_MASK                                  (0x7F<<0)
+#define M98925_DAI_N_MSBS_SHIFT                                 0
+#define M98925_DAI_N_MSBS_WIDTH                                 7
+
+/* MAX98925_R01F_DAI_CLK_DIV_N_LSBS */
+#define M98925_DAI_N_LSBS_MASK                                  (0xFF<<0)
+#define M98925_DAI_N_LSBS_SHIFT                                 0
+#define M98925_DAI_N_LSBS_WIDTH                                 8
+
+/* MAX98925_R020_FORMAT */
+#define M98925_DAI_CHANSZ_MASK                                  (0x03<<6)
+#define M98925_DAI_CHANSZ_SHIFT                                 6
+#define M98925_DAI_CHANSZ_WIDTH                                 2
+#define M98925_DAI_EXTBCLK_HIZ_MASK                             (1<<4)
+#define M98925_DAI_EXTBCLK_HIZ_SHIFT                    4
+#define M98925_DAI_EXTBCLK_HIZ_WIDTH                    1
+#define M98925_DAI_WCI_MASK                                             (1<<3)
+#define M98925_DAI_WCI_SHIFT                                    3
+#define M98925_DAI_WCI_WIDTH                                    1
+#define M98925_DAI_BCI_MASK                                             (1<<2)
+#define M98925_DAI_BCI_SHIFT                                    2
+#define M98925_DAI_BCI_WIDTH                                    1
+#define M98925_DAI_DLY_MASK                                             (1<<1)
+#define M98925_DAI_DLY_SHIFT                                    1
+#define M98925_DAI_DLY_WIDTH                                    1
+#define M98925_DAI_TDM_MASK                                             (1<<0)
+#define M98925_DAI_TDM_SHIFT                                    0
+#define M98925_DAI_TDM_WIDTH                                    1
+
+#define M98925_DAI_CHANSZ_16 (1 << M98925_DAI_CHANSZ_SHIFT)
+#define M98925_DAI_CHANSZ_24 (2 << M98925_DAI_CHANSZ_SHIFT)
+#define M98925_DAI_CHANSZ_32 (3 << M98925_DAI_CHANSZ_SHIFT)
+
+/* MAX98925_R021_TDM_SLOT_SELECT */
+#define M98925_DAI_DO_EN_MASK                                   (1<<7)
+#define M98925_DAI_DO_EN_SHIFT                                  7
+#define M98925_DAI_DO_EN_WIDTH                                  1
+#define M98925_DAI_DIN_EN_MASK                                  (1<<6)
+#define M98925_DAI_DIN_EN_SHIFT                                 6
+#define M98925_DAI_DIN_EN_WIDTH                                 1
+#define M98925_DAI_INR_SOURCE_MASK                              (0x07<<3)
+#define M98925_DAI_INR_SOURCE_SHIFT                             3
+#define M98925_DAI_INR_SOURCE_WIDTH                             3
+#define M98925_DAI_INL_SOURCE_MASK                              (0x07<<0)
+#define M98925_DAI_INL_SOURCE_SHIFT                             0
+#define M98925_DAI_INL_SOURCE_WIDTH                             3
+
+/* MAX98925_R022_DOUT_CFG_VMON */
+#define M98925_DAI_VMON_EN_MASK                                 (1<<5)
+#define M98925_DAI_VMON_EN_SHIFT                                5
+#define M98925_DAI_VMON_EN_WIDTH                                1
+#define M98925_DAI_VMON_SLOT_MASK                               (0x1F<<0)
+#define M98925_DAI_VMON_SLOT_SHIFT                              0
+#define M98925_DAI_VMON_SLOT_WIDTH                              5
+
+#define M98925_DAI_VMON_SLOT_00_01 (0 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_01_02 (1 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_02_03 (2 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_03_04 (3 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_04_05 (4 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_05_06 (5 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_06_07 (6 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_07_08 (7 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_08_09 (8 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_09_0A (9 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_0A_0B (10 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_0B_0C (11 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_0C_0D (12 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_0D_0E (13 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_0E_0F (14 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_0F_10 (15 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_10_11 (16 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_11_12 (17 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_12_13 (18 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_13_14 (19 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_14_15 (20 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_15_16 (21 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_16_17 (22 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_17_18 (23 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_18_19 (24 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_19_1A (25 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_1A_1B (26 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_1B_1C (27 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_1C_1D (28 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_1D_1E (29 << M98925_DAI_VMON_SLOT_SHIFT)
+#define M98925_DAI_VMON_SLOT_1E_1F (30 << M98925_DAI_VMON_SLOT_SHIFT)
+
+/* MAX98925_R023_DOUT_CFG_IMON */
+#define M98925_DAI_IMON_EN_MASK                                 (1<<5)
+#define M98925_DAI_IMON_EN_SHIFT                                5
+#define M98925_DAI_IMON_EN_WIDTH                                1
+#define M98925_DAI_IMON_SLOT_MASK                               (0x1F<<0)
+#define M98925_DAI_IMON_SLOT_SHIFT                              0
+#define M98925_DAI_IMON_SLOT_WIDTH                              5
+
+#define M98925_DAI_IMON_SLOT_00_01 (0 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_01_02 (1 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_02_03 (2 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_03_04 (3 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_04_05 (4 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_05_06 (5 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_06_07 (6 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_07_08 (7 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_08_09 (8 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_09_0A (9 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_0A_0B (10 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_0B_0C (11 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_0C_0D (12 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_0D_0E (13 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_0E_0F (14 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_0F_10 (15 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_10_11 (16 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_11_12 (17 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_12_13 (18 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_13_14 (19 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_14_15 (20 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_15_16 (21 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_16_17 (22 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_17_18 (23 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_18_19 (24 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_19_1A (25 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_1A_1B (26 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_1B_1C (27 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_1C_1D (28 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_1D_1E (29 << M98925_DAI_IMON_SLOT_SHIFT)
+#define M98925_DAI_IMON_SLOT_1E_1F (30 << M98925_DAI_IMON_SLOT_SHIFT)
+
+/* MAX98925_R024_DOUT_CFG_VBAT */
+#define M98925_DAI_VBAT_EN_MASK                                 (1<<5)
+#define M98925_DAI_VBAT_EN_SHIFT                                5
+#define M98925_DAI_VBAT_EN_WIDTH                                1
+#define M98925_DAI_VBAT_SLOT_MASK                               (0x1F<<0)
+#define M98925_DAI_VBAT_SLOT_SHIFT                              0
+#define M98925_DAI_VBAT_SLOT_WIDTH                              5
+
+/* MAX98925_R025_DOUT_CFG_VBST */
+#define M98925_DAI_VBST_EN_MASK                                 (1<<5)
+#define M98925_DAI_VBST_EN_SHIFT                                5
+#define M98925_DAI_VBST_EN_WIDTH                                1
+#define M98925_DAI_VBST_SLOT_MASK                               (0x1F<<0)
+#define M98925_DAI_VBST_SLOT_SHIFT                              0
+#define M98925_DAI_VBST_SLOT_WIDTH                              5
+
+/* MAX98925_R026_DOUT_CFG_FLAG */
+#define M98925_DAI_FLAG_EN_MASK                                 (1<<5)
+#define M98925_DAI_FLAG_EN_SHIFT                                5
+#define M98925_DAI_FLAG_EN_WIDTH                                1
+#define M98925_DAI_FLAG_SLOT_MASK                               (0x1F<<0)
+#define M98925_DAI_FLAG_SLOT_SHIFT                              0
+#define M98925_DAI_FLAG_SLOT_WIDTH                              5
+
+/* MAX98925_R027_DOUT_HIZ_CFG1 */
+#define M98925_DAI_SLOT_HIZ_CFG1_MASK                   (0xFF<<0)
+#define M98925_DAI_SLOT_HIZ_CFG1_SHIFT                  0
+#define M98925_DAI_SLOT_HIZ_CFG1_WIDTH                  8
+
+/* MAX98925_R028_DOUT_HIZ_CFG2 */
+#define M98925_DAI_SLOT_HIZ_CFG2_MASK                   (0xFF<<0)
+#define M98925_DAI_SLOT_HIZ_CFG2_SHIFT                  0
+#define M98925_DAI_SLOT_HIZ_CFG2_WIDTH                  8
+
+/* MAX98925_R029_DOUT_HIZ_CFG3 */
+#define M98925_DAI_SLOT_HIZ_CFG3_MASK                   (0xFF<<0)
+#define M98925_DAI_SLOT_HIZ_CFG3_SHIFT                  0
+#define M98925_DAI_SLOT_HIZ_CFG3_WIDTH                  8
+
+/* MAX98925_R02A_DOUT_HIZ_CFG4 */
+#define M98925_DAI_SLOT_HIZ_CFG4_MASK                   (0xFF<<0)
+#define M98925_DAI_SLOT_HIZ_CFG4_SHIFT                  0
+#define M98925_DAI_SLOT_HIZ_CFG4_WIDTH                  8
+
+/* MAX98925_R02B_DOUT_DRV_STRENGTH */
+#define M98925_DAI_OUT_DRIVE_MASK                               (0x03<<0)
+#define M98925_DAI_OUT_DRIVE_SHIFT                              0
+#define M98925_DAI_OUT_DRIVE_WIDTH                              2
+
+/* MAX98925_R02C_FILTERS */
+#define M98925_ADC_DITHER_EN_MASK                               (1<<7)
+#define M98925_ADC_DITHER_EN_SHIFT                              7
+#define M98925_ADC_DITHER_EN_WIDTH                              1
+#define M98925_IV_DCB_EN_MASK                                   (1<<6)
+#define M98925_IV_DCB_EN_SHIFT                                  6
+#define M98925_IV_DCB_EN_WIDTH                                  1
+#define M98925_DAC_DITHER_EN_MASK                               (1<<4)
+#define M98925_DAC_DITHER_EN_SHIFT                              4
+#define M98925_DAC_DITHER_EN_WIDTH                              1
+#define M98925_DAC_FILTER_MODE_MASK                             (1<<3)
+#define M98925_DAC_FILTER_MODE_SHIFT                    3
+#define M98925_DAC_FILTER_MODE_WIDTH                    1
+#define M98925_DAC_HPF_MASK                             (0x07<<0)
+#define M98925_DAC_HPF_SHIFT                                    0
+#define M98925_DAC_HPF_WIDTH                                    3
+#define M98925_DAC_HPF_DISABLE          (0 << M98925_DAC_HPF_SHIFT)
+#define M98925_DAC_HPF_DC_BLOCK         (1 << M98925_DAC_HPF_SHIFT)
+#define M98925_DAC_HPF_EN_100           (2 << M98925_DAC_HPF_SHIFT)
+#define M98925_DAC_HPF_EN_200           (3 << M98925_DAC_HPF_SHIFT)
+#define M98925_DAC_HPF_EN_400           (4 << M98925_DAC_HPF_SHIFT)
+#define M98925_DAC_HPF_EN_800           (5 << M98925_DAC_HPF_SHIFT)
+
+/* MAX98925_R02D_GAIN */
+#define M98925_DAC_IN_SEL_MASK                                  (0x03<<5)
+#define M98925_DAC_IN_SEL_SHIFT                                 5
+#define M98925_DAC_IN_SEL_WIDTH                                 2
+#define M98925_SPK_GAIN_MASK                                    (0x1F<<0)
+#define M98925_SPK_GAIN_SHIFT                                   0
+#define M98925_SPK_GAIN_WIDTH                                   5
+
+#define M98925_DAC_IN_SEL_LEFT_DAI (0 << M98925_DAC_IN_SEL_SHIFT)
+#define M98925_DAC_IN_SEL_RIGHT_DAI (1 << M98925_DAC_IN_SEL_SHIFT)
+#define M98925_DAC_IN_SEL_SUMMED_DAI (2 << M98925_DAC_IN_SEL_SHIFT)
+#define M98925_DAC_IN_SEL_DIV2_SUMMED_DAI (3 << M98925_DAC_IN_SEL_SHIFT)
+
+/* MAX98925_R02E_GAIN_RAMPING */
+#define M98925_SPK_RMP_EN_MASK          (1<<1)
+#define M98925_SPK_RMP_EN_SHIFT         1
+#define M98925_SPK_RMP_EN_WIDTH         1
+#define M98925_SPK_ZCD_EN_MASK          (1<<0)
+#define M98925_SPK_ZCD_EN_SHIFT         0
+#define M98925_SPK_ZCD_EN_WIDTH         1
+
+/* MAX98925_R02F_SPK_AMP */
+#define M98925_SPK_MODE_MASK            (1<<0)
+#define M98925_SPK_MODE_SHIFT           0
+#define M98925_SPK_MODE_WIDTH           1
+
+/* MAX98925_R030_THRESHOLD */
+#define M98925_ALC_EN_MASK                      (1<<5)
+#define M98925_ALC_EN_SHIFT                     5
+#define M98925_ALC_EN_WIDTH                     1
+#define M98925_ALC_TH_MASK                      (0x1F<<0)
+#define M98925_ALC_TH_SHIFT                     0
+#define M98925_ALC_TH_WIDTH                     5
+
+/* MAX98925_R031_ALC_ATTACK */
+#define M98925_ALC_ATK_STEP_MASK        (0x0F<<4)
+#define M98925_ALC_ATK_STEP_SHIFT       4
+#define M98925_ALC_ATK_STEP_WIDTH       4
+#define M98925_ALC_ATK_RATE_MASK        (0x7<<0)
+#define M98925_ALC_ATK_RATE_SHIFT       0
+#define M98925_ALC_ATK_RATE_WIDTH       3
+
+/* MAX98925_R032_ALC_ATTEN_RLS */
+#define M98925_ALC_MAX_ATTEN_MASK       (0x0F<<4)
+#define M98925_ALC_MAX_ATTEN_SHIFT      4
+#define M98925_ALC_MAX_ATTEN_WIDTH      4
+#define M98925_ALC_RLS_RATE_MASK        (0x7<<0)
+#define M98925_ALC_RLS_RATE_SHIFT       0
+#define M98925_ALC_RLS_RATE_WIDTH       3
+
+/* MAX98925_R033_ALC_HOLD_RLS */
+#define M98925_ALC_RLS_TGR_MASK         (1<<0)
+#define M98925_ALC_RLS_TGR_SHIFT        0
+#define M98925_ALC_RLS_TGR_WIDTH        1
+
+/* MAX98925_R034_ALC_CONFIGURATION */
+#define M98925_ALC_MUTE_EN_MASK         (1<<7)
+#define M98925_ALC_MUTE_EN_SHIFT        7
+#define M98925_ALC_MUTE_EN_WIDTH        1
+#define M98925_ALC_MUTE_DLY_MASK        (0x07<<4)
+#define M98925_ALC_MUTE_DLY_SHIFT       4
+#define M98925_ALC_MUTE_DLY_WIDTH       3
+#define M98925_ALC_RLS_DBT_MASK         (0x07<<0)
+#define M98925_ALC_RLS_DBT_SHIFT        0
+#define M98925_ALC_RLS_DBT_WIDTH        3
+
+/* MAX98925_R035_BOOST_CONVERTER */
+#define M98925_BST_SYNC_MASK            (1<<7)
+#define M98925_BST_SYNC_SHIFT           7
+#define M98925_BST_SYNC_WIDTH           1
+#define M98925_BST_PHASE_MASK           (0x03<<4)
+#define M98925_BST_PHASE_SHIFT          4
+#define M98925_BST_PHASE_WIDTH          2
+#define M98925_BST_SKIP_MODE_MASK       (0x03<<0)
+#define M98925_BST_SKIP_MODE_SHIFT      0
+#define M98925_BST_SKIP_MODE_WIDTH      2
+
+/* MAX98925_R036_BLOCK_ENABLE */
+#define M98925_BST_EN_MASK                      (1<<7)
+#define M98925_BST_EN_SHIFT                     7
+#define M98925_BST_EN_WIDTH                     1
+#define M98925_WATCH_EN_MASK            (1<<6)
+#define M98925_WATCH_EN_SHIFT           6
+#define M98925_WATCH_EN_WIDTH           1
+#define M98925_CLKMON_EN_MASK           (1<<5)
+#define M98925_CLKMON_EN_SHIFT          5
+#define M98925_CLKMON_EN_WIDTH          1
+#define M98925_SPK_EN_MASK                      (1<<4)
+#define M98925_SPK_EN_SHIFT                     4
+#define M98925_SPK_EN_WIDTH                     1
+#define M98925_ADC_VBST_EN_MASK         (1<<3)
+#define M98925_ADC_VBST_EN_SHIFT        3
+#define M98925_ADC_VBST_EN_WIDTH        1
+#define M98925_ADC_VBAT_EN_MASK         (1<<2)
+#define M98925_ADC_VBAT_EN_SHIFT        2
+#define M98925_ADC_VBAT_EN_WIDTH        1
+#define M98925_ADC_IMON_EN_MASK         (1<<1)
+#define M98925_ADC_IMON_EN_SHIFT        1
+#define M98925_ADC_IMON_EN_WIDTH        1
+#define M98925_ADC_VMON_EN_MASK         (1<<0)
+#define M98925_ADC_VMON_EN_SHIFT        0
+#define M98925_ADC_VMON_EN_WIDTH        1
+
+/* MAX98925_R037_CONFIGURATION */
+#define M98925_BST_VOUT_MASK            (0x0F<<4)
+#define M98925_BST_VOUT_SHIFT           4
+#define M98925_BST_VOUT_WIDTH           4
+#define M98925_THERMWARN_LEVEL_MASK     (0x03<<2)
+#define M98925_THERMWARN_LEVEL_SHIFT                    2
+#define M98925_THERMWARN_LEVEL_WIDTH                    2
+#define M98925_WATCH_TIME_MASK                  (0x03<<0)
+#define M98925_WATCH_TIME_SHIFT                 0
+#define M98925_WATCH_TIME_WIDTH                 2
+
+/* MAX98925_R038_GLOBAL_ENABLE */
+#define M98925_EN_MASK                  (1<<7)
+#define M98925_EN_SHIFT                 7
+#define M98925_EN_WIDTH                 1
+
+/* MAX98925_R03A_BOOST_LIMITER */
+#define M98925_BST_ILIM_MASK    (0x1F<<3)
+#define M98925_BST_ILIM_SHIFT   3
+#define M98925_BST_ILIM_WIDTH   5
+
+/* MAX98925_R0FF_VERSION */
+#define M98925_REV_ID_MASK      (0xFF<<0)
+#define M98925_REV_ID_SHIFT     0
+#define M98925_REV_ID_WIDTH     8
+
+struct max98925_priv {
+        struct regmap *regmap;
+        struct snd_soc_codec *codec;
+        struct max98925_pdata *pdata;
+        unsigned int sysclk;
+        unsigned int v_slot;
+        unsigned int i_slot;
+        unsigned int spk_gain;
+        unsigned int ch_size;
+};
+#endif
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index 4b5f1fe9be97..5a30fdd0da00 100644
--- a/sound/soc/codecs/pcm512x.c
+++ b/sound/soc/codecs/pcm512x.c
@@ -391,9 +391,9 @@ static const struct soc_enum pcm512x_veds =
 static const struct snd_kcontrol_new pcm512x_controls[] = {
 SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2,
                  PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv),
-SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL,
+SOC_DOUBLE_TLV("Analogue Playback Volume", PCM512x_ANALOG_GAIN_CTRL,
                PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv),
-SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,
+SOC_DOUBLE_TLV("Analogue Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,
                PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv),
 SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,
            PCM512x_RQMR_SHIFT, 1, 1),
@@ -713,8 +713,8 @@ static int pcm512x_find_pll_coeff(struct snd_soc_dai *dai,
 
         /* pllin_rate / P (or here, den) cannot be greater than 20 MHz */
         if (pllin_rate / den > 20000000 && num < 8) {
-                num *= 20000000 / (pllin_rate / den);
-                den *= 20000000 / (pllin_rate / den);
+                num *= DIV_ROUND_UP(pllin_rate / den, 20000000);
+                den *= DIV_ROUND_UP(pllin_rate / den, 20000000);
         }
         dev_dbg(dev, "num / den = %lu / %lu\n", num, den);
 
@@ -1296,25 +1296,6 @@ static int pcm512x_hw_params(struct snd_pcm_substream *substream,
                                 ret, pcm512x->pll_out);
                         return ret;
                 }
-
-                gpio = PCM512x_G1OE << (4 - 1);
-                ret = regmap_update_bits(pcm512x->regmap, PCM512x_GPIO_EN,
-                                         gpio, gpio);
-                if (ret != 0) {
-                        dev_err(codec->dev, "Failed to enable gpio %d: %d\n",
-                                4, ret);
-                        return ret;
-                }
-
-                gpio = PCM512x_GPIO_OUTPUT_1 + 4 - 1;
-                ret = regmap_update_bits(pcm512x->regmap, gpio,
-                                         PCM512x_GxSL, PCM512x_GxSL_PLLLK);
-                if (ret != 0) {
-                        dev_err(codec->dev,
-                                "Failed to output pll lock on %d: %d\n",
-                                ret, 4);
-                        return ret;
-                }
         }
 
         ret = regmap_update_bits(pcm512x->regmap, PCM512x_SYNCHRONIZE,
diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index 826037090c83..0fcda35a3a93 100644
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -397,7 +397,7 @@ int rt286_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
 
         if (jack) {
                 /* enable IRQ */
-                if (rt286->jack->status | SND_JACK_HEADPHONE)
+                if (rt286->jack->status & SND_JACK_HEADPHONE)
                         snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO1");
                 regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x2);
                 /* Send an initial empty report */
@@ -1048,7 +1048,6 @@ static int rt286_probe(struct snd_soc_codec *codec)
         struct rt286_priv *rt286 = snd_soc_codec_get_drvdata(codec);
 
         rt286->codec = codec;
-        codec->dapm.bias_level = SND_SOC_BIAS_OFF;
 
         if (rt286->i2c->irq) {
                 regmap_update_bits(rt286->regmap,
@@ -1220,7 +1219,7 @@ static int rt286_i2c_probe(struct i2c_client *i2c,
 {
         struct rt286_platform_data *pdata = dev_get_platdata(&i2c->dev);
         struct rt286_priv *rt286;
-        int i, ret;
+        int i, ret, val;
 
         rt286 = devm_kzalloc(&i2c->dev, sizeof(*rt286),
                                 GFP_KERNEL);
@@ -1235,11 +1234,15 @@ static int rt286_i2c_probe(struct i2c_client *i2c,
                 return ret;
         }
 
-        regmap_read(rt286->regmap,
-                RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &ret);
-        if (ret != RT286_VENDOR_ID && ret != RT288_VENDOR_ID) {
+        ret = regmap_read(rt286->regmap,
+                RT286_GET_PARAM(AC_NODE_ROOT, AC_PAR_VENDOR_ID), &val);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "I2C error %d\n", ret);
+                return ret;
+        }
+        if (val != RT286_VENDOR_ID && val != RT288_VENDOR_ID) {
                 dev_err(&i2c->dev,
-                        "Device with ID register %x is not rt286\n", ret);
+                        "Device with ID register %x is not rt286\n", val);
                 return -ENODEV;
         }
 
@@ -1247,6 +1250,14 @@ static int rt286_i2c_probe(struct i2c_client *i2c,
         rt286->i2c = i2c;
         i2c_set_clientdata(i2c, rt286);
 
+        /* restore codec default */
+        for (i = 0; i < INDEX_CACHE_SIZE; i++)
+                regmap_write(rt286->regmap, rt286->index_cache[i].reg,
+                                rt286->index_cache[i].def);
+        for (i = 0; i < ARRAY_SIZE(rt286_reg); i++)
+                regmap_write(rt286->regmap, rt286_reg[i].reg,
+                                rt286_reg[i].def);
+
         if (pdata)
                 rt286->pdata = *pdata;
 
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index c61852742ee3..2c10d77727af 100644
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1675,7 +1675,7 @@ static const struct i2c_device_id rt5631_i2c_id[] = {
 MODULE_DEVICE_TABLE(i2c, rt5631_i2c_id);
 
 #ifdef CONFIG_OF
-static struct of_device_id rt5631_i2c_dt_ids[] = {
+static const struct of_device_id rt5631_i2c_dt_ids[] = {
         { .compatible = "realtek,rt5631"},
         { .compatible = "realtek,alc5631"},
         { }
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index c9a4c5be083b..69528ae5410c 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -1270,6 +1270,8 @@ static void hp_amp_power(struct snd_soc_codec *codec, int on)
                         snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
                                 RT5645_PWR_HP_L | RT5645_PWR_HP_R |
                                 RT5645_PWR_HA, 0);
+                        snd_soc_update_bits(codec, RT5645_DEPOP_M2,
+                                RT5645_DEPOP_MASK, 0);
                 }
         }
 }
@@ -1538,8 +1540,6 @@ static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = {
 
         SND_SOC_DAPM_SUPPLY_S("adc stereo1 filter", 1, RT5645_PWR_DIG2,
                 RT5645_PWR_ADC_S1F_BIT, 0, NULL, 0),
-        SND_SOC_DAPM_SUPPLY_S("adc stereo2 filter", 1, RT5645_PWR_DIG2,
-                RT5645_PWR_ADC_S2F_BIT, 0, NULL, 0),
         SND_SOC_DAPM_MIXER_E("Sto1 ADC MIXL", SND_SOC_NOPM, 0, 0,
                 rt5645_sto1_adc_l_mix, ARRAY_SIZE(rt5645_sto1_adc_l_mix),
                 NULL, 0),
@@ -1729,7 +1729,6 @@ static const struct snd_soc_dapm_widget rt5650_specific_dapm_widgets[] = {
 
 static const struct snd_soc_dapm_route rt5645_dapm_routes[] = {
         { "adc stereo1 filter", NULL, "ADC STO1 ASRC", is_using_asrc },
-        { "adc stereo2 filter", NULL, "ADC STO2 ASRC", is_using_asrc },
         { "adc mono left filter", NULL, "ADC MONO L ASRC", is_using_asrc },
         { "adc mono right filter", NULL, "ADC MONO R ASRC", is_using_asrc },
         { "dac mono left filter", NULL, "DAC MONO L ASRC", is_using_asrc },
@@ -2052,7 +2051,7 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_codec *codec = dai->codec;
         struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
-        unsigned int val_len = 0, val_clk, mask_clk;
+        unsigned int val_len = 0, val_clk, mask_clk, dl_sft;
         int pre_div, bclk_ms, frame_size;
 
         rt5645->lrck[dai->id] = params_rate(params);
@@ -2066,6 +2065,16 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream,
                 dev_err(codec->dev, "Unsupported frame size: %d\n", frame_size);
                 return -EINVAL;
         }
+
+        switch (rt5645->codec_type) {
+        case CODEC_TYPE_RT5650:
+                dl_sft = 4;
+                break;
+        default:
+                dl_sft = 2;
+                break;
+        }
+
         bclk_ms = frame_size > 32;
         rt5645->bclk[dai->id] = rt5645->lrck[dai->id] * (32 << bclk_ms);
 
@@ -2078,13 +2087,13 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream,
         case 16:
                 break;
         case 20:
-                val_len |= RT5645_I2S_DL_20;
+                val_len = 0x1;
                 break;
         case 24:
-                val_len |= RT5645_I2S_DL_24;
+                val_len = 0x2;
                 break;
         case 8:
-                val_len |= RT5645_I2S_DL_8;
+                val_len = 0x3;
                 break;
         default:
                 return -EINVAL;
@@ -2096,7 +2105,7 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream,
                 val_clk = bclk_ms << RT5645_I2S_BCLK_MS1_SFT |
                         pre_div << RT5645_I2S_PD1_SFT;
                 snd_soc_update_bits(codec, RT5645_I2S1_SDP,
-                        RT5645_I2S_DL_MASK, val_len);
+                        (0x3 << dl_sft), (val_len << dl_sft));
                 snd_soc_update_bits(codec, RT5645_ADDA_CLK1, mask_clk, val_clk);
                 break;
         case  RT5645_AIF2:
@@ -2104,7 +2113,7 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream,
                 val_clk = bclk_ms << RT5645_I2S_BCLK_MS2_SFT |
                         pre_div << RT5645_I2S_PD2_SFT;
                 snd_soc_update_bits(codec, RT5645_I2S2_SDP,
-                        RT5645_I2S_DL_MASK, val_len);
+                        (0x3 << dl_sft), (val_len << dl_sft));
                 snd_soc_update_bits(codec, RT5645_ADDA_CLK1, mask_clk, val_clk);
                 break;
         default:
@@ -2119,7 +2128,16 @@ static int rt5645_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 {
         struct snd_soc_codec *codec = dai->codec;
         struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
-        unsigned int reg_val = 0;
+        unsigned int reg_val = 0, pol_sft;
+
+        switch (rt5645->codec_type) {
+        case CODEC_TYPE_RT5650:
+                pol_sft = 8;
+                break;
+        default:
+                pol_sft = 7;
+                break;
+        }
 
         switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
         case SND_SOC_DAIFMT_CBM_CFM:
@@ -2137,7 +2155,7 @@ static int rt5645_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         case SND_SOC_DAIFMT_NB_NF:
                 break;
         case SND_SOC_DAIFMT_IB_NF:
-                reg_val |= RT5645_I2S_BP_INV;
+                reg_val |= (1 << pol_sft);
                 break;
         default:
                 return -EINVAL;
@@ -2161,12 +2179,12 @@ static int rt5645_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         switch (dai->id) {
         case RT5645_AIF1:
                 snd_soc_update_bits(codec, RT5645_I2S1_SDP,
-                        RT5645_I2S_MS_MASK | RT5645_I2S_BP_MASK |
+                        RT5645_I2S_MS_MASK | (1 << pol_sft) |
                         RT5645_I2S_DF_MASK, reg_val);
                 break;
         case RT5645_AIF2:
                 snd_soc_update_bits(codec, RT5645_I2S2_SDP,
-                        RT5645_I2S_MS_MASK | RT5645_I2S_BP_MASK |
+                        RT5645_I2S_MS_MASK | (1 << pol_sft) |
                         RT5645_I2S_DF_MASK, reg_val);
                 break;
         default:
@@ -2285,23 +2303,42 @@ static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
                         unsigned int rx_mask, int slots, int slot_width)
 {
         struct snd_soc_codec *codec = dai->codec;
-        unsigned int val = 0;
+        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+        unsigned int i_slot_sft, o_slot_sft, i_width_sht, o_width_sht, en_sft;
+        unsigned int mask, val = 0;
 
+        switch (rt5645->codec_type) {
+        case CODEC_TYPE_RT5650:
+                en_sft = 15;
+                i_slot_sft = 10;
+                o_slot_sft = 8;
+                i_width_sht = 6;
+                o_width_sht = 4;
+                mask = 0x8ff0;
+                break;
+        default:
+                en_sft = 14;
+                i_slot_sft = o_slot_sft = 12;
+                i_width_sht = o_width_sht = 10;
+                mask = 0x7c00;
+                break;
+        }
         if (rx_mask || tx_mask) {
-                val |= (1 << 14);
-                snd_soc_update_bits(codec, RT5645_BASS_BACK,
-                        RT5645_G_BB_BST_MASK, RT5645_G_BB_BST_25DB);
+                val |= (1 << en_sft);
+                if (rt5645->codec_type == CODEC_TYPE_RT5645)
+                        snd_soc_update_bits(codec, RT5645_BASS_BACK,
+                                RT5645_G_BB_BST_MASK, RT5645_G_BB_BST_25DB);
         }
 
         switch (slots) {
         case 4:
-                val |= (1 << 12);
+                val |= (1 << i_slot_sft) | (1 << o_slot_sft);
                 break;
         case 6:
-                val |= (2 << 12);
+                val |= (2 << i_slot_sft) | (2 << o_slot_sft);
                 break;
         case 8:
-                val |= (3 << 12);
+                val |= (3 << i_slot_sft) | (3 << o_slot_sft);
                 break;
         case 2:
         default:
@@ -2310,20 +2347,20 @@ static int rt5645_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
 
         switch (slot_width) {
         case 20:
-                val |= (1 << 10);
+                val |= (1 << i_width_sht) | (1 << o_width_sht);
                 break;
         case 24:
-                val |= (2 << 10);
+                val |= (2 << i_width_sht) | (2 << o_width_sht);
                 break;
         case 32:
-                val |= (3 << 10);
+                val |= (3 << i_width_sht) | (3 << o_width_sht);
                 break;
         case 16:
         default:
                 break;
         }
 
-        snd_soc_update_bits(codec, RT5645_TDM_CTRL_1, 0x7c00, val);
+        snd_soc_update_bits(codec, RT5645_TDM_CTRL_1, mask, val);
 
         return 0;
 }
@@ -2361,7 +2398,8 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec,
 
         case SND_SOC_BIAS_OFF:
                 snd_soc_write(codec, RT5645_DEPOP_M2, 0x1100);
-                snd_soc_write(codec, RT5645_GEN_CTRL1, 0x0128);
+                snd_soc_update_bits(codec, RT5645_GEN_CTRL1,
+                                RT5645_DIG_GATE_CTRL, 0);
                 snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
                                 RT5645_PWR_VREF1 | RT5645_PWR_MB |
                                 RT5645_PWR_BG | RT5645_PWR_VREF2 |
@@ -2598,7 +2636,7 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5645 = {
 static const struct regmap_config rt5645_regmap = {
         .reg_bits = 8,
         .val_bits = 16,
-
+        .use_single_rw = true,
         .max_register = RT5645_VENDOR_ID2 + 1 + (ARRAY_SIZE(rt5645_ranges) *
                                                RT5645_PR_SPACING),
         .volatile_reg = rt5645_volatile_register,
diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h
index dbfd98c22f4d..db78e9462876 100644
--- a/sound/soc/codecs/rt5645.h
+++ b/sound/soc/codecs/rt5645.h
@@ -804,8 +804,6 @@
 #define RT5645_PWR_DAC_MF_L_BIT                 10
 #define RT5645_PWR_DAC_MF_R                     (0x1 << 9)
 #define RT5645_PWR_DAC_MF_R_BIT                 9
-#define RT5645_PWR_ADC_S2F                      (0x1 << 8)
-#define RT5645_PWR_ADC_S2F_BIT                  8
 #define RT5645_PWR_PDM1                         (0x1 << 7)
 #define RT5645_PWR_PDM1_BIT                     7
 #define RT5645_PWR_PDM2                         (0x1 << 6)
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index fd102613d20d..cc7f84a150a7 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -403,6 +403,189 @@ static bool rt5670_readable_register(struct device *dev, unsigned int reg)
         }
 }
 
+/**
+ * rt5670_headset_detect - Detect headset.
+ * @codec: SoC audio codec device.
+ * @jack_insert: Jack insert or not.
+ *
+ * Detect whether is headset or not when jack inserted.
+ *
+ * Returns detect status.
+ */
+
+static int rt5670_headset_detect(struct snd_soc_codec *codec, int jack_insert)
+{
+        int val;
+        struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
+
+        if (jack_insert) {
+                snd_soc_dapm_force_enable_pin(&codec->dapm,
+                                                       "Mic Det Power");
+                snd_soc_dapm_sync(&codec->dapm);
+                snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x0);
+                snd_soc_update_bits(codec, RT5670_CJ_CTRL2,
+                        RT5670_CBJ_DET_MODE | RT5670_CBJ_MN_JD,
+                        RT5670_CBJ_MN_JD);
+                snd_soc_write(codec, RT5670_GPIO_CTRL2, 0x0004);
+                snd_soc_update_bits(codec, RT5670_GPIO_CTRL1,
+                        RT5670_GP1_PIN_MASK, RT5670_GP1_PIN_IRQ);
+                snd_soc_update_bits(codec, RT5670_CJ_CTRL1,
+                        RT5670_CBJ_BST1_EN, RT5670_CBJ_BST1_EN);
+                snd_soc_write(codec, RT5670_JD_CTRL3, 0x00f0);
+                snd_soc_update_bits(codec, RT5670_CJ_CTRL2,
+                        RT5670_CBJ_MN_JD, RT5670_CBJ_MN_JD);
+                snd_soc_update_bits(codec, RT5670_CJ_CTRL2,
+                        RT5670_CBJ_MN_JD, 0);
+                msleep(300);
+                val = snd_soc_read(codec, RT5670_CJ_CTRL3) & 0x7;
+                if (val == 0x1 || val == 0x2) {
+                        rt5670->jack_type = SND_JACK_HEADSET;
+                        /* for push button */
+                        snd_soc_update_bits(codec, RT5670_INT_IRQ_ST, 0x8, 0x8);
+                        snd_soc_update_bits(codec, RT5670_IL_CMD, 0x40, 0x40);
+                        snd_soc_read(codec, RT5670_IL_CMD);
+                } else {
+                        snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x4);
+                        rt5670->jack_type = SND_JACK_HEADPHONE;
+                        snd_soc_dapm_disable_pin(&codec->dapm, "Mic Det Power");
+                        snd_soc_dapm_sync(&codec->dapm);
+                }
+        } else {
+                snd_soc_update_bits(codec, RT5670_INT_IRQ_ST, 0x8, 0x0);
+                snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x4);
+                rt5670->jack_type = 0;
+                snd_soc_dapm_disable_pin(&codec->dapm, "Mic Det Power");
+                snd_soc_dapm_sync(&codec->dapm);
+        }
+
+        return rt5670->jack_type;
+}
+
+void rt5670_jack_suspend(struct snd_soc_codec *codec)
+{
+        struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
+
+        rt5670->jack_type_saved = rt5670->jack_type;
+        rt5670_headset_detect(codec, 0);
+}
+EXPORT_SYMBOL_GPL(rt5670_jack_suspend);
+
+void rt5670_jack_resume(struct snd_soc_codec *codec)
+{
+        struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
+
+        if (rt5670->jack_type_saved)
+                rt5670_headset_detect(codec, 1);
+}
+EXPORT_SYMBOL_GPL(rt5670_jack_resume);
+
+static int rt5670_button_detect(struct snd_soc_codec *codec)
+{
+        int btn_type, val;
+
+        val = snd_soc_read(codec, RT5670_IL_CMD);
+        btn_type = val & 0xff80;
+        snd_soc_write(codec, RT5670_IL_CMD, val);
+        if (btn_type != 0) {
+                msleep(20);
+                val = snd_soc_read(codec, RT5670_IL_CMD);
+                snd_soc_write(codec, RT5670_IL_CMD, val);
+        }
+
+        return btn_type;
+}
+
+static int rt5670_irq_detection(void *data)
+{
+        struct rt5670_priv *rt5670 = (struct rt5670_priv *)data;
+        struct snd_soc_jack_gpio *gpio = &rt5670->hp_gpio;
+        struct snd_soc_jack *jack = rt5670->jack;
+        int val, btn_type, report = jack->status;
+
+        if (rt5670->pdata.jd_mode == 1) /* 2 port */
+                val = snd_soc_read(rt5670->codec, RT5670_A_JD_CTRL1) & 0x0070;
+        else
+                val = snd_soc_read(rt5670->codec, RT5670_A_JD_CTRL1) & 0x0020;
+
+        switch (val) {
+        /* jack in */
+        case 0x30: /* 2 port */
+        case 0x0: /* 1 port or 2 port */
+                if (rt5670->jack_type == 0) {
+                        report = rt5670_headset_detect(rt5670->codec, 1);
+                        /* for push button and jack out */
+                        gpio->debounce_time = 25;
+                        break;
+                }
+                btn_type = 0;
+                if (snd_soc_read(rt5670->codec, RT5670_INT_IRQ_ST) & 0x4) {
+                        /* button pressed */
+                        report = SND_JACK_HEADSET;
+                        btn_type = rt5670_button_detect(rt5670->codec);
+                        switch (btn_type) {
+                        case 0x2000: /* up */
+                                report |= SND_JACK_BTN_1;
+                                break;
+                        case 0x0400: /* center */
+                                report |= SND_JACK_BTN_0;
+                                break;
+                        case 0x0080: /* down */
+                                report |= SND_JACK_BTN_2;
+                                break;
+                        default:
+                                dev_err(rt5670->codec->dev,
+                                        "Unexpected button code 0x%04x\n",
+                                        btn_type);
+                                break;
+                        }
+                }
+                if (btn_type == 0)/* button release */
+                        report =  rt5670->jack_type;
+
+                break;
+        /* jack out */
+        case 0x70: /* 2 port */
+        case 0x10: /* 2 port */
+        case 0x20: /* 1 port */
+                report = 0;
+                snd_soc_update_bits(rt5670->codec, RT5670_INT_IRQ_ST, 0x1, 0x0);
+                rt5670_headset_detect(rt5670->codec, 0);
+                gpio->debounce_time = 150; /* for jack in */
+                break;
+        default:
+                break;
+        }
+
+        return report;
+}
+
+int rt5670_set_jack_detect(struct snd_soc_codec *codec,
+        struct snd_soc_jack *jack)
+{
+        struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        rt5670->jack = jack;
+        rt5670->hp_gpio.gpiod_dev = codec->dev;
+        rt5670->hp_gpio.name = "headphone detect";
+        rt5670->hp_gpio.report = SND_JACK_HEADSET |
+                SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2;
+        rt5670->hp_gpio.debounce_time = 150;
+        rt5670->hp_gpio.wake = true;
+        rt5670->hp_gpio.data = (struct rt5670_priv *)rt5670;
+        rt5670->hp_gpio.jack_status_check = rt5670_irq_detection;
+
+        ret = snd_soc_jack_add_gpios(rt5670->jack, 1,
+                        &rt5670->hp_gpio);
+        if (ret) {
+                dev_err(codec->dev, "Adding jack GPIO failed\n");
+                return ret;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rt5670_set_jack_detect);
+
 static const DECLARE_TLV_DB_SCALE(out_vol_tlv, -4650, 150, 0);
 static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -65625, 375, 0);
 static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -3450, 150, 0);
@@ -517,11 +700,9 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
         struct snd_soc_codec *codec = snd_soc_dapm_to_codec(source->dapm);
-        unsigned int val;
+        struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
 
-        val = snd_soc_read(codec, RT5670_GLB_CLK);
-        val &= RT5670_SCLK_SRC_MASK;
-        if (val == RT5670_SCLK_SRC_PLL1)
+        if (rt5670->sysclk_src == RT5670_SCLK_S_PLL1)
                 return 1;
         else
                 return 0;
@@ -2271,16 +2452,6 @@ static int rt5670_set_dai_sysclk(struct snd_soc_dai *dai,
         struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
         unsigned int reg_val = 0;
 
-        if (freq == rt5670->sysclk && clk_id == rt5670->sysclk_src)
-                return 0;
-
-        if (rt5670->pdata.jd_mode) {
-                if (clk_id == RT5670_SCLK_S_PLL1)
-                        snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1");
-                else
-                        snd_soc_dapm_disable_pin(&codec->dapm, "PLL1");
-                snd_soc_dapm_sync(&codec->dapm);
-        }
         switch (clk_id) {
         case RT5670_SCLK_S_MCLK:
                 reg_val |= RT5670_SCLK_SRC_MCLK;
@@ -2298,7 +2469,8 @@ static int rt5670_set_dai_sysclk(struct snd_soc_dai *dai,
         snd_soc_update_bits(codec, RT5670_GLB_CLK,
                 RT5670_SCLK_SRC_MASK, reg_val);
         rt5670->sysclk = freq;
-        rt5670->sysclk_src = clk_id;
+        if (clk_id != RT5670_SCLK_S_RCCLK)
+                rt5670->sysclk_src = clk_id;
 
         dev_dbg(dai->dev, "Sysclk is %dHz and clock id is %d\n", freq, clk_id);
 
@@ -2517,6 +2689,7 @@ static int rt5670_remove(struct snd_soc_codec *codec)
         struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
 
         regmap_write(rt5670->regmap, RT5670_RESET, 0);
+        snd_soc_jack_free_gpios(rt5670->jack, 1, &rt5670->hp_gpio);
         return 0;
 }
 
@@ -2676,6 +2849,7 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
         if (dmi_check_system(dmi_platform_intel_braswell)) {
                 rt5670->pdata.dmic_en = true;
                 rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P;
+                rt5670->pdata.dev_gpio = true;
                 rt5670->pdata.jd_mode = 1;
         }
 
@@ -2717,12 +2891,17 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
                 regmap_update_bits(rt5670->regmap, RT5670_IN2,
                                         RT5670_IN_DF2, RT5670_IN_DF2);
 
-        if (i2c->irq) {
+        if (rt5670->pdata.dev_gpio) {
+                /* for push button */
+                regmap_write(rt5670->regmap, RT5670_IL_CMD, 0x0000);
+                regmap_write(rt5670->regmap, RT5670_IL_CMD2, 0x0010);
+                regmap_write(rt5670->regmap, RT5670_IL_CMD3, 0x0014);
+                /* for irq */
                 regmap_update_bits(rt5670->regmap, RT5670_GPIO_CTRL1,
                                    RT5670_GP1_PIN_MASK, RT5670_GP1_PIN_IRQ);
                 regmap_update_bits(rt5670->regmap, RT5670_GPIO_CTRL2,
                                    RT5670_GP1_PF_MASK, RT5670_GP1_PF_OUT);
-
+                regmap_update_bits(rt5670->regmap, RT5670_DIG_MISC, 0x8, 0x8);
         }
 
         if (rt5670->pdata.jd_mode) {
diff --git a/sound/soc/codecs/rt5670.h b/sound/soc/codecs/rt5670.h
index 0a67adbcfbc3..dc2b46236c5c 100644
--- a/sound/soc/codecs/rt5670.h
+++ b/sound/soc/codecs/rt5670.h
@@ -1988,6 +1988,8 @@ struct rt5670_priv {
         struct snd_soc_codec *codec;
         struct rt5670_platform_data pdata;
         struct regmap *regmap;
+        struct snd_soc_jack *jack;
+        struct snd_soc_jack_gpio hp_gpio;
 
         int sysclk;
         int sysclk_src;
@@ -2002,6 +2004,11 @@ struct rt5670_priv {
         int dsp_sw; /* expected parameter setting */
         int dsp_rate;
         int jack_type;
+        int jack_type_saved;
 };
 
+void rt5670_jack_suspend(struct snd_soc_codec *codec);
+void rt5670_jack_resume(struct snd_soc_codec *codec);
+int rt5670_set_jack_detect(struct snd_soc_codec *codec,
+        struct snd_soc_jack *jack);
 #endif /* __RT5670_H__ */
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index c2a6e4091357..af182586712d 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -1034,6 +1034,169 @@ static int can_use_asrc(struct snd_soc_dapm_widget *source,
         return 0;
 }
 
+/**
+ * rt5677_sel_asrc_clk_src - select ASRC clock source for a set of filters
+ * @codec: SoC audio codec device.
+ * @filter_mask: mask of filters.
+ * @clk_src: clock source
+ *
+ * The ASRC function is for asynchronous MCLK and LRCK. Also, since RT5677 can
+ * only support standard 32fs or 64fs i2s format, ASRC should be enabled to
+ * support special i2s clock format such as Intel's 100fs(100 * sampling rate).
+ * ASRC function will track i2s clock and generate a corresponding system clock
+ * for codec. This function provides an API to select the clock source for a
+ * set of filters specified by the mask. And the codec driver will turn on ASRC
+ * for these filters if ASRC is selected as their clock source.
+ */
+int rt5677_sel_asrc_clk_src(struct snd_soc_codec *codec,
+                unsigned int filter_mask, unsigned int clk_src)
+{
+        struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
+        unsigned int asrc3_mask = 0, asrc3_value = 0;
+        unsigned int asrc4_mask = 0, asrc4_value = 0;
+        unsigned int asrc5_mask = 0, asrc5_value = 0;
+        unsigned int asrc6_mask = 0, asrc6_value = 0;
+        unsigned int asrc7_mask = 0, asrc7_value = 0;
+
+        switch (clk_src) {
+        case RT5677_CLK_SEL_SYS:
+        case RT5677_CLK_SEL_I2S1_ASRC:
+        case RT5677_CLK_SEL_I2S2_ASRC:
+        case RT5677_CLK_SEL_I2S3_ASRC:
+        case RT5677_CLK_SEL_I2S4_ASRC:
+        case RT5677_CLK_SEL_I2S5_ASRC:
+        case RT5677_CLK_SEL_I2S6_ASRC:
+        case RT5677_CLK_SEL_SYS2:
+        case RT5677_CLK_SEL_SYS3:
+        case RT5677_CLK_SEL_SYS4:
+        case RT5677_CLK_SEL_SYS5:
+        case RT5677_CLK_SEL_SYS6:
+        case RT5677_CLK_SEL_SYS7:
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        /* ASRC 3 */
+        if (filter_mask & RT5677_DA_STEREO_FILTER) {
+                asrc3_mask |= RT5677_DA_STO_CLK_SEL_MASK;
+                asrc3_value = (asrc3_value & ~RT5677_DA_STO_CLK_SEL_MASK)
+                        | (clk_src << RT5677_DA_STO_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_DA_MONO2_L_FILTER) {
+                asrc3_mask |= RT5677_DA_MONO2L_CLK_SEL_MASK;
+                asrc3_value = (asrc3_value & ~RT5677_DA_MONO2L_CLK_SEL_MASK)
+                        | (clk_src << RT5677_DA_MONO2L_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_DA_MONO2_R_FILTER) {
+                asrc3_mask |= RT5677_DA_MONO2R_CLK_SEL_MASK;
+                asrc3_value = (asrc3_value & ~RT5677_DA_MONO2R_CLK_SEL_MASK)
+                        | (clk_src << RT5677_DA_MONO2R_CLK_SEL_SFT);
+        }
+
+        if (asrc3_mask)
+                regmap_update_bits(rt5677->regmap, RT5677_ASRC_3, asrc3_mask,
+                        asrc3_value);
+
+        /* ASRC 4 */
+        if (filter_mask & RT5677_DA_MONO3_L_FILTER) {
+                asrc4_mask |= RT5677_DA_MONO3L_CLK_SEL_MASK;
+                asrc4_value = (asrc4_value & ~RT5677_DA_MONO3L_CLK_SEL_MASK)
+                        | (clk_src << RT5677_DA_MONO3L_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_DA_MONO3_R_FILTER) {
+                asrc4_mask |= RT5677_DA_MONO3R_CLK_SEL_MASK;
+                asrc4_value = (asrc4_value & ~RT5677_DA_MONO3R_CLK_SEL_MASK)
+                        | (clk_src << RT5677_DA_MONO3R_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_DA_MONO4_L_FILTER) {
+                asrc4_mask |= RT5677_DA_MONO4L_CLK_SEL_MASK;
+                asrc4_value = (asrc4_value & ~RT5677_DA_MONO4L_CLK_SEL_MASK)
+                        | (clk_src << RT5677_DA_MONO4L_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_DA_MONO4_R_FILTER) {
+                asrc4_mask |= RT5677_DA_MONO4R_CLK_SEL_MASK;
+                asrc4_value = (asrc4_value & ~RT5677_DA_MONO4R_CLK_SEL_MASK)
+                        | (clk_src << RT5677_DA_MONO4R_CLK_SEL_SFT);
+        }
+
+        if (asrc4_mask)
+                regmap_update_bits(rt5677->regmap, RT5677_ASRC_4, asrc4_mask,
+                        asrc4_value);
+
+        /* ASRC 5 */
+        if (filter_mask & RT5677_AD_STEREO1_FILTER) {
+                asrc5_mask |= RT5677_AD_STO1_CLK_SEL_MASK;
+                asrc5_value = (asrc5_value & ~RT5677_AD_STO1_CLK_SEL_MASK)
+                        | (clk_src << RT5677_AD_STO1_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_AD_STEREO2_FILTER) {
+                asrc5_mask |= RT5677_AD_STO2_CLK_SEL_MASK;
+                asrc5_value = (asrc5_value & ~RT5677_AD_STO2_CLK_SEL_MASK)
+                        | (clk_src << RT5677_AD_STO2_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_AD_STEREO3_FILTER) {
+                asrc5_mask |= RT5677_AD_STO3_CLK_SEL_MASK;
+                asrc5_value = (asrc5_value & ~RT5677_AD_STO3_CLK_SEL_MASK)
+                        | (clk_src << RT5677_AD_STO3_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_AD_STEREO4_FILTER) {
+                asrc5_mask |= RT5677_AD_STO4_CLK_SEL_MASK;
+                asrc5_value = (asrc5_value & ~RT5677_AD_STO4_CLK_SEL_MASK)
+                        | (clk_src << RT5677_AD_STO4_CLK_SEL_SFT);
+        }
+
+        if (asrc5_mask)
+                regmap_update_bits(rt5677->regmap, RT5677_ASRC_5, asrc5_mask,
+                        asrc5_value);
+
+        /* ASRC 6 */
+        if (filter_mask & RT5677_AD_MONO_L_FILTER) {
+                asrc6_mask |= RT5677_AD_MONOL_CLK_SEL_MASK;
+                asrc6_value = (asrc6_value & ~RT5677_AD_MONOL_CLK_SEL_MASK)
+                        | (clk_src << RT5677_AD_MONOL_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_AD_MONO_R_FILTER) {
+                asrc6_mask |= RT5677_AD_MONOR_CLK_SEL_MASK;
+                asrc6_value = (asrc6_value & ~RT5677_AD_MONOR_CLK_SEL_MASK)
+                        | (clk_src << RT5677_AD_MONOR_CLK_SEL_SFT);
+        }
+
+        if (asrc6_mask)
+                regmap_update_bits(rt5677->regmap, RT5677_ASRC_6, asrc6_mask,
+                        asrc6_value);
+
+        /* ASRC 7 */
+        if (filter_mask & RT5677_DSP_OB_0_3_FILTER) {
+                asrc7_mask |= RT5677_DSP_OB_0_3_CLK_SEL_MASK;
+                asrc7_value = (asrc7_value & ~RT5677_DSP_OB_0_3_CLK_SEL_MASK)
+                        | (clk_src << RT5677_DSP_OB_0_3_CLK_SEL_SFT);
+        }
+
+        if (filter_mask & RT5677_DSP_OB_4_7_FILTER) {
+                asrc7_mask |= RT5677_DSP_OB_4_7_CLK_SEL_MASK;
+                asrc7_value = (asrc7_value & ~RT5677_DSP_OB_4_7_CLK_SEL_MASK)
+                        | (clk_src << RT5677_DSP_OB_4_7_CLK_SEL_SFT);
+        }
+
+        if (asrc7_mask)
+                regmap_update_bits(rt5677->regmap, RT5677_ASRC_7, asrc7_mask,
+                        asrc7_value);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(rt5677_sel_asrc_clk_src);
+
 /* Digital Mixer */
 static const struct snd_kcontrol_new rt5677_sto1_adc_l_mix[] = {
         SOC_DAPM_SINGLE("ADC1 Switch", RT5677_STO1_ADC_MIXER,
diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h
index 07df96b43f59..9dceb41d18ea 100644
--- a/sound/soc/codecs/rt5677.h
+++ b/sound/soc/codecs/rt5677.h
@@ -1406,6 +1406,46 @@
 #define RT5677_DSP_CLK_SRC_PLL2                 (0x0 << 7)
 #define RT5677_DSP_CLK_SRC_BYPASS               (0x1 << 7)
 
+/* ASRC Control 3 (0x85) */
+#define RT5677_DA_STO_CLK_SEL_MASK              (0xf << 12)
+#define RT5677_DA_STO_CLK_SEL_SFT               12
+#define RT5677_DA_MONO2L_CLK_SEL_MASK           (0xf << 4)
+#define RT5677_DA_MONO2L_CLK_SEL_SFT            4
+#define RT5677_DA_MONO2R_CLK_SEL_MASK           (0xf << 0)
+#define RT5677_DA_MONO2R_CLK_SEL_SFT            0
+
+/* ASRC Control 4 (0x86) */
+#define RT5677_DA_MONO3L_CLK_SEL_MASK           (0xf << 12)
+#define RT5677_DA_MONO3L_CLK_SEL_SFT            12
+#define RT5677_DA_MONO3R_CLK_SEL_MASK           (0xf << 8)
+#define RT5677_DA_MONO3R_CLK_SEL_SFT            8
+#define RT5677_DA_MONO4L_CLK_SEL_MASK           (0xf << 4)
+#define RT5677_DA_MONO4L_CLK_SEL_SFT            4
+#define RT5677_DA_MONO4R_CLK_SEL_MASK           (0xf << 0)
+#define RT5677_DA_MONO4R_CLK_SEL_SFT            0
+
+/* ASRC Control 5 (0x87) */
+#define RT5677_AD_STO1_CLK_SEL_MASK             (0xf << 12)
+#define RT5677_AD_STO1_CLK_SEL_SFT              12
+#define RT5677_AD_STO2_CLK_SEL_MASK             (0xf << 8)
+#define RT5677_AD_STO2_CLK_SEL_SFT              8
+#define RT5677_AD_STO3_CLK_SEL_MASK             (0xf << 4)
+#define RT5677_AD_STO3_CLK_SEL_SFT              4
+#define RT5677_AD_STO4_CLK_SEL_MASK             (0xf << 0)
+#define RT5677_AD_STO4_CLK_SEL_SFT              0
+
+/* ASRC Control 6 (0x88) */
+#define RT5677_AD_MONOL_CLK_SEL_MASK            (0xf << 12)
+#define RT5677_AD_MONOL_CLK_SEL_SFT             12
+#define RT5677_AD_MONOR_CLK_SEL_MASK            (0xf << 8)
+#define RT5677_AD_MONOR_CLK_SEL_SFT             8
+
+/* ASRC Control 7 (0x89) */
+#define RT5677_DSP_OB_0_3_CLK_SEL_MASK          (0xf << 12)
+#define RT5677_DSP_OB_0_3_CLK_SEL_SFT           12
+#define RT5677_DSP_OB_4_7_CLK_SEL_MASK          (0xf << 8)
+#define RT5677_DSP_OB_4_7_CLK_SEL_SFT           8
+
 /* VAD Function Control 4 (0x9f) */
 #define RT5677_VAD_SRC_MASK                     (0x7 << 8)
 #define RT5677_VAD_SRC_SFT                      8
@@ -1670,6 +1710,42 @@ enum rt5677_type {
         RT5676,
 };
 
+/* ASRC clock source selection */
+enum {
+        RT5677_CLK_SEL_SYS,
+        RT5677_CLK_SEL_I2S1_ASRC,
+        RT5677_CLK_SEL_I2S2_ASRC,
+        RT5677_CLK_SEL_I2S3_ASRC,
+        RT5677_CLK_SEL_I2S4_ASRC,
+        RT5677_CLK_SEL_I2S5_ASRC,
+        RT5677_CLK_SEL_I2S6_ASRC,
+        RT5677_CLK_SEL_SYS2,
+        RT5677_CLK_SEL_SYS3,
+        RT5677_CLK_SEL_SYS4,
+        RT5677_CLK_SEL_SYS5,
+        RT5677_CLK_SEL_SYS6,
+        RT5677_CLK_SEL_SYS7,
+};
+
+/* filter mask */
+enum {
+        RT5677_DA_STEREO_FILTER = 0x1,
+        RT5677_DA_MONO2_L_FILTER = (0x1 << 1),
+        RT5677_DA_MONO2_R_FILTER = (0x1 << 2),
+        RT5677_DA_MONO3_L_FILTER = (0x1 << 3),
+        RT5677_DA_MONO3_R_FILTER = (0x1 << 4),
+        RT5677_DA_MONO4_L_FILTER = (0x1 << 5),
+        RT5677_DA_MONO4_R_FILTER = (0x1 << 6),
+        RT5677_AD_STEREO1_FILTER = (0x1 << 7),
+        RT5677_AD_STEREO2_FILTER = (0x1 << 8),
+        RT5677_AD_STEREO3_FILTER = (0x1 << 9),
+        RT5677_AD_STEREO4_FILTER = (0x1 << 10),
+        RT5677_AD_MONO_L_FILTER = (0x1 << 11),
+        RT5677_AD_MONO_R_FILTER = (0x1 << 12),
+        RT5677_DSP_OB_0_3_FILTER = (0x1 << 13),
+        RT5677_DSP_OB_4_7_FILTER = (0x1 << 14),
+};
+
 struct rt5677_priv {
         struct snd_soc_codec *codec;
         struct rt5677_platform_data pdata;
@@ -1696,4 +1772,7 @@ struct rt5677_priv {
         bool is_vref_slow;
 };
 
+int rt5677_sel_asrc_clk_src(struct snd_soc_codec *codec,
+                unsigned int filter_mask, unsigned int clk_src);
+
 #endif /* __RT5677_H__ */
diff --git a/sound/soc/codecs/tlv320aic23-i2c.c b/sound/soc/codecs/tlv320aic23-i2c.c
index f13701995482..78a94af65518 100644
--- a/sound/soc/codecs/tlv320aic23-i2c.c
+++ b/sound/soc/codecs/tlv320aic23-i2c.c
@@ -31,7 +31,7 @@ static int tlv320aic23_i2c_probe(struct i2c_client *i2c,
         return tlv320aic23_probe(&i2c->dev, regmap);
 }
 
-static int __exit tlv320aic23_i2c_remove(struct i2c_client *i2c)
+static int tlv320aic23_i2c_remove(struct i2c_client *i2c)
 {
         snd_soc_unregister_codec(&i2c->dev);
         return 0;
@@ -56,7 +56,7 @@ static struct i2c_driver tlv320aic23_i2c_driver = {
                    .of_match_table = of_match_ptr(tlv320aic23_of_match),
                    },
         .probe = tlv320aic23_i2c_probe,
-        .remove = __exit_p(tlv320aic23_i2c_remove),
+        .remove = tlv320aic23_i2c_remove,
         .id_table = tlv320aic23_id,
 };
 
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index 15599845a660..5a9da28f4f33 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -1554,7 +1554,6 @@ static int wm2200_probe(struct snd_soc_codec *codec)
         int ret;
 
         wm2200->codec = codec;
-        codec->dapm.bias_level = SND_SOC_BIAS_OFF;
 
         ret = snd_soc_add_codec_controls(codec, wm_adsp1_fw_controls, 2);
         if (ret != 0)
@@ -1942,6 +1941,7 @@ static int wm2200_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
         struct wm2200_priv *wm2200 = snd_soc_codec_get_drvdata(codec);
         struct _fll_div factors;
         int ret, i, timeout;
+        unsigned long time_left;
 
         if (!Fout) {
                 dev_dbg(codec->dev, "FLL disabled");
@@ -2021,9 +2021,10 @@ static int wm2200_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
         /* Poll for the lock; will use the interrupt to exit quickly */
         for (i = 0; i < timeout; i++) {
                 if (i2c->irq) {
-                        ret = wait_for_completion_timeout(&wm2200->fll_lock,
-                                                          msecs_to_jiffies(25));
-                        if (ret > 0)
+                        time_left = wait_for_completion_timeout(
+                                                        &wm2200->fll_lock,
+                                                        msecs_to_jiffies(25));
+                        if (time_left > 0)
                                 break;
                 } else {
                         msleep(1);
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index ea09db585aa1..96740379b711 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1762,6 +1762,7 @@ static int wm5100_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
         struct _fll_div factors;
         struct wm5100_fll *fll;
         int ret, base, lock, i, timeout;
+        unsigned long time_left;
 
         switch (fll_id) {
         case WM5100_FLL1:
@@ -1842,9 +1843,9 @@ static int wm5100_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
         /* Poll for the lock; will use interrupt when we can test */
         for (i = 0; i < timeout; i++) {
                 if (i2c->irq) {
-                        ret = wait_for_completion_timeout(&fll->lock,
-                                                          msecs_to_jiffies(25));
-                        if (ret > 0)
+                        time_left = wait_for_completion_timeout(&fll->lock,
+                                                        msecs_to_jiffies(25));
+                        if (time_left > 0)
                                 break;
                 } else {
                         msleep(1);
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 6d0fe0ac95a3..0c6d1bc0526e 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1861,7 +1861,6 @@ static unsigned int wm5102_digital_vu[] = {
         ARIZONA_DAC_DIGITAL_VOLUME_2L,
         ARIZONA_DAC_DIGITAL_VOLUME_2R,
         ARIZONA_DAC_DIGITAL_VOLUME_3L,
-        ARIZONA_DAC_DIGITAL_VOLUME_3R,
         ARIZONA_DAC_DIGITAL_VOLUME_4L,
         ARIZONA_DAC_DIGITAL_VOLUME_4R,
         ARIZONA_DAC_DIGITAL_VOLUME_5L,
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index c81a9eab3e3e..c65e5a75fc1a 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -69,14 +69,14 @@ struct wm8350_data {
         struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)];
         int fll_freq_out;
         int fll_freq_in;
+        struct delayed_work pga_work;
 };
 
 /*
  * Ramp OUT1 PGA volume to minimise pops at stream startup and shutdown.
  */
-static inline int wm8350_out1_ramp_step(struct snd_soc_codec *codec)
+static inline int wm8350_out1_ramp_step(struct wm8350_data *wm8350_data)
 {
-        struct wm8350_data *wm8350_data = snd_soc_codec_get_drvdata(codec);
         struct wm8350_output *out1 = &wm8350_data->out1;
         struct wm8350 *wm8350 = wm8350_data->wm8350;
         int left_complete = 0, right_complete = 0;
@@ -140,9 +140,8 @@ static inline int wm8350_out1_ramp_step(struct snd_soc_codec *codec)
 /*
  * Ramp OUT2 PGA volume to minimise pops at stream startup and shutdown.
  */
-static inline int wm8350_out2_ramp_step(struct snd_soc_codec *codec)
+static inline int wm8350_out2_ramp_step(struct wm8350_data *wm8350_data)
 {
-        struct wm8350_data *wm8350_data = snd_soc_codec_get_drvdata(codec);
         struct wm8350_output *out2 = &wm8350_data->out2;
         struct wm8350 *wm8350 = wm8350_data->wm8350;
         int left_complete = 0, right_complete = 0;
@@ -210,10 +209,8 @@ static inline int wm8350_out2_ramp_step(struct snd_soc_codec *codec)
  */
 static void wm8350_pga_work(struct work_struct *work)
 {
-        struct snd_soc_dapm_context *dapm =
-            container_of(work, struct snd_soc_dapm_context, delayed_work.work);
-        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
-        struct wm8350_data *wm8350_data = snd_soc_codec_get_drvdata(codec);
+        struct wm8350_data *wm8350_data =
+                container_of(work, struct wm8350_data, pga_work.work);
         struct wm8350_output *out1 = &wm8350_data->out1,
             *out2 = &wm8350_data->out2;
         int i, out1_complete, out2_complete;
@@ -226,9 +223,9 @@ static void wm8350_pga_work(struct work_struct *work)
         for (i = 0; i <= 63; i++) {
                 out1_complete = 1, out2_complete = 1;
                 if (out1->ramp != WM8350_RAMP_NONE)
-                        out1_complete = wm8350_out1_ramp_step(codec);
+                        out1_complete = wm8350_out1_ramp_step(wm8350_data);
                 if (out2->ramp != WM8350_RAMP_NONE)
-                        out2_complete = wm8350_out2_ramp_step(codec);
+                        out2_complete = wm8350_out2_ramp_step(wm8350_data);
 
                 /* ramp finished ? */
                 if (out1_complete && out2_complete)
@@ -283,7 +280,7 @@ static int pga_event(struct snd_soc_dapm_widget *w,
                 out->ramp = WM8350_RAMP_UP;
                 out->active = 1;
 
-                schedule_delayed_work(&codec->dapm.delayed_work,
+                schedule_delayed_work(&wm8350_data->pga_work,
                                       msecs_to_jiffies(1));
                 break;
 
@@ -291,7 +288,7 @@ static int pga_event(struct snd_soc_dapm_widget *w,
                 out->ramp = WM8350_RAMP_DOWN;
                 out->active = 0;
 
-                schedule_delayed_work(&codec->dapm.delayed_work,
+                schedule_delayed_work(&wm8350_data->pga_work,
                                       msecs_to_jiffies(1));
                 break;
         }
@@ -1492,7 +1489,7 @@ static  int wm8350_codec_probe(struct snd_soc_codec *codec)
         /* Put the codec into reset if it wasn't already */
         wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);
 
-        INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8350_pga_work);
+        INIT_DELAYED_WORK(&priv->pga_work, wm8350_pga_work);
         INIT_DELAYED_WORK(&priv->hpl.work, wm8350_hpl_work);
         INIT_DELAYED_WORK(&priv->hpr.work, wm8350_hpr_work);
 
@@ -1578,7 +1575,7 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
 
         /* if there was any work waiting then we run it now and
          * wait for its completion */
-        flush_delayed_work(&codec->dapm.delayed_work);
+        flush_delayed_work(&priv->pga_work);
 
         wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);
 
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index c6d10533e2bd..2245b6a32f3d 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -25,6 +25,7 @@
 #include <linux/spi/spi.h>
 #include <linux/of_device.h>
 #include <linux/mutex.h>
+#include <linux/clk.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -45,6 +46,7 @@ static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = {
 /* codec private data */
 struct wm8731_priv {
         struct regmap *regmap;
+        struct clk *mclk;
         struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES];
         const struct snd_pcm_hw_constraint_list *constraints;
         unsigned int sysclk;
@@ -390,6 +392,8 @@ static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
         switch (clk_id) {
         case WM8731_SYSCLK_XTAL:
         case WM8731_SYSCLK_MCLK:
+                if (wm8731->mclk && clk_set_rate(wm8731->mclk, freq))
+                        return -EINVAL;
                 wm8731->sysclk_type = clk_id;
                 break;
         default:
@@ -491,6 +495,8 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
 
         switch (level) {
         case SND_SOC_BIAS_ON:
+                if (wm8731->mclk)
+                        clk_prepare_enable(wm8731->mclk);
                 break;
         case SND_SOC_BIAS_PREPARE:
                 break;
@@ -509,6 +515,8 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
                 snd_soc_write(codec, WM8731_PWR, reg | 0x0040);
                 break;
         case SND_SOC_BIAS_OFF:
+                if (wm8731->mclk)
+                        clk_disable_unprepare(wm8731->mclk);
                 snd_soc_write(codec, WM8731_PWR, 0xffff);
                 regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),
                                        wm8731->supplies);
@@ -667,6 +675,19 @@ static int wm8731_spi_probe(struct spi_device *spi)
         if (wm8731 == NULL)
                 return -ENOMEM;
 
+        wm8731->mclk = devm_clk_get(&spi->dev, "mclk");
+        if (IS_ERR(wm8731->mclk)) {
+                ret = PTR_ERR(wm8731->mclk);
+                if (ret == -ENOENT) {
+                        wm8731->mclk = NULL;
+                        dev_warn(&spi->dev, "Assuming static MCLK\n");
+                } else {
+                        dev_err(&spi->dev, "Failed to get MCLK: %d\n",
+                                ret);
+                        return ret;
+                }
+        }
+
         mutex_init(&wm8731->lock);
 
         wm8731->regmap = devm_regmap_init_spi(spi, &wm8731_regmap);
@@ -718,6 +739,19 @@ static int wm8731_i2c_probe(struct i2c_client *i2c,
         if (wm8731 == NULL)
                 return -ENOMEM;
 
+        wm8731->mclk = devm_clk_get(&i2c->dev, "mclk");
+        if (IS_ERR(wm8731->mclk)) {
+                ret = PTR_ERR(wm8731->mclk);
+                if (ret == -ENOENT) {
+                        wm8731->mclk = NULL;
+                        dev_warn(&i2c->dev, "Assuming static MCLK\n");
+                } else {
+                        dev_err(&i2c->dev, "Failed to get MCLK: %d\n",
+                                ret);
+                        return ret;
+                }
+        }
+
         mutex_init(&wm8731->lock);
 
         wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c
index 31bb4801a005..9e71c768966f 100644
--- a/sound/soc/codecs/wm8741.c
+++ b/sound/soc/codecs/wm8741.c
@@ -123,7 +123,7 @@ static struct {
 };
 
 static const unsigned int rates_11289[] = {
-        44100, 88235,
+        44100, 88200,
 };
 
 static const struct snd_pcm_hw_constraint_list constraints_11289 = {
@@ -150,7 +150,7 @@ static const struct snd_pcm_hw_constraint_list constraints_16384 = {
 };
 
 static const unsigned int rates_16934[] = {
-        44100, 88235,
+        44100, 88200,
 };
 
 static const struct snd_pcm_hw_constraint_list constraints_16934 = {
@@ -168,7 +168,7 @@ static const struct snd_pcm_hw_constraint_list constraints_18432 = {
 };
 
 static const unsigned int rates_22579[] = {
-        44100, 88235, 1764000
+        44100, 88200, 176400
 };
 
 static const struct snd_pcm_hw_constraint_list constraints_22579 = {
@@ -186,7 +186,7 @@ static const struct snd_pcm_hw_constraint_list constraints_24576 = {
 };
 
 static const unsigned int rates_36864[] = {
-        48000, 96000, 19200
+        48000, 96000, 192000
 };
 
 static const struct snd_pcm_hw_constraint_list constraints_36864 = {
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 21ca3a94fc96..c50a5959345f 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -153,6 +153,7 @@ struct wm8753_priv {
         unsigned int hifi_fmt;
 
         int dai_func;
+        struct delayed_work charge_work;
 };
 
 #define wm8753_reset(c) snd_soc_write(c, WM8753_RESET, 0)
@@ -1326,9 +1327,19 @@ static int wm8753_mute(struct snd_soc_dai *dai, int mute)
         return 0;
 }
 
+static void wm8753_charge_work(struct work_struct *work)
+{
+        struct wm8753_priv *wm8753 =
+                container_of(work, struct wm8753_priv, charge_work.work);
+
+        /* Set to 500k */
+        regmap_update_bits(wm8753->regmap, WM8753_PWR1, 0x0180, 0x0100);
+}
+
 static int wm8753_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
+        struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
         u16 pwr_reg = snd_soc_read(codec, WM8753_PWR1) & 0xfe3e;
 
         switch (level) {
@@ -1337,14 +1348,22 @@ static int wm8753_set_bias_level(struct snd_soc_codec *codec,
                 snd_soc_write(codec, WM8753_PWR1, pwr_reg | 0x00c0);
                 break;
         case SND_SOC_BIAS_PREPARE:
-                /* set vmid to 5k for quick power up */
-                snd_soc_write(codec, WM8753_PWR1, pwr_reg | 0x01c1);
+                /* Wait until fully charged */
+                flush_delayed_work(&wm8753->charge_work);
                 break;
         case SND_SOC_BIAS_STANDBY:
-                /* mute dac and set vmid to 500k, enable VREF */
-                snd_soc_write(codec, WM8753_PWR1, pwr_reg | 0x0141);
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
+                        /* set vmid to 5k for quick power up */
+                        snd_soc_write(codec, WM8753_PWR1, pwr_reg | 0x01c1);
+                        schedule_delayed_work(&wm8753->charge_work,
+                                msecs_to_jiffies(caps_charge));
+                } else {
+                        /* mute dac and set vmid to 500k, enable VREF */
+                        snd_soc_write(codec, WM8753_PWR1, pwr_reg | 0x0141);
+                }
                 break;
         case SND_SOC_BIAS_OFF:
+                cancel_delayed_work_sync(&wm8753->charge_work);
                 snd_soc_write(codec, WM8753_PWR1, 0x0001);
                 break;
         }
@@ -1428,38 +1447,12 @@ static struct snd_soc_dai_driver wm8753_dai[] = {
 },
 };
 
-static void wm8753_work(struct work_struct *work)
-{
-        struct snd_soc_dapm_context *dapm =
-                container_of(work, struct snd_soc_dapm_context,
-                             delayed_work.work);
-        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
-        wm8753_set_bias_level(codec, dapm->bias_level);
-}
-
-static int wm8753_suspend(struct snd_soc_codec *codec)
-{
-        wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        return 0;
-}
-
 static int wm8753_resume(struct snd_soc_codec *codec)
 {
         struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
 
         regcache_sync(wm8753->regmap);
 
-        wm8753_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-        /* charge wm8753 caps */
-        if (codec->dapm.suspend_bias_level == SND_SOC_BIAS_ON) {
-                wm8753_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
-                codec->dapm.bias_level = SND_SOC_BIAS_ON;
-                queue_delayed_work(system_power_efficient_wq,
-                                   &codec->dapm.delayed_work,
-                                   msecs_to_jiffies(caps_charge));
-        }
-
         return 0;
 }
 
@@ -1468,7 +1461,7 @@ static int wm8753_probe(struct snd_soc_codec *codec)
         struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
-        INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8753_work);
+        INIT_DELAYED_WORK(&wm8753->charge_work, wm8753_charge_work);
 
         ret = wm8753_reset(codec);
         if (ret < 0) {
@@ -1476,14 +1469,8 @@ static int wm8753_probe(struct snd_soc_codec *codec)
                 return ret;
         }
 
-        wm8753_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         wm8753->dai_func = 0;
 
-        /* charge output caps */
-        wm8753_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
-        schedule_delayed_work(&codec->dapm.delayed_work,
-                              msecs_to_jiffies(caps_charge));
-
         /* set the update bits */
         snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100);
         snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100);
@@ -1499,21 +1486,11 @@ static int wm8753_probe(struct snd_soc_codec *codec)
         return 0;
 }
 
-/* power down chip */
-static int wm8753_remove(struct snd_soc_codec *codec)
-{
-        flush_delayed_work(&codec->dapm.delayed_work);
-        wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-        return 0;
-}
-
 static struct snd_soc_codec_driver soc_codec_dev_wm8753 = {
         .probe =        wm8753_probe,
-        .remove =       wm8753_remove,
-        .suspend =      wm8753_suspend,
         .resume =       wm8753_resume,
         .set_bias_level = wm8753_set_bias_level,
+        .suspend_bias_off = true,
 
         .controls = wm8753_snd_controls,
         .num_controls = ARRAY_SIZE(wm8753_snd_controls),
diff --git a/sound/soc/codecs/wm8804-i2c.c b/sound/soc/codecs/wm8804-i2c.c
index 5bd4af2b4059..6596f5f3a0c3 100644
--- a/sound/soc/codecs/wm8804-i2c.c
+++ b/sound/soc/codecs/wm8804-i2c.c
@@ -50,6 +50,7 @@ static struct i2c_driver wm8804_i2c_driver = {
         .driver = {
                 .name = "wm8804",
                 .owner = THIS_MODULE,
+                .pm = &wm8804_pm,
                 .of_match_table = wm8804_of_match,
         },
         .probe = wm8804_i2c_probe,
diff --git a/sound/soc/codecs/wm8804-spi.c b/sound/soc/codecs/wm8804-spi.c
index 287e11e90794..407a3cf391e5 100644
--- a/sound/soc/codecs/wm8804-spi.c
+++ b/sound/soc/codecs/wm8804-spi.c
@@ -43,6 +43,7 @@ static struct spi_driver wm8804_spi_driver = {
         .driver = {
                 .name = "wm8804",
                 .owner = THIS_MODULE,
+                .pm = &wm8804_pm,
                 .of_match_table = wm8804_of_match,
         },
         .probe = wm8804_spi_probe,
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 1bd4ace29594..1e403f67cf16 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -13,8 +13,10 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/gpio/consumer.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
+#include <linux/pm_runtime.h>
 #include <linux/of_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
@@ -24,6 +26,7 @@
 #include <sound/soc.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
+#include <sound/soc-dapm.h>
 
 #include "wm8804.h"
 
@@ -57,18 +60,23 @@ static const struct reg_default wm8804_reg_defaults[] = {
 };
 
 struct wm8804_priv {
+        struct device *dev;
         struct regmap *regmap;
         struct regulator_bulk_data supplies[WM8804_NUM_SUPPLIES];
         struct notifier_block disable_nb[WM8804_NUM_SUPPLIES];
         int mclk_div;
-};
 
-static int txsrc_get(struct snd_kcontrol *kcontrol,
-                     struct snd_ctl_elem_value *ucontrol);
+        struct gpio_desc *reset;
+
+        int aif_pwr;
+};
 
 static int txsrc_put(struct snd_kcontrol *kcontrol,
                      struct snd_ctl_elem_value *ucontrol);
 
+static int wm8804_aif_event(struct snd_soc_dapm_widget *w,
+                            struct snd_kcontrol *kcontrol, int event);
+
 /*
  * We can't use the same notifier block for more than one supply and
  * there's no way I can see to get from a callback to the caller
@@ -90,26 +98,62 @@ WM8804_REGULATOR_EVENT(0)
 WM8804_REGULATOR_EVENT(1)
 
 static const char *txsrc_text[] = { "S/PDIF RX", "AIF" };
-static SOC_ENUM_SINGLE_EXT_DECL(txsrc, txsrc_text);
+static const SOC_ENUM_SINGLE_DECL(txsrc, WM8804_SPDTX4, 6, txsrc_text);
 
-static const struct snd_kcontrol_new wm8804_snd_controls[] = {
-        SOC_ENUM_EXT("Input Source", txsrc, txsrc_get, txsrc_put),
-        SOC_SINGLE("TX Playback Switch", WM8804_PWRDN, 2, 1, 1),
-        SOC_SINGLE("AIF Playback Switch", WM8804_PWRDN, 4, 1, 1)
+static const struct snd_kcontrol_new wm8804_tx_source_mux[] = {
+        SOC_DAPM_ENUM_EXT("Input Source", txsrc,
+                          snd_soc_dapm_get_enum_double, txsrc_put),
 };
 
-static int txsrc_get(struct snd_kcontrol *kcontrol,
-                     struct snd_ctl_elem_value *ucontrol)
-{
-        struct snd_soc_codec *codec;
-        unsigned int src;
+static const struct snd_soc_dapm_widget wm8804_dapm_widgets[] = {
+SND_SOC_DAPM_OUTPUT("SPDIF Out"),
+SND_SOC_DAPM_INPUT("SPDIF In"),
+
+SND_SOC_DAPM_PGA("SPDIFTX", WM8804_PWRDN, 2, 1, NULL, 0),
+SND_SOC_DAPM_PGA("SPDIFRX", WM8804_PWRDN, 1, 1, NULL, 0),
+
+SND_SOC_DAPM_MUX("Tx Source", SND_SOC_NOPM, 6, 0, wm8804_tx_source_mux),
+
+SND_SOC_DAPM_AIF_OUT_E("AIFTX", NULL, 0, SND_SOC_NOPM, 0, 0, wm8804_aif_event,
+                       SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_AIF_IN_E("AIFRX", NULL, 0, SND_SOC_NOPM, 0, 0, wm8804_aif_event,
+                      SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+};
+
+static const struct snd_soc_dapm_route wm8804_dapm_routes[] = {
+        { "AIFRX", NULL, "Playback" },
+        { "Tx Source", "AIF", "AIFRX" },
+
+        { "SPDIFRX", NULL, "SPDIF In" },
+        { "Tx Source", "S/PDIF RX", "SPDIFRX" },
 
-        codec = snd_soc_kcontrol_codec(kcontrol);
-        src = snd_soc_read(codec, WM8804_SPDTX4);
-        if (src & 0x40)
-                ucontrol->value.integer.value[0] = 1;
-        else
-                ucontrol->value.integer.value[0] = 0;
+        { "SPDIFTX", NULL, "Tx Source" },
+        { "SPDIF Out", NULL, "SPDIFTX" },
+
+        { "AIFTX", NULL, "SPDIFRX" },
+        { "Capture", NULL, "AIFTX" },
+};
+
+static int wm8804_aif_event(struct snd_soc_dapm_widget *w,
+                            struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+        struct wm8804_priv *wm8804 = snd_soc_codec_get_drvdata(codec);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                /* power up the aif */
+                if (!wm8804->aif_pwr)
+                        snd_soc_update_bits(codec, WM8804_PWRDN, 0x10, 0x0);
+                wm8804->aif_pwr++;
+                break;
+        case SND_SOC_DAPM_POST_PMD:
+                /* power down only both paths are disabled */
+                wm8804->aif_pwr--;
+                if (!wm8804->aif_pwr)
+                        snd_soc_update_bits(codec, WM8804_PWRDN, 0x10, 0x10);
+                break;
+        }
 
         return 0;
 }
@@ -117,48 +161,33 @@ static int txsrc_get(struct snd_kcontrol *kcontrol,
 static int txsrc_put(struct snd_kcontrol *kcontrol,
                      struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec;
-        unsigned int src, txpwr;
+        struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
+        unsigned int val = ucontrol->value.enumerated.item[0] << e->shift_l;
+        unsigned int mask = 1 << e->shift_l;
+        unsigned int txpwr;
+
+        if (val != 0 && val != mask)
+                return -EINVAL;
 
-        codec = snd_soc_kcontrol_codec(kcontrol);
+        snd_soc_dapm_mutex_lock(dapm);
 
-        if (ucontrol->value.integer.value[0] != 0
-                        && ucontrol->value.integer.value[0] != 1)
-                return -EINVAL;
+        if (snd_soc_test_bits(codec, e->reg, mask, val)) {
+                /* save the current power state of the transmitter */
+                txpwr = snd_soc_read(codec, WM8804_PWRDN) & 0x4;
 
-        src = snd_soc_read(codec, WM8804_SPDTX4);
-        switch ((src & 0x40) >> 6) {
-        case 0:
-                if (!ucontrol->value.integer.value[0])
-                        return 0;
-                break;
-        case 1:
-                if (ucontrol->value.integer.value[1])
-                        return 0;
-                break;
-        }
+                /* power down the transmitter */
+                snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, 0x4);
 
-        /* save the current power state of the transmitter */
-        txpwr = snd_soc_read(codec, WM8804_PWRDN) & 0x4;
-        /* power down the transmitter */
-        snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, 0x4);
-        /* set the tx source */
-        snd_soc_update_bits(codec, WM8804_SPDTX4, 0x40,
-                            ucontrol->value.integer.value[0] << 6);
-
-        if (ucontrol->value.integer.value[0]) {
-                /* power down the receiver */
-                snd_soc_update_bits(codec, WM8804_PWRDN, 0x2, 0x2);
-                /* power up the AIF */
-                snd_soc_update_bits(codec, WM8804_PWRDN, 0x10, 0);
-        } else {
-                /* don't power down the AIF -- may be used as an output */
-                /* power up the receiver */
-                snd_soc_update_bits(codec, WM8804_PWRDN, 0x2, 0);
+                /* set the tx source */
+                snd_soc_update_bits(codec, e->reg, mask, val);
+
+                /* restore the transmitter's configuration */
+                snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, txpwr);
         }
 
-        /* restore the transmitter's configuration */
-        snd_soc_update_bits(codec, WM8804_PWRDN, 0x4, txpwr);
+        snd_soc_dapm_mutex_unlock(dapm);
 
         return 0;
 }
@@ -182,7 +211,7 @@ static bool wm8804_volatile(struct device *dev, unsigned int reg)
         }
 }
 
-static int wm8804_reset(struct wm8804_priv *wm8804)
+static int wm8804_soft_reset(struct wm8804_priv *wm8804)
 {
         return regmap_write(wm8804->regmap, WM8804_RST_DEVID1, 0x0);
 }
@@ -376,19 +405,19 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
                           int source, unsigned int freq_in,
                           unsigned int freq_out)
 {
-        struct snd_soc_codec *codec;
+        struct snd_soc_codec *codec = dai->codec;
+        struct wm8804_priv *wm8804 = snd_soc_codec_get_drvdata(codec);
+        bool change;
 
-        codec = dai->codec;
         if (!freq_in || !freq_out) {
                 /* disable the PLL */
-                snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);
-                return 0;
+                regmap_update_bits_check(wm8804->regmap, WM8804_PWRDN,
+                                         0x1, 0x1, &change);
+                if (change)
+                        pm_runtime_put(wm8804->dev);
         } else {
                 int ret;
                 struct pll_div pll_div;
-                struct wm8804_priv *wm8804;
-
-                wm8804 = snd_soc_codec_get_drvdata(codec);
 
                 ret = pll_factors(&pll_div, freq_out, freq_in,
                                   wm8804->mclk_div);
@@ -396,7 +425,10 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
                         return ret;
 
                 /* power down the PLL before reprogramming it */
-                snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);
+                regmap_update_bits_check(wm8804->regmap, WM8804_PWRDN,
+                                         0x1, 0x1, &change);
+                if (!change)
+                        pm_runtime_get_sync(wm8804->dev);
 
                 /* set PLLN and PRESCALE */
                 snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10,
@@ -474,47 +506,6 @@ static int wm8804_set_clkdiv(struct snd_soc_dai *dai,
         return 0;
 }
 
-static int wm8804_set_bias_level(struct snd_soc_codec *codec,
-                                 enum snd_soc_bias_level level)
-{
-        int ret;
-        struct wm8804_priv *wm8804;
-
-        wm8804 = snd_soc_codec_get_drvdata(codec);
-        switch (level) {
-        case SND_SOC_BIAS_ON:
-                break;
-        case SND_SOC_BIAS_PREPARE:
-                /* power up the OSC and the PLL */
-                snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0);
-                break;
-        case SND_SOC_BIAS_STANDBY:
-                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
-                        ret = regulator_bulk_enable(ARRAY_SIZE(wm8804->supplies),
-                                                    wm8804->supplies);
-                        if (ret) {
-                                dev_err(codec->dev,
-                                        "Failed to enable supplies: %d\n",
-                                        ret);
-                                return ret;
-                        }
-                        regcache_sync(wm8804->regmap);
-                }
-                /* power down the OSC and the PLL */
-                snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0x9);
-                break;
-        case SND_SOC_BIAS_OFF:
-                /* power down the OSC and the PLL */
-                snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0x9);
-                regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies),
-                                       wm8804->supplies);
-                break;
-        }
-
-        codec->dapm.bias_level = level;
-        return 0;
-}
-
 static const struct snd_soc_dai_ops wm8804_dai_ops = {
         .hw_params = wm8804_hw_params,
         .set_fmt = wm8804_set_fmt,
@@ -552,11 +543,12 @@ static struct snd_soc_dai_driver wm8804_dai = {
 };
 
 static const struct snd_soc_codec_driver soc_codec_dev_wm8804 = {
-        .set_bias_level = wm8804_set_bias_level,
         .idle_bias_off = true,
 
-        .controls = wm8804_snd_controls,
-        .num_controls = ARRAY_SIZE(wm8804_snd_controls),
+        .dapm_widgets = wm8804_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(wm8804_dapm_widgets),
+        .dapm_routes = wm8804_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(wm8804_dapm_routes),
 };
 
 const struct regmap_config wm8804_regmap_config = {
@@ -584,8 +576,17 @@ int wm8804_probe(struct device *dev, struct regmap *regmap)
 
         dev_set_drvdata(dev, wm8804);
 
+        wm8804->dev = dev;
         wm8804->regmap = regmap;
 
+        wm8804->reset = devm_gpiod_get_optional(dev, "wlf,reset",
+                                                GPIOD_OUT_LOW);
+        if (IS_ERR(wm8804->reset)) {
+                ret = PTR_ERR(wm8804->reset);
+                dev_err(dev, "Failed to get reset line: %d\n", ret);
+                return ret;
+        }
+
         for (i = 0; i < ARRAY_SIZE(wm8804->supplies); i++)
                 wm8804->supplies[i].supply = wm8804_supply_names[i];
 
@@ -601,12 +602,15 @@ int wm8804_probe(struct device *dev, struct regmap *regmap)
 
         /* This should really be moved into the regulator core */
         for (i = 0; i < ARRAY_SIZE(wm8804->supplies); i++) {
-                ret = regulator_register_notifier(wm8804->supplies[i].consumer,
-                                                  &wm8804->disable_nb[i]);
+                struct regulator *regulator = wm8804->supplies[i].consumer;
+
+                ret = devm_regulator_register_notifier(regulator,
+                                                       &wm8804->disable_nb[i]);
                 if (ret != 0) {
                         dev_err(dev,
                                 "Failed to register regulator notifier: %d\n",
                                 ret);
+                        return ret;
                 }
         }
 
@@ -614,9 +618,12 @@ int wm8804_probe(struct device *dev, struct regmap *regmap)
                                     wm8804->supplies);
         if (ret) {
                 dev_err(dev, "Failed to enable supplies: %d\n", ret);
-                goto err_reg_enable;
+                return ret;
         }
 
+        if (wm8804->reset)
+                gpiod_set_value_cansleep(wm8804->reset, 1);
+
         ret = regmap_read(regmap, WM8804_RST_DEVID1, &id1);
         if (ret < 0) {
                 dev_err(dev, "Failed to read device ID: %d\n", ret);
@@ -645,14 +652,26 @@ int wm8804_probe(struct device *dev, struct regmap *regmap)
         }
         dev_info(dev, "revision %c\n", id1 + 'A');
 
-        ret = wm8804_reset(wm8804);
+        if (!wm8804->reset) {
+                ret = wm8804_soft_reset(wm8804);
+                if (ret < 0) {
+                        dev_err(dev, "Failed to issue reset: %d\n", ret);
+                        goto err_reg_enable;
+                }
+        }
+
+        ret = snd_soc_register_codec(dev, &soc_codec_dev_wm8804,
+                                     &wm8804_dai, 1);
         if (ret < 0) {
-                dev_err(dev, "Failed to issue reset: %d\n", ret);
+                dev_err(dev, "Failed to register CODEC: %d\n", ret);
                 goto err_reg_enable;
         }
 
-        return snd_soc_register_codec(dev, &soc_codec_dev_wm8804,
-                                      &wm8804_dai, 1);
+        pm_runtime_set_active(dev);
+        pm_runtime_enable(dev);
+        pm_runtime_idle(dev);
+
+        return 0;
 
 err_reg_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies), wm8804->supplies);
@@ -662,18 +681,50 @@ EXPORT_SYMBOL_GPL(wm8804_probe);
 
 void wm8804_remove(struct device *dev)
 {
-        struct wm8804_priv *wm8804;
-        int i;
+        pm_runtime_disable(dev);
+        snd_soc_unregister_codec(dev);
+}
+EXPORT_SYMBOL_GPL(wm8804_remove);
 
-        wm8804 = dev_get_drvdata(dev);
+#if IS_ENABLED(CONFIG_PM)
+static int wm8804_runtime_resume(struct device *dev)
+{
+        struct wm8804_priv *wm8804 = dev_get_drvdata(dev);
+        int ret;
 
-        for (i = 0; i < ARRAY_SIZE(wm8804->supplies); ++i)
-                regulator_unregister_notifier(wm8804->supplies[i].consumer,
-                                              &wm8804->disable_nb[i]);
+        ret = regulator_bulk_enable(ARRAY_SIZE(wm8804->supplies),
+                                    wm8804->supplies);
+        if (ret) {
+                dev_err(wm8804->dev, "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
 
-        snd_soc_unregister_codec(dev);
+        regcache_sync(wm8804->regmap);
+
+        /* Power up OSCCLK */
+        regmap_update_bits(wm8804->regmap, WM8804_PWRDN, 0x8, 0x0);
+
+        return 0;
 }
-EXPORT_SYMBOL_GPL(wm8804_remove);
+
+static int wm8804_runtime_suspend(struct device *dev)
+{
+        struct wm8804_priv *wm8804 = dev_get_drvdata(dev);
+
+        /* Power down OSCCLK */
+        regmap_update_bits(wm8804->regmap, WM8804_PWRDN, 0x8, 0x8);
+
+        regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies),
+                               wm8804->supplies);
+
+        return 0;
+}
+#endif
+
+const struct dev_pm_ops wm8804_pm = {
+        SET_RUNTIME_PM_OPS(wm8804_runtime_suspend, wm8804_runtime_resume, NULL)
+};
+EXPORT_SYMBOL_GPL(wm8804_pm);
 
 MODULE_DESCRIPTION("ASoC WM8804 driver");
 MODULE_AUTHOR("Dimitris Papastamos <dp@opensource.wolfsonmicro.com>");
diff --git a/sound/soc/codecs/wm8804.h b/sound/soc/codecs/wm8804.h
index a39a2563dc67..aa72fa66c932 100644
--- a/sound/soc/codecs/wm8804.h
+++ b/sound/soc/codecs/wm8804.h
@@ -65,6 +65,7 @@
 #define WM8804_MCLKDIV_128FS                    1
 
 extern const struct regmap_config wm8804_regmap_config;
+extern const struct dev_pm_ops wm8804_pm;
 
 int wm8804_probe(struct device *dev, struct regmap *regmap);
 void wm8804_remove(struct device *dev);
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 39ddb9b8834c..f9cbabdc6238 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -31,11 +31,11 @@
 
 #define WM8971_REG_COUNT                43
 
-static struct workqueue_struct *wm8971_workq = NULL;
-
 /* codec private data */
 struct wm8971_priv {
         unsigned int sysclk;
+        struct delayed_work charge_work;
+        struct regmap *regmap;
 };
 
 /*
@@ -552,9 +552,19 @@ static int wm8971_mute(struct snd_soc_dai *dai, int mute)
         return 0;
 }
 
+static void wm8971_charge_work(struct work_struct *work)
+{
+        struct wm8971_priv *wm8971 =
+                container_of(work, struct wm8971_priv, charge_work.work);
+
+        /* Set to 500k */
+        regmap_update_bits(wm8971->regmap, WM8971_PWR1, 0x0180, 0x0100);
+}
+
 static int wm8971_set_bias_level(struct snd_soc_codec *codec,
         enum snd_soc_bias_level level)
 {
+        struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);
         u16 pwr_reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
 
         switch (level) {
@@ -563,15 +573,24 @@ static int wm8971_set_bias_level(struct snd_soc_codec *codec,
                 snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x00c1);
                 break;
         case SND_SOC_BIAS_PREPARE:
+                /* Wait until fully charged */
+                flush_delayed_work(&wm8971->charge_work);
                 break;
         case SND_SOC_BIAS_STANDBY:
-                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         snd_soc_cache_sync(codec);
+                        /* charge output caps - set vmid to 5k for quick power up */
+                        snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x01c0);
+                        queue_delayed_work(system_power_efficient_wq,
+                                &wm8971->charge_work, msecs_to_jiffies(1000));
+                } else {
+                        /* mute dac and set vmid to 500k, enable VREF */
+                        snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x0140);
+                }
 
-                /* mute dac and set vmid to 500k, enable VREF */
-                snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x0140);
                 break;
         case SND_SOC_BIAS_OFF:
+                cancel_delayed_work_sync(&wm8971->charge_work);
                 snd_soc_write(codec, WM8971_PWR1, 0x0001);
                 break;
         }
@@ -610,58 +629,14 @@ static struct snd_soc_dai_driver wm8971_dai = {
         .ops = &wm8971_dai_ops,
 };
 
-static void wm8971_work(struct work_struct *work)
-{
-        struct snd_soc_dapm_context *dapm =
-                container_of(work, struct snd_soc_dapm_context,
-                             delayed_work.work);
-        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
-        wm8971_set_bias_level(codec, codec->dapm.bias_level);
-}
-
-static int wm8971_suspend(struct snd_soc_codec *codec)
-{
-        wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        return 0;
-}
-
-static int wm8971_resume(struct snd_soc_codec *codec)
-{
-        u16 reg;
-
-        wm8971_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-        /* charge wm8971 caps */
-        if (codec->dapm.suspend_bias_level == SND_SOC_BIAS_ON) {
-                reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
-                snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
-                codec->dapm.bias_level = SND_SOC_BIAS_ON;
-                queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
-                        msecs_to_jiffies(1000));
-        }
-
-        return 0;
-}
-
 static int wm8971_probe(struct snd_soc_codec *codec)
 {
-        int ret = 0;
-        u16 reg;
+        struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);
 
-        INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8971_work);
-        wm8971_workq = create_workqueue("wm8971");
-        if (wm8971_workq == NULL)
-                return -ENOMEM;
+        INIT_DELAYED_WORK(&wm8971->charge_work, wm8971_charge_work);
 
         wm8971_reset(codec);
 
-        /* charge output caps - set vmid to 5k for quick power up */
-        reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e;
-        snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0);
-        codec->dapm.bias_level = SND_SOC_BIAS_STANDBY;
-        queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work,
-                msecs_to_jiffies(1000));
-
         /* set the update bits */
         snd_soc_update_bits(codec, WM8971_LDAC, 0x0100, 0x0100);
         snd_soc_update_bits(codec, WM8971_RDAC, 0x0100, 0x0100);
@@ -672,26 +647,13 @@ static int wm8971_probe(struct snd_soc_codec *codec)
         snd_soc_update_bits(codec, WM8971_LINVOL, 0x0100, 0x0100);
         snd_soc_update_bits(codec, WM8971_RINVOL, 0x0100, 0x0100);
 
-        return ret;
-}
-
-
-/* power down chip */
-static int wm8971_remove(struct snd_soc_codec *codec)
-{
-        wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-        if (wm8971_workq)
-                destroy_workqueue(wm8971_workq);
         return 0;
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_wm8971 = {
         .probe =        wm8971_probe,
-        .remove =       wm8971_remove,
-        .suspend =      wm8971_suspend,
-        .resume =       wm8971_resume,
         .set_bias_level = wm8971_set_bias_level,
+        .suspend_bias_off = true,
 
         .controls = wm8971_snd_controls,
         .num_controls = ARRAY_SIZE(wm8971_snd_controls),
@@ -715,7 +677,6 @@ static int wm8971_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
         struct wm8971_priv *wm8971;
-        struct regmap *regmap;
         int ret;
 
         wm8971 = devm_kzalloc(&i2c->dev, sizeof(struct wm8971_priv),
@@ -723,9 +684,9 @@ static int wm8971_i2c_probe(struct i2c_client *i2c,
         if (wm8971 == NULL)
                 return -ENOMEM;
 
-        regmap = devm_regmap_init_i2c(i2c, &wm8971_regmap);
-        if (IS_ERR(regmap))
-                return PTR_ERR(regmap);
+        wm8971->regmap = devm_regmap_init_i2c(i2c, &wm8971_regmap);
+        if (IS_ERR(wm8971->regmap))
+                return PTR_ERR(wm8971->regmap);
 
         i2c_set_clientdata(i2c, wm8971);
 
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index dc92d5e4e942..308748a022c5 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -2009,7 +2009,7 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
         struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
         struct i2c_client *i2c = to_i2c_client(codec->dev);
         struct _fll_div fll_div;
-        unsigned long timeout;
+        unsigned long timeout, time_left;
         int ret, reg, retry;
 
         /* Any change? */
@@ -2110,13 +2110,15 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
         if (i2c->irq)
                 timeout *= 10;
         else
-                timeout /= 2;
+                /* ensure timeout of atleast 1 jiffies */
+                timeout = timeout/2 ? : 1;
 
         for (retry = 0; retry < 10; retry++) {
-                ret = wait_for_completion_timeout(&wm8996->fll_lock,
-                                                  timeout);
-                if (ret != 0) {
+                time_left = wait_for_completion_timeout(&wm8996->fll_lock,
+                                                        timeout);
+                if (time_left != 0) {
                         WARN_ON(!i2c->irq);
+                        ret = 1;
                         break;
                 }
 
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index b6bb5947a8a8..731fb0d86c6a 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -117,7 +117,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
 static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_card *card = rtd->card;
-        struct snd_soc_codec *codec = rtd->codec;
         struct device_node *np = card->dev->of_node;
         int ret;
 
@@ -136,9 +135,9 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
         }
 
         /* not connected */
-        snd_soc_dapm_nc_pin(&codec->dapm, "MONO_LOUT");
-        snd_soc_dapm_nc_pin(&codec->dapm, "HPLCOM");
-        snd_soc_dapm_nc_pin(&codec->dapm, "HPRCOM");
+        snd_soc_dapm_nc_pin(&card->dapm, "MONO_LOUT");
+        snd_soc_dapm_nc_pin(&card->dapm, "HPLCOM");
+        snd_soc_dapm_nc_pin(&card->dapm, "HPRCOM");
 
         return 0;
 }
@@ -425,18 +424,8 @@ static int davinci_evm_probe(struct platform_device *pdev)
         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",
                 .pm     = &snd_soc_pm_ops,
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 0c882995a357..bb4b78eada58 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -27,6 +27,7 @@
 #include <linux/of_platform.h>
 #include <linux/of_device.h>
 #include <linux/platform_data/davinci_asp.h>
+#include <linux/math64.h>
 
 #include <sound/asoundef.h>
 #include <sound/core.h>
@@ -62,6 +63,12 @@ struct davinci_mcasp_context {
         u32     config_regs[ARRAY_SIZE(context_regs)];
         u32     afifo_regs[2]; /* for read/write fifo control registers */
         u32     *xrsr_regs; /* for serializer configuration */
+        bool    pm_state;
+};
+
+struct davinci_mcasp_ruledata {
+        struct davinci_mcasp *mcasp;
+        int serializers;
 };
 
 struct davinci_mcasp {
@@ -98,6 +105,8 @@ struct davinci_mcasp {
 #ifdef CONFIG_PM_SLEEP
         struct davinci_mcasp_context context;
 #endif
+
+        struct davinci_mcasp_ruledata ruledata[2];
 };
 
 static inline void mcasp_set_bits(struct davinci_mcasp *mcasp, u32 offset,
@@ -519,7 +528,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
         }
 out:
-        pm_runtime_put_sync(mcasp->dev);
+        pm_runtime_put(mcasp->dev);
         return ret;
 }
 
@@ -528,6 +537,7 @@ static int __davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,
 {
         struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);
 
+        pm_runtime_get_sync(mcasp->dev);
         switch (div_id) {
         case 0:         /* MCLK divider */
                 mcasp_mod_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG,
@@ -553,6 +563,7 @@ static int __davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,
                 return -EINVAL;
         }
 
+        pm_runtime_put(mcasp->dev);
         return 0;
 }
 
@@ -567,6 +578,7 @@ static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id,
 {
         struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);
 
+        pm_runtime_get_sync(mcasp->dev);
         if (dir == SND_SOC_CLOCK_OUT) {
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, AHCLKXE);
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG, AHCLKRE);
@@ -579,6 +591,7 @@ static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id,
 
         mcasp->sysclk_freq = freq;
 
+        pm_runtime_put(mcasp->dev);
         return 0;
 }
 
@@ -863,6 +876,30 @@ static int mcasp_dit_hw_param(struct davinci_mcasp *mcasp,
         return 0;
 }
 
+static int davinci_mcasp_calc_clk_div(struct davinci_mcasp *mcasp,
+                                      unsigned int bclk_freq,
+                                      int *error_ppm)
+{
+        int div = mcasp->sysclk_freq / bclk_freq;
+        int rem = mcasp->sysclk_freq % bclk_freq;
+
+        if (rem != 0) {
+                if (div == 0 ||
+                    ((mcasp->sysclk_freq / div) - bclk_freq) >
+                    (bclk_freq - (mcasp->sysclk_freq / (div+1)))) {
+                        div++;
+                        rem = rem - bclk_freq;
+                }
+        }
+        if (error_ppm)
+                *error_ppm =
+                        (div*1000000 + (int)div64_long(1000000LL*rem,
+                                                       (int)bclk_freq))
+                        /div - 1000000;
+
+        return div;
+}
+
 static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
                                         struct snd_pcm_hw_params *params,
                                         struct snd_soc_dai *cpu_dai)
@@ -878,16 +915,20 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
          * the machine driver, we need to calculate the ratio.
          */
         if (mcasp->bclk_master && mcasp->bclk_div == 0 && mcasp->sysclk_freq) {
-                unsigned int bclk_freq = snd_soc_params_to_bclk(params);
-                unsigned int div = mcasp->sysclk_freq / bclk_freq;
-                if (mcasp->sysclk_freq % bclk_freq != 0) {
-                        if (((mcasp->sysclk_freq / div) - bclk_freq) >
-                            (bclk_freq - (mcasp->sysclk_freq / (div+1))))
-                                div++;
-                        dev_warn(mcasp->dev,
-                                 "Inaccurate BCLK: %u Hz / %u != %u Hz\n",
-                                 mcasp->sysclk_freq, div, bclk_freq);
-                }
+                int channels = params_channels(params);
+                int rate = params_rate(params);
+                int sbits = params_width(params);
+                int ppm, div;
+
+                if (channels > mcasp->tdm_slots)
+                        channels = mcasp->tdm_slots;
+
+                div = davinci_mcasp_calc_clk_div(mcasp, rate*sbits*channels,
+                                                 &ppm);
+                if (ppm)
+                        dev_info(mcasp->dev, "Sample-rate is off by %d PPM\n",
+                                 ppm);
+
                 __davinci_mcasp_set_clkdiv(cpu_dai, 1, div, 0);
         }
 
@@ -969,10 +1010,126 @@ static int davinci_mcasp_trigger(struct snd_pcm_substream *substream,
         return ret;
 }
 
+static const unsigned int davinci_mcasp_dai_rates[] = {
+        8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000,
+        88200, 96000, 176400, 192000,
+};
+
+#define DAVINCI_MAX_RATE_ERROR_PPM 1000
+
+static int davinci_mcasp_hw_rule_rate(struct snd_pcm_hw_params *params,
+                                      struct snd_pcm_hw_rule *rule)
+{
+        struct davinci_mcasp_ruledata *rd = rule->private;
+        struct snd_interval *ri =
+                hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
+        int sbits = params_width(params);
+        int channels = params_channels(params);
+        unsigned int list[ARRAY_SIZE(davinci_mcasp_dai_rates)];
+        int i, count = 0;
+
+        if (channels > rd->mcasp->tdm_slots)
+                channels = rd->mcasp->tdm_slots;
+
+        for (i = 0; i < ARRAY_SIZE(davinci_mcasp_dai_rates); i++) {
+                if (ri->min <= davinci_mcasp_dai_rates[i] &&
+                    ri->max >= davinci_mcasp_dai_rates[i]) {
+                        uint bclk_freq = sbits*channels*
+                                davinci_mcasp_dai_rates[i];
+                        int ppm;
+
+                        davinci_mcasp_calc_clk_div(rd->mcasp, bclk_freq, &ppm);
+                        if (abs(ppm) < DAVINCI_MAX_RATE_ERROR_PPM)
+                                list[count++] = davinci_mcasp_dai_rates[i];
+                }
+        }
+        dev_dbg(rd->mcasp->dev,
+                "%d frequencies (%d-%d) for %d sbits and %d channels\n",
+                count, ri->min, ri->max, sbits, channels);
+
+        return snd_interval_list(hw_param_interval(params, rule->var),
+                                 count, list, 0);
+}
+
+static int davinci_mcasp_hw_rule_format(struct snd_pcm_hw_params *params,
+                                        struct snd_pcm_hw_rule *rule)
+{
+        struct davinci_mcasp_ruledata *rd = rule->private;
+        struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+        struct snd_mask nfmt;
+        int rate = params_rate(params);
+        int channels = params_channels(params);
+        int i, count = 0;
+
+        snd_mask_none(&nfmt);
+
+        if (channels > rd->mcasp->tdm_slots)
+                channels = rd->mcasp->tdm_slots;
+
+        for (i = 0; i < SNDRV_PCM_FORMAT_LAST; i++) {
+                if (snd_mask_test(fmt, i)) {
+                        uint bclk_freq = snd_pcm_format_width(i)*channels*rate;
+                        int ppm;
+
+                        davinci_mcasp_calc_clk_div(rd->mcasp, bclk_freq, &ppm);
+                        if (abs(ppm) < DAVINCI_MAX_RATE_ERROR_PPM) {
+                                snd_mask_set(&nfmt, i);
+                                count++;
+                        }
+                }
+        }
+        dev_dbg(rd->mcasp->dev,
+                "%d possible sample format for %d Hz and %d channels\n",
+                count, rate, channels);
+
+        return snd_mask_refine(fmt, &nfmt);
+}
+
+static int davinci_mcasp_hw_rule_channels(struct snd_pcm_hw_params *params,
+                                          struct snd_pcm_hw_rule *rule)
+{
+        struct davinci_mcasp_ruledata *rd = rule->private;
+        struct snd_interval *ci =
+                hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+        int sbits = params_width(params);
+        int rate = params_rate(params);
+        int max_chan_per_wire = rd->mcasp->tdm_slots < ci->max ?
+                rd->mcasp->tdm_slots : ci->max;
+        unsigned int list[ci->max - ci->min + 1];
+        int c1, c, count = 0;
+
+        for (c1 = ci->min; c1 <= max_chan_per_wire; c1++) {
+                uint bclk_freq = c1*sbits*rate;
+                int ppm;
+
+                davinci_mcasp_calc_clk_div(rd->mcasp, bclk_freq, &ppm);
+                if (abs(ppm) < DAVINCI_MAX_RATE_ERROR_PPM) {
+                        /* If we can use all tdm_slots, we can put any
+                           amount of channels to remaining wires as
+                           long as they fit in. */
+                        if (c1 == rd->mcasp->tdm_slots) {
+                                for (c = c1; c <= rd->serializers*c1 &&
+                                             c <= ci->max; c++)
+                                        list[count++] = c;
+                        } else {
+                                list[count++] = c1;
+                        }
+                }
+        }
+        dev_dbg(rd->mcasp->dev,
+                "%d possible channel counts (%d-%d) for %d Hz and %d sbits\n",
+                count, ci->min, ci->max, rate, sbits);
+
+        return snd_interval_list(hw_param_interval(params, rule->var),
+                                 count, list, 0);
+}
+
 static int davinci_mcasp_startup(struct snd_pcm_substream *substream,
                                  struct snd_soc_dai *cpu_dai)
 {
         struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(cpu_dai);
+        struct davinci_mcasp_ruledata *ruledata =
+                                        &mcasp->ruledata[substream->stream];
         u32 max_channels = 0;
         int i, dir;
 
@@ -994,6 +1151,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream,
                 if (mcasp->serial_dir[i] == dir)
                         max_channels++;
         }
+        ruledata->serializers = max_channels;
         max_channels *= mcasp->tdm_slots;
         /*
          * If the already active stream has less channels than the calculated
@@ -1008,6 +1166,42 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream,
         snd_pcm_hw_constraint_minmax(substream->runtime,
                                      SNDRV_PCM_HW_PARAM_CHANNELS,
                                      2, max_channels);
+
+        /*
+         * If we rely on implicit BCLK divider setting we should
+         * set constraints based on what we can provide.
+         */
+        if (mcasp->bclk_master && mcasp->bclk_div == 0 && mcasp->sysclk_freq) {
+                int ret;
+
+                ruledata->mcasp = mcasp;
+
+                ret = snd_pcm_hw_rule_add(substream->runtime, 0,
+                                          SNDRV_PCM_HW_PARAM_RATE,
+                                          davinci_mcasp_hw_rule_rate,
+                                          ruledata,
+                                          SNDRV_PCM_HW_PARAM_FORMAT,
+                                          SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+                if (ret)
+                        return ret;
+                ret = snd_pcm_hw_rule_add(substream->runtime, 0,
+                                          SNDRV_PCM_HW_PARAM_FORMAT,
+                                          davinci_mcasp_hw_rule_format,
+                                          ruledata,
+                                          SNDRV_PCM_HW_PARAM_RATE,
+                                          SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+                if (ret)
+                        return ret;
+                ret = snd_pcm_hw_rule_add(substream->runtime, 0,
+                                          SNDRV_PCM_HW_PARAM_CHANNELS,
+                                          davinci_mcasp_hw_rule_channels,
+                                          ruledata,
+                                          SNDRV_PCM_HW_PARAM_RATE,
+                                          SNDRV_PCM_HW_PARAM_FORMAT, -1);
+                if (ret)
+                        return ret;
+        }
+
         return 0;
 }
 
@@ -1053,6 +1247,10 @@ static int davinci_mcasp_suspend(struct snd_soc_dai *dai)
         u32 reg;
         int i;
 
+        context->pm_state = pm_runtime_enabled(mcasp->dev);
+        if (!context->pm_state)
+                pm_runtime_get_sync(mcasp->dev);
+
         for (i = 0; i < ARRAY_SIZE(context_regs); i++)
                 context->config_regs[i] = mcasp_get_reg(mcasp, context_regs[i]);
 
@@ -1069,6 +1267,8 @@ static int davinci_mcasp_suspend(struct snd_soc_dai *dai)
                 context->xrsr_regs[i] = mcasp_get_reg(mcasp,
                                                 DAVINCI_MCASP_XRSRCTL_REG(i));
 
+        pm_runtime_put_sync(mcasp->dev);
+
         return 0;
 }
 
@@ -1079,6 +1279,8 @@ static int davinci_mcasp_resume(struct snd_soc_dai *dai)
         u32 reg;
         int i;
 
+        pm_runtime_get_sync(mcasp->dev);
+
         for (i = 0; i < ARRAY_SIZE(context_regs); i++)
                 mcasp_set_reg(mcasp, context_regs[i], context->config_regs[i]);
 
@@ -1095,6 +1297,9 @@ static int davinci_mcasp_resume(struct snd_soc_dai *dai)
                 mcasp_set_reg(mcasp, DAVINCI_MCASP_XRSRCTL_REG(i),
                               context->xrsr_regs[i]);
 
+        if (!context->pm_state)
+                pm_runtime_put_sync(mcasp->dev);
+
         return 0;
 }
 #else
@@ -1398,13 +1603,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 
         pm_runtime_enable(&pdev->dev);
 
-        ret = pm_runtime_get_sync(&pdev->dev);
-        if (IS_ERR_VALUE(ret)) {
-                dev_err(&pdev->dev, "pm_runtime_get_sync() failed\n");
-                pm_runtime_disable(&pdev->dev);
-                return ret;
-        }
-
         mcasp->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
         if (!mcasp->base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
@@ -1584,14 +1782,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
         return 0;
 
 err:
-        pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
         return ret;
 }
 
 static int davinci_mcasp_remove(struct platform_device *pdev)
 {
-        pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
         return 0;
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 081e406b3713..19c302b0d763 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -24,7 +24,7 @@ config SND_SOC_FSL_SAI
           in-tree drivers select it automatically.
 
 config SND_SOC_FSL_SSI
-        tristate "Synchronous Serial Interface module support"
+        tristate "Synchronous Serial Interface module (SSI) support"
         select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
         select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC)
         select REGMAP_MMIO
@@ -35,7 +35,7 @@ config SND_SOC_FSL_SSI
           in-tree drivers select it automatically.
 
 config SND_SOC_FSL_SPDIF
-        tristate "Sony/Philips Digital Interface module support"
+        tristate "Sony/Philips Digital Interface (S/PDIF) module support"
         select REGMAP_MMIO
         select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
         select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && (MXC_TZIC || MXC_AVIC)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 6b0c8f717ec2..e8bb8eef1d16 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1288,7 +1288,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         const struct of_device_id *of_id;
         const char *p, *sprop;
         const uint32_t *iprop;
-        struct resource res;
+        struct resource *res;
         void __iomem *iomem;
         char name[64];
 
@@ -1335,19 +1335,11 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         }
         ssi_private->cpu_dai_drv.name = dev_name(&pdev->dev);
 
-        /* Get the addresses and IRQ */
-        ret = of_address_to_resource(np, 0, &res);
-        if (ret) {
-                dev_err(&pdev->dev, "could not determine device resources\n");
-                return ret;
-        }
-        ssi_private->ssi_phys = res.start;
-
-        iomem = devm_ioremap(&pdev->dev, res.start, resource_size(&res));
-        if (!iomem) {
-                dev_err(&pdev->dev, "could not map device resources\n");
-                return -ENOMEM;
-        }
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        iomem = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(iomem))
+                return PTR_ERR(iomem);
+        ssi_private->ssi_phys = res->start;
 
         ret = of_property_match_string(np, "clock-names", "ipg");
         if (ret < 0) {
@@ -1393,8 +1385,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                         return ret;
         }
 
-        ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
-                                         &ssi_private->cpu_dai_drv, 1);
+        ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
+                                              &ssi_private->cpu_dai_drv, 1);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
                 goto error_asoc_register;
@@ -1407,13 +1399,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                 if (ret < 0) {
                         dev_err(&pdev->dev, "could not claim irq %u\n",
                                         ssi_private->irq);
-                        goto error_irq;
+                        goto error_asoc_register;
                 }
         }
 
         ret = fsl_ssi_debugfs_create(&ssi_private->dbg_stats, &pdev->dev);
         if (ret)
-                goto error_irq;
+                goto error_asoc_register;
 
         /*
          * If codec-handle property is missing from SSI node, we assume
@@ -1454,9 +1446,6 @@ done:
 error_sound_card:
         fsl_ssi_debugfs_remove(&ssi_private->dbg_stats);
 
-error_irq:
-        snd_soc_unregister_component(&pdev->dev);
-
 error_asoc_register:
         if (ssi_private->soc->imx)
                 fsl_ssi_imx_clean(pdev, ssi_private);
@@ -1472,7 +1461,6 @@ static int fsl_ssi_remove(struct platform_device *pdev)
 
         if (ssi_private->pdev)
                 platform_device_unregister(ssi_private->pdev);
-        snd_soc_unregister_component(&pdev->dev);
 
         if (ssi_private->soc->imx)
                 fsl_ssi_imx_clean(pdev, ssi_private);
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 08d2a8069b0a..0bab76051fd8 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -326,7 +326,7 @@ static int psc_ac97_of_remove(struct platform_device *op)
 }
 
 /* Match table for of_platform binding */
-static struct of_device_id psc_ac97_match[] = {
+static const struct of_device_id psc_ac97_match[] = {
         { .compatible = "fsl,mpc5200-psc-ac97", },
         { .compatible = "fsl,mpc5200b-psc-ac97", },
         {}
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 51fb0c00fe73..d8232943ccb6 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -217,7 +217,7 @@ static int psc_i2s_of_remove(struct platform_device *op)
 }
 
 /* Match table for of_platform binding */
-static struct of_device_id psc_i2s_match[] = {
+static const struct of_device_id psc_i2s_match[] = {
         { .compatible = "fsl,mpc5200-psc-i2s", },
         { .compatible = "fsl,mpc5200b-psc-i2s", },
         {}
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c
index c44459d24c50..ec731223cab3 100644
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
@@ -113,7 +113,7 @@ static int pcm030_fabric_remove(struct platform_device *op)
         return ret;
 }
 
-static struct of_device_id pcm030_audio_match[] = {
+static const struct of_device_id pcm030_audio_match[] = {
         { .compatible = "phytec,pcm030-audio-fabric", },
         {}
 };
diff --git a/sound/soc/fsl/wm1133-ev1.c b/sound/soc/fsl/wm1133-ev1.c
index 0653aa83c927..b454972dce35 100644
--- a/sound/soc/fsl/wm1133-ev1.c
+++ b/sound/soc/fsl/wm1133-ev1.c
@@ -202,7 +202,6 @@ static struct snd_soc_jack_pin mic_jack_pins[] = {
 static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
         /* Headphone jack detection */
         snd_soc_card_jack_new(rtd->card, "Headphone", SND_JACK_HEADPHONE,
@@ -216,7 +215,7 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd)
         wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE,
                                SND_JACK_BTN_0);
 
-        snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
+        snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias");
 
         return 0;
 }
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index c49a408fc7a6..33feee9ca8c3 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -125,14 +125,6 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
 {
         int ret;
 
-        if (set->fmt) {
-                ret = snd_soc_dai_set_fmt(dai, set->fmt);
-                if (ret && ret != -ENOTSUPP) {
-                        dev_err(dai->dev, "simple-card: set_fmt error\n");
-                        goto err;
-                }
-        }
-
         if (set->sysclk) {
                 ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);
                 if (ret && ret != -ENOTSUPP) {
@@ -269,12 +261,10 @@ static int asoc_simple_card_parse_daifmt(struct device_node *node,
                                          struct device_node *codec,
                                          char *prefix, int idx)
 {
+        struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, idx);
         struct device *dev = simple_priv_to_dev(priv);
         struct device_node *bitclkmaster = NULL;
         struct device_node *framemaster = NULL;
-        struct simple_dai_props *dai_props = simple_priv_to_props(priv, idx);
-        struct asoc_simple_dai *cpu_dai = &dai_props->cpu_dai;
-        struct asoc_simple_dai *codec_dai = &dai_props->codec_dai;
         unsigned int daifmt;
 
         daifmt = snd_soc_of_parse_daifmt(node, prefix,
@@ -289,8 +279,7 @@ static int asoc_simple_card_parse_daifmt(struct device_node *node,
                  */
                 dev_dbg(dev, "Revert to legacy daifmt parsing\n");
 
-                cpu_dai->fmt = codec_dai->fmt =
-                        snd_soc_of_parse_daifmt(codec, NULL, NULL, NULL) |
+                daifmt = snd_soc_of_parse_daifmt(codec, NULL, NULL, NULL) |
                         (daifmt & ~SND_SOC_DAIFMT_CLOCK_MASK);
         } else {
                 if (codec == bitclkmaster)
@@ -299,11 +288,10 @@ static int asoc_simple_card_parse_daifmt(struct device_node *node,
                 else
                         daifmt |= (codec == framemaster) ?
                                 SND_SOC_DAIFMT_CBS_CFM : SND_SOC_DAIFMT_CBS_CFS;
-
-                cpu_dai->fmt    = daifmt;
-                codec_dai->fmt  = daifmt;
         }
 
+        dai_link->dai_fmt = daifmt;
+
         of_node_put(bitclkmaster);
         of_node_put(framemaster);
 
@@ -384,13 +372,12 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
         dai_link->init = asoc_simple_card_dai_init;
 
         dev_dbg(dev, "\tname : %s\n", dai_link->stream_name);
-        dev_dbg(dev, "\tcpu : %s / %04x / %d\n",
+        dev_dbg(dev, "\tformat : %04x\n", dai_link->dai_fmt);
+        dev_dbg(dev, "\tcpu : %s / %d\n",
                 dai_link->cpu_dai_name,
-                dai_props->cpu_dai.fmt,
                 dai_props->cpu_dai.sysclk);
-        dev_dbg(dev, "\tcodec : %s / %04x / %d\n",
+        dev_dbg(dev, "\tcodec : %s / %d\n",
                 dai_link->codec_dai_name,
-                dai_props->codec_dai.fmt,
                 dai_props->codec_dai.sysclk);
 
         /*
@@ -577,14 +564,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
                 dai_link->codec_name    = cinfo->codec;
                 dai_link->cpu_dai_name  = cinfo->cpu_dai.name;
                 dai_link->codec_dai_name = cinfo->codec_dai.name;
+                dai_link->dai_fmt       = cinfo->daifmt;
                 dai_link->init          = asoc_simple_card_dai_init;
                 memcpy(&priv->dai_props->cpu_dai, &cinfo->cpu_dai,
                                         sizeof(priv->dai_props->cpu_dai));
                 memcpy(&priv->dai_props->codec_dai, &cinfo->codec_dai,
                                         sizeof(priv->dai_props->codec_dai));
 
-                priv->dai_props->cpu_dai.fmt    |= cinfo->daifmt;
-                priv->dai_props->codec_dai.fmt  |= cinfo->daifmt;
         }
 
         snd_soc_card_set_drvdata(&priv->snd_card, priv);
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile
index a8e53c45c6b6..cd9aee9871a3 100644
--- a/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@ -1,42 +1,10 @@
 # Core support
-snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o
-snd-soc-sst-acpi-objs := sst-acpi.o
-
-snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \
-        sst-mfld-platform-compress.o sst-atom-controls.o
-snd-soc-mfld-machine-objs := mfld_machine.o
-
-obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o
-obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o
-
-obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o
-obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o
+obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
 
 # Platform Support
-snd-soc-sst-haswell-pcm-objs := \
-        sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o
-snd-soc-sst-baytrail-pcm-objs := \
-        sst-baytrail-ipc.o sst-baytrail-pcm.o sst-baytrail-dsp.o
-
-obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += snd-soc-sst-haswell-pcm.o
-obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o
+obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/
+obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/
+obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += atom/
 
 # Machine support
-snd-soc-sst-haswell-objs := haswell.o
-snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o
-snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o
-snd-soc-sst-broadwell-objs := broadwell.o
-snd-soc-sst-bytcr-dpcm-rt5640-objs := bytcr_dpcm_rt5640.o
-snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o
-snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o
-
-obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
-obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
-obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o
-obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o
-obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-dpcm-rt5640.o
-obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o
-obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o
-
-# DSP driver
-obj-$(CONFIG_SND_SST_IPC) += sst/
+obj-$(CONFIG_SND_SOC_INTEL_SST) += boards/
diff --git a/sound/soc/intel/atom/Makefile b/sound/soc/intel/atom/Makefile
new file mode 100644
index 000000000000..ce8074fa6d66
--- /dev/null
+++ b/sound/soc/intel/atom/Makefile
@@ -0,0 +1,7 @@
+snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \
+                sst-mfld-platform-compress.o sst-atom-controls.o
+
+obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o
+
+# DSP driver
+obj-$(CONFIG_SND_SST_IPC) += sst/
diff --git a/sound/soc/intel/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
index 90aa5c0476f3..90aa5c0476f3 100644
--- a/sound/soc/intel/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
diff --git a/sound/soc/intel/sst-atom-controls.h b/sound/soc/intel/atom/sst-atom-controls.h
index daecc58f28af..daecc58f28af 100644
--- a/sound/soc/intel/sst-atom-controls.h
+++ b/sound/soc/intel/atom/sst-atom-controls.h
diff --git a/sound/soc/intel/sst-mfld-dsp.h b/sound/soc/intel/atom/sst-mfld-dsp.h
index 4257263157cd..4257263157cd 100644
--- a/sound/soc/intel/sst-mfld-dsp.h
+++ b/sound/soc/intel/atom/sst-mfld-dsp.h
diff --git a/sound/soc/intel/sst-mfld-platform-compress.c b/sound/soc/intel/atom/sst-mfld-platform-compress.c
index 395168986462..395168986462 100644
--- a/sound/soc/intel/sst-mfld-platform-compress.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-compress.c
diff --git a/sound/soc/intel/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index 2fbaf2c75d17..2fbaf2c75d17 100644
--- a/sound/soc/intel/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
diff --git a/sound/soc/intel/sst-mfld-platform.h b/sound/soc/intel/atom/sst-mfld-platform.h
index 9094314be2b0..9094314be2b0 100644
--- a/sound/soc/intel/sst-mfld-platform.h
+++ b/sound/soc/intel/atom/sst-mfld-platform.h
diff --git a/sound/soc/intel/sst/Makefile b/sound/soc/intel/atom/sst/Makefile
index fd21726361b5..fd21726361b5 100644
--- a/sound/soc/intel/sst/Makefile
+++ b/sound/soc/intel/atom/sst/Makefile
diff --git a/sound/soc/intel/sst/sst.c b/sound/soc/intel/atom/sst/sst.c
index 1a7eeec444b1..96c2e420cce6 100644
--- a/sound/soc/intel/sst/sst.c
+++ b/sound/soc/intel/atom/sst/sst.c
@@ -32,7 +32,7 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../sst-dsp.h"
+#include "../../common/sst-dsp.h"
 
 MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");
 MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");
diff --git a/sound/soc/intel/sst/sst.h b/sound/soc/intel/atom/sst/sst.h
index 3f493862e98d..3f493862e98d 100644
--- a/sound/soc/intel/sst/sst.h
+++ b/sound/soc/intel/atom/sst/sst.h
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
index b782dfdcdbba..05f693083911 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/atom/sst/sst_acpi.c
@@ -39,7 +39,7 @@
 #include <acpi/actypes.h>
 #include <acpi/acpi_bus.h>
 #include "../sst-mfld-platform.h"
-#include "../sst-dsp.h"
+#include "../../common/sst-dsp.h"
 #include "sst.h"
 
 struct sst_machines {
@@ -309,7 +309,7 @@ static int sst_acpi_probe(struct platform_device *pdev)
         ctx->shim_regs64 = devm_kzalloc(ctx->dev, sizeof(*ctx->shim_regs64),
                                         GFP_KERNEL);
         if (!ctx->shim_regs64) {
-                return -ENOMEM;
+                ret = -ENOMEM;
                 goto do_sst_cleanup;
         }
 
diff --git a/sound/soc/intel/sst/sst_drv_interface.c b/sound/soc/intel/atom/sst/sst_drv_interface.c
index f0e4b99b3aeb..7b50a9d17ec1 100644
--- a/sound/soc/intel/sst/sst_drv_interface.c
+++ b/sound/soc/intel/atom/sst/sst_drv_interface.c
@@ -32,7 +32,7 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../sst-dsp.h"
+#include "../../common/sst-dsp.h"
 
 
 
@@ -381,7 +381,7 @@ static int sst_cdev_tstamp(struct device *dev, unsigned int str_id,
         tstamp->copied_total = fw_tstamp.ring_buffer_counter;
         tstamp->pcm_frames = fw_tstamp.frames_decoded;
         tstamp->pcm_io_frames = div_u64(fw_tstamp.hardware_counter,
-                        (u64)((stream->num_ch) * SST_GET_BYTES_PER_SAMPLE(24)));
+                        (u64)stream->num_ch * SST_GET_BYTES_PER_SAMPLE(24));
         tstamp->sampling_rate = fw_tstamp.sampling_frequency;
 
         dev_dbg(dev, "PCM  = %u\n", tstamp->pcm_io_frames);
diff --git a/sound/soc/intel/sst/sst_ipc.c b/sound/soc/intel/atom/sst/sst_ipc.c
index 484e60978477..5a278618466c 100644
--- a/sound/soc/intel/sst/sst_ipc.c
+++ b/sound/soc/intel/atom/sst/sst_ipc.c
@@ -32,7 +32,7 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../sst-dsp.h"
+#include "../../common/sst-dsp.h"
 
 struct sst_block *sst_create_block(struct intel_sst_drv *ctx,
                                         u32 msg_id, u32 drv_id)
diff --git a/sound/soc/intel/sst/sst_loader.c b/sound/soc/intel/atom/sst/sst_loader.c
index e88907ae8b15..33917146d9c4 100644
--- a/sound/soc/intel/sst/sst_loader.c
+++ b/sound/soc/intel/atom/sst/sst_loader.c
@@ -37,7 +37,7 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../sst-dsp.h"
+#include "../../common/sst-dsp.h"
 
 void memcpy32_toio(void __iomem *dst, const void *src, int count)
 {
diff --git a/sound/soc/intel/sst/sst_pci.c b/sound/soc/intel/atom/sst/sst_pci.c
index 3a0b3bf0af97..3a0b3bf0af97 100644
--- a/sound/soc/intel/sst/sst_pci.c
+++ b/sound/soc/intel/atom/sst/sst_pci.c
diff --git a/sound/soc/intel/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c
index 4b7720864492..adb32fefd693 100644
--- a/sound/soc/intel/sst/sst_pvt.c
+++ b/sound/soc/intel/atom/sst/sst_pvt.c
@@ -34,7 +34,7 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../sst-dsp.h"
+#include "../../common/sst-dsp.h"
 
 int sst_shim_write(void __iomem *addr, int offset, int value)
 {
@@ -111,30 +111,6 @@ int sst_wait_interruptible(struct intel_sst_drv *sst_drv_ctx,
 
 }
 
-unsigned long long read_shim_data(struct intel_sst_drv *sst, int addr)
-{
-        unsigned long long val = 0;
-
-        switch (sst->dev_id) {
-        case SST_MRFLD_PCI_ID:
-        case SST_BYT_ACPI_ID:
-                val = sst_shim_read64(sst->shim, addr);
-                break;
-        }
-        return val;
-}
-
-void write_shim_data(struct intel_sst_drv *sst, int addr,
-                                unsigned long long data)
-{
-        switch (sst->dev_id) {
-        case SST_MRFLD_PCI_ID:
-        case SST_BYT_ACPI_ID:
-                sst_shim_write64(sst->shim, addr, (u64) data);
-                break;
-        }
-}
-
 /*
  * sst_wait_timeout - wait on event for timeout
  *
diff --git a/sound/soc/intel/sst/sst_stream.c b/sound/soc/intel/atom/sst/sst_stream.c
index dae2a41997aa..a74c64c7053c 100644
--- a/sound/soc/intel/sst/sst_stream.c
+++ b/sound/soc/intel/atom/sst/sst_stream.c
@@ -31,7 +31,7 @@
 #include <asm/platform_sst_audio.h>
 #include "../sst-mfld-platform.h"
 #include "sst.h"
-#include "../sst-dsp.h"
+#include "../../common/sst-dsp.h"
 
 int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params)
 {
diff --git a/sound/soc/intel/baytrail/Makefile b/sound/soc/intel/baytrail/Makefile
new file mode 100644
index 000000000000..488408cadf6d
--- /dev/null
+++ b/sound/soc/intel/baytrail/Makefile
@@ -0,0 +1,4 @@
+snd-soc-sst-baytrail-pcm-objs := \
+                sst-baytrail-ipc.o sst-baytrail-pcm.o sst-baytrail-dsp.o
+
+obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o
diff --git a/sound/soc/intel/sst-baytrail-dsp.c b/sound/soc/intel/baytrail/sst-baytrail-dsp.c
index 5a9e56700f31..01d023cc05dd 100644
--- a/sound/soc/intel/sst-baytrail-dsp.c
+++ b/sound/soc/intel/baytrail/sst-baytrail-dsp.c
@@ -22,8 +22,8 @@
 #include <linux/platform_device.h>
 #include <linux/firmware.h>
 
-#include "sst-dsp.h"
-#include "sst-dsp-priv.h"
+#include "../common/sst-dsp.h"
+#include "../common/sst-dsp-priv.h"
 #include "sst-baytrail-ipc.h"
 
 #define SST_BYT_FW_SIGNATURE_SIZE       4
diff --git a/sound/soc/intel/sst-baytrail-ipc.c b/sound/soc/intel/baytrail/sst-baytrail-ipc.c
index b4ad98c43e5c..1efb33b36303 100644
--- a/sound/soc/intel/sst-baytrail-ipc.c
+++ b/sound/soc/intel/baytrail/sst-baytrail-ipc.c
@@ -29,8 +29,9 @@
 #include <asm/div64.h>
 
 #include "sst-baytrail-ipc.h"
-#include "sst-dsp.h"
-#include "sst-dsp-priv.h"
+#include "../common/sst-dsp.h"
+#include "../common/sst-dsp-priv.h"
+#include "../common/sst-ipc.h"
 
 /* IPC message timeout */
 #define IPC_TIMEOUT_MSECS       300
@@ -142,23 +143,6 @@ struct sst_byt_fw_init {
         u8 debug_info;
 } __packed;
 
-/* driver internal IPC message structure */
-struct ipc_message {
-        struct list_head list;
-        u64 header;
-
-        /* direction wrt host CPU */
-        char tx_data[SST_BYT_IPC_MAX_PAYLOAD_SIZE];
-        size_t tx_size;
-        char rx_data[SST_BYT_IPC_MAX_PAYLOAD_SIZE];
-        size_t rx_size;
-
-        wait_queue_head_t waitq;
-        bool complete;
-        bool wait;
-        int errno;
-};
-
 struct sst_byt_stream;
 struct sst_byt;
 
@@ -195,14 +179,7 @@ struct sst_byt {
         struct sst_fw *fw;
 
         /* IPC messaging */
-        struct list_head tx_list;
-        struct list_head rx_list;
-        struct list_head empty_list;
-        wait_queue_head_t wait_txq;
-        struct task_struct *tx_thread;
-        struct kthread_worker kworker;
-        struct kthread_work kwork;
-        struct ipc_message *msg;
+        struct sst_generic_ipc ipc;
 };
 
 static inline u64 sst_byt_header(int msg_id, int data, bool large, int str_id)
@@ -246,209 +223,6 @@ static struct sst_byt_stream *sst_byt_get_stream(struct sst_byt *byt,
         return NULL;
 }
 
-static void sst_byt_ipc_shim_dbg(struct sst_byt *byt, const char *text)
-{
-        struct sst_dsp *sst = byt->dsp;
-        u64 isr, ipcd, imrx, ipcx;
-
-        ipcx = sst_dsp_shim_read64_unlocked(sst, SST_IPCX);
-        isr = sst_dsp_shim_read64_unlocked(sst, SST_ISRX);
-        ipcd = sst_dsp_shim_read64_unlocked(sst, SST_IPCD);
-        imrx = sst_dsp_shim_read64_unlocked(sst, SST_IMRX);
-
-        dev_err(byt->dev,
-                "ipc: --%s-- ipcx 0x%llx isr 0x%llx ipcd 0x%llx imrx 0x%llx\n",
-                text, ipcx, isr, ipcd, imrx);
-}
-
-/* locks held by caller */
-static struct ipc_message *sst_byt_msg_get_empty(struct sst_byt *byt)
-{
-        struct ipc_message *msg = NULL;
-
-        if (!list_empty(&byt->empty_list)) {
-                msg = list_first_entry(&byt->empty_list,
-                                       struct ipc_message, list);
-                list_del(&msg->list);
-        }
-
-        return msg;
-}
-
-static void sst_byt_ipc_tx_msgs(struct kthread_work *work)
-{
-        struct sst_byt *byt =
-                container_of(work, struct sst_byt, kwork);
-        struct ipc_message *msg;
-        u64 ipcx;
-        unsigned long flags;
-
-        spin_lock_irqsave(&byt->dsp->spinlock, flags);
-        if (list_empty(&byt->tx_list)) {
-                spin_unlock_irqrestore(&byt->dsp->spinlock, flags);
-                return;
-        }
-
-        /* if the DSP is busy we will TX messages after IRQ */
-        ipcx = sst_dsp_shim_read64_unlocked(byt->dsp, SST_IPCX);
-        if (ipcx & SST_BYT_IPCX_BUSY) {
-                spin_unlock_irqrestore(&byt->dsp->spinlock, flags);
-                return;
-        }
-
-        msg = list_first_entry(&byt->tx_list, struct ipc_message, list);
-
-        list_move(&msg->list, &byt->rx_list);
-
-        /* send the message */
-        if (msg->header & IPC_HEADER_LARGE(true))
-                sst_dsp_outbox_write(byt->dsp, msg->tx_data, msg->tx_size);
-        sst_dsp_shim_write64_unlocked(byt->dsp, SST_IPCX, msg->header);
-
-        spin_unlock_irqrestore(&byt->dsp->spinlock, flags);
-}
-
-static inline void sst_byt_tx_msg_reply_complete(struct sst_byt *byt,
-                                                 struct ipc_message *msg)
-{
-        msg->complete = true;
-
-        if (!msg->wait)
-                list_add_tail(&msg->list, &byt->empty_list);
-        else
-                wake_up(&msg->waitq);
-}
-
-static void sst_byt_drop_all(struct sst_byt *byt)
-{
-        struct ipc_message *msg, *tmp;
-        unsigned long flags;
-
-        /* drop all TX and Rx messages before we stall + reset DSP */
-        spin_lock_irqsave(&byt->dsp->spinlock, flags);
-        list_for_each_entry_safe(msg, tmp, &byt->tx_list, list) {
-                list_move(&msg->list, &byt->empty_list);
-        }
-
-        list_for_each_entry_safe(msg, tmp, &byt->rx_list, list) {
-                list_move(&msg->list, &byt->empty_list);
-        }
-
-        spin_unlock_irqrestore(&byt->dsp->spinlock, flags);
-}
-
-static int sst_byt_tx_wait_done(struct sst_byt *byt, struct ipc_message *msg,
-                                void *rx_data)
-{
-        unsigned long flags;
-        int ret;
-
-        /* wait for DSP completion */
-        ret = wait_event_timeout(msg->waitq, msg->complete,
-                                 msecs_to_jiffies(IPC_TIMEOUT_MSECS));
-
-        spin_lock_irqsave(&byt->dsp->spinlock, flags);
-        if (ret == 0) {
-                list_del(&msg->list);
-                sst_byt_ipc_shim_dbg(byt, "message timeout");
-
-                ret = -ETIMEDOUT;
-        } else {
-
-                /* copy the data returned from DSP */
-                if (msg->rx_size)
-                        memcpy(rx_data, msg->rx_data, msg->rx_size);
-                ret = msg->errno;
-        }
-
-        list_add_tail(&msg->list, &byt->empty_list);
-        spin_unlock_irqrestore(&byt->dsp->spinlock, flags);
-        return ret;
-}
-
-static int sst_byt_ipc_tx_message(struct sst_byt *byt, u64 header,
-                                  void *tx_data, size_t tx_bytes,
-                                  void *rx_data, size_t rx_bytes, int wait)
-{
-        unsigned long flags;
-        struct ipc_message *msg;
-
-        spin_lock_irqsave(&byt->dsp->spinlock, flags);
-
-        msg = sst_byt_msg_get_empty(byt);
-        if (msg == NULL) {
-                spin_unlock_irqrestore(&byt->dsp->spinlock, flags);
-                return -EBUSY;
-        }
-
-        msg->header = header;
-        msg->tx_size = tx_bytes;
-        msg->rx_size = rx_bytes;
-        msg->wait = wait;
-        msg->errno = 0;
-        msg->complete = false;
-
-        if (tx_bytes) {
-                /* msg content = lower 32-bit of the header + data */
-                *(u32 *)msg->tx_data = (u32)(header & (u32)-1);
-                memcpy(msg->tx_data + sizeof(u32), tx_data, tx_bytes);
-                msg->tx_size += sizeof(u32);
-        }
-
-        list_add_tail(&msg->list, &byt->tx_list);
-        spin_unlock_irqrestore(&byt->dsp->spinlock, flags);
-
-        queue_kthread_work(&byt->kworker, &byt->kwork);
-
-        if (wait)
-                return sst_byt_tx_wait_done(byt, msg, rx_data);
-        else
-                return 0;
-}
-
-static inline int sst_byt_ipc_tx_msg_wait(struct sst_byt *byt, u64 header,
-                                          void *tx_data, size_t tx_bytes,
-                                          void *rx_data, size_t rx_bytes)
-{
-        return sst_byt_ipc_tx_message(byt, header, tx_data, tx_bytes,
-                                      rx_data, rx_bytes, 1);
-}
-
-static inline int sst_byt_ipc_tx_msg_nowait(struct sst_byt *byt, u64 header,
-                                                void *tx_data, size_t tx_bytes)
-{
-        return sst_byt_ipc_tx_message(byt, header, tx_data, tx_bytes,
-                                      NULL, 0, 0);
-}
-
-static struct ipc_message *sst_byt_reply_find_msg(struct sst_byt *byt,
-                                                  u64 header)
-{
-        struct ipc_message *msg = NULL, *_msg;
-        u64 mask;
-
-        /* match reply to message sent based on msg and stream IDs */
-        mask = IPC_HEADER_MSG_ID_MASK |
-               IPC_HEADER_STR_ID_MASK << IPC_HEADER_STR_ID_SHIFT;
-        header &= mask;
-
-        if (list_empty(&byt->rx_list)) {
-                dev_err(byt->dev,
-                        "ipc: rx list is empty but received 0x%llx\n", header);
-                goto out;
-        }
-
-        list_for_each_entry(_msg, &byt->rx_list, list) {
-                if ((_msg->header & mask) == header) {
-                        msg = _msg;
-                        break;
-                }
-        }
-
-out:
-        return msg;
-}
-
 static void sst_byt_stream_update(struct sst_byt *byt, struct ipc_message *msg)
 {
         struct sst_byt_stream *stream;
@@ -477,7 +251,7 @@ static int sst_byt_process_reply(struct sst_byt *byt, u64 header)
 {
         struct ipc_message *msg;
 
-        msg = sst_byt_reply_find_msg(byt, header);
+        msg = sst_ipc_reply_find_msg(&byt->ipc, header);
         if (msg == NULL)
                 return 1;
 
@@ -491,7 +265,7 @@ static int sst_byt_process_reply(struct sst_byt *byt, u64 header)
 
         list_del(&msg->list);
         /* wake up */
-        sst_byt_tx_msg_reply_complete(byt, msg);
+        sst_ipc_tx_msg_reply_complete(&byt->ipc, msg);
 
         return 1;
 }
@@ -538,6 +312,7 @@ static irqreturn_t sst_byt_irq_thread(int irq, void *context)
 {
         struct sst_dsp *sst = (struct sst_dsp *) context;
         struct sst_byt *byt = sst_dsp_get_thread_context(sst);
+        struct sst_generic_ipc *ipc = &byt->ipc;
         u64 header;
         unsigned long flags;
 
@@ -569,7 +344,7 @@ static irqreturn_t sst_byt_irq_thread(int irq, void *context)
         spin_unlock_irqrestore(&sst->spinlock, flags);
 
         /* continue to send any remaining messages... */
-        queue_kthread_work(&byt->kworker, &byt->kwork);
+        queue_kthread_work(&ipc->kworker, &ipc->kwork);
 
         return IRQ_HANDLED;
 }
@@ -656,7 +431,8 @@ int sst_byt_stream_commit(struct sst_byt *byt, struct sst_byt_stream *stream)
         header = sst_byt_header(IPC_IA_ALLOC_STREAM,
                                 sizeof(*str_req) + sizeof(u32),
                                 true, stream->str_id);
-        ret = sst_byt_ipc_tx_msg_wait(byt, header, str_req, sizeof(*str_req),
+        ret = sst_ipc_tx_message_wait(&byt->ipc, header, str_req,
+                                      sizeof(*str_req),
                                       reply, sizeof(*reply));
         if (ret < 0) {
                 dev_err(byt->dev, "ipc: error stream commit failed\n");
@@ -679,7 +455,7 @@ int sst_byt_stream_free(struct sst_byt *byt, struct sst_byt_stream *stream)
                 goto out;
 
         header = sst_byt_header(IPC_IA_FREE_STREAM, 0, false, stream->str_id);
-        ret = sst_byt_ipc_tx_msg_wait(byt, header, NULL, 0, NULL, 0);
+        ret = sst_ipc_tx_message_wait(&byt->ipc, header, NULL, 0, NULL, 0);
         if (ret < 0) {
                 dev_err(byt->dev, "ipc: free stream %d failed\n",
                         stream->str_id);
@@ -703,9 +479,11 @@ static int sst_byt_stream_operations(struct sst_byt *byt, int type,
 
         header = sst_byt_header(type, 0, false, stream_id);
         if (wait)
-                return sst_byt_ipc_tx_msg_wait(byt, header, NULL, 0, NULL, 0);
+                return sst_ipc_tx_message_wait(&byt->ipc, header, NULL,
+                                                0, NULL, 0);
         else
-                return sst_byt_ipc_tx_msg_nowait(byt, header, NULL, 0);
+                return sst_ipc_tx_message_nowait(&byt->ipc, header,
+                                                NULL, 0);
 }
 
 /* stream ALSA trigger operations */
@@ -725,7 +503,7 @@ int sst_byt_stream_start(struct sst_byt *byt, struct sst_byt_stream *stream,
         tx_msg = &start_stream;
         size = sizeof(start_stream);
 
-        ret = sst_byt_ipc_tx_msg_nowait(byt, header, tx_msg, size);
+        ret = sst_ipc_tx_message_nowait(&byt->ipc, header, tx_msg, size);
         if (ret < 0)
                 dev_err(byt->dev, "ipc: error failed to start stream %d\n",
                         stream->str_id);
@@ -790,23 +568,6 @@ int sst_byt_get_dsp_position(struct sst_byt *byt,
         return do_div(fw_tstamp.ring_buffer_counter, buffer_size);
 }
 
-static int msg_empty_list_init(struct sst_byt *byt)
-{
-        struct ipc_message *msg;
-        int i;
-
-        byt->msg = kzalloc(sizeof(*msg) * IPC_EMPTY_LIST_SIZE, GFP_KERNEL);
-        if (byt->msg == NULL)
-                return -ENOMEM;
-
-        for (i = 0; i < IPC_EMPTY_LIST_SIZE; i++) {
-                init_waitqueue_head(&byt->msg[i].waitq);
-                list_add(&byt->msg[i].list, &byt->empty_list);
-        }
-
-        return 0;
-}
-
 struct sst_dsp *sst_byt_get_dsp(struct sst_byt *byt)
 {
         return byt->dsp;
@@ -823,7 +584,7 @@ int sst_byt_dsp_suspend_late(struct device *dev, struct sst_pdata *pdata)
 
         dev_dbg(byt->dev, "dsp reset\n");
         sst_dsp_reset(byt->dsp);
-        sst_byt_drop_all(byt);
+        sst_ipc_drop_all(&byt->ipc);
         dev_dbg(byt->dev, "dsp in reset\n");
 
         dev_dbg(byt->dev, "free all blocks and unload fw\n");
@@ -876,9 +637,52 @@ int sst_byt_dsp_wait_for_ready(struct device *dev, struct sst_pdata *pdata)
 }
 EXPORT_SYMBOL_GPL(sst_byt_dsp_wait_for_ready);
 
+static void byt_tx_msg(struct sst_generic_ipc *ipc, struct ipc_message *msg)
+{
+        if (msg->header & IPC_HEADER_LARGE(true))
+                sst_dsp_outbox_write(ipc->dsp, msg->tx_data, msg->tx_size);
+
+        sst_dsp_shim_write64_unlocked(ipc->dsp, SST_IPCX, msg->header);
+}
+
+static void byt_shim_dbg(struct sst_generic_ipc *ipc, const char *text)
+{
+        struct sst_dsp *sst = ipc->dsp;
+        u64 isr, ipcd, imrx, ipcx;
+
+        ipcx = sst_dsp_shim_read64_unlocked(sst, SST_IPCX);
+        isr = sst_dsp_shim_read64_unlocked(sst, SST_ISRX);
+        ipcd = sst_dsp_shim_read64_unlocked(sst, SST_IPCD);
+        imrx = sst_dsp_shim_read64_unlocked(sst, SST_IMRX);
+
+        dev_err(ipc->dev,
+                "ipc: --%s-- ipcx 0x%llx isr 0x%llx ipcd 0x%llx imrx 0x%llx\n",
+                text, ipcx, isr, ipcd, imrx);
+}
+
+static void byt_tx_data_copy(struct ipc_message *msg, char *tx_data,
+        size_t tx_size)
+{
+        /* msg content = lower 32-bit of the header + data */
+        *(u32 *)msg->tx_data = (u32)(msg->header & (u32)-1);
+        memcpy(msg->tx_data + sizeof(u32), tx_data, tx_size);
+        msg->tx_size += sizeof(u32);
+}
+
+static u64 byt_reply_msg_match(u64 header, u64 *mask)
+{
+        /* match reply to message sent based on msg and stream IDs */
+        *mask = IPC_HEADER_MSG_ID_MASK |
+               IPC_HEADER_STR_ID_MASK << IPC_HEADER_STR_ID_SHIFT;
+        header &= *mask;
+
+        return header;
+}
+
 int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
 {
         struct sst_byt *byt;
+        struct sst_generic_ipc *ipc;
         struct sst_fw *byt_sst_fw;
         struct sst_byt_fw_init init;
         int err;
@@ -889,39 +693,30 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
         if (byt == NULL)
                 return -ENOMEM;
 
-        byt->dev = dev;
-        INIT_LIST_HEAD(&byt->stream_list);
-        INIT_LIST_HEAD(&byt->tx_list);
-        INIT_LIST_HEAD(&byt->rx_list);
-        INIT_LIST_HEAD(&byt->empty_list);
-        init_waitqueue_head(&byt->boot_wait);
-        init_waitqueue_head(&byt->wait_txq);
+        ipc = &byt->ipc;
+        ipc->dev = dev;
+        ipc->ops.tx_msg = byt_tx_msg;
+        ipc->ops.shim_dbg = byt_shim_dbg;
+        ipc->ops.tx_data_copy = byt_tx_data_copy;
+        ipc->ops.reply_msg_match = byt_reply_msg_match;
 
-        err = msg_empty_list_init(byt);
-        if (err < 0)
-                return -ENOMEM;
-
-        /* start the IPC message thread */
-        init_kthread_worker(&byt->kworker);
-        byt->tx_thread = kthread_run(kthread_worker_fn,
-                                     &byt->kworker, "%s",
-                                     dev_name(byt->dev));
-        if (IS_ERR(byt->tx_thread)) {
-                err = PTR_ERR(byt->tx_thread);
-                dev_err(byt->dev, "error failed to create message TX task\n");
-                goto err_free_msg;
-        }
-        init_kthread_work(&byt->kwork, sst_byt_ipc_tx_msgs);
+        err = sst_ipc_init(ipc);
+        if (err != 0)
+                goto ipc_init_err;
 
+        INIT_LIST_HEAD(&byt->stream_list);
+        init_waitqueue_head(&byt->boot_wait);
         byt_dev.thread_context = byt;
 
         /* init SST shim */
         byt->dsp = sst_dsp_new(dev, &byt_dev, pdata);
         if (byt->dsp == NULL) {
                 err = -ENODEV;
-                goto dsp_err;
+                goto dsp_new_err;
         }
 
+        ipc->dsp = byt->dsp;
+
         /* keep the DSP in reset state for base FW loading */
         sst_dsp_reset(byt->dsp);
 
@@ -961,10 +756,10 @@ boot_err:
         sst_fw_free(byt_sst_fw);
 fw_err:
         sst_dsp_free(byt->dsp);
-dsp_err:
-        kthread_stop(byt->tx_thread);
-err_free_msg:
-        kfree(byt->msg);
+dsp_new_err:
+        sst_ipc_fini(ipc);
+ipc_init_err:
+        kfree(byt);
 
         return err;
 }
@@ -977,7 +772,6 @@ void sst_byt_dsp_free(struct device *dev, struct sst_pdata *pdata)
         sst_dsp_reset(byt->dsp);
         sst_fw_free_all(byt->dsp);
         sst_dsp_free(byt->dsp);
-        kthread_stop(byt->tx_thread);
-        kfree(byt->msg);
+        sst_ipc_fini(&byt->ipc);
 }
 EXPORT_SYMBOL_GPL(sst_byt_dsp_free);
diff --git a/sound/soc/intel/sst-baytrail-ipc.h b/sound/soc/intel/baytrail/sst-baytrail-ipc.h
index 8faff6dcf25d..8faff6dcf25d 100644
--- a/sound/soc/intel/sst-baytrail-ipc.h
+++ b/sound/soc/intel/baytrail/sst-baytrail-ipc.h
diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/baytrail/sst-baytrail-pcm.c
index 224c49c9f135..79547bec558b 100644
--- a/sound/soc/intel/sst-baytrail-pcm.c
+++ b/sound/soc/intel/baytrail/sst-baytrail-pcm.c
@@ -20,8 +20,8 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include "sst-baytrail-ipc.h"
-#include "sst-dsp-priv.h"
-#include "sst-dsp.h"
+#include "../common/sst-dsp-priv.h"
+#include "../common/sst-dsp.h"
 
 #define BYT_PCM_COUNT           2
 
diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
new file mode 100644
index 000000000000..f8237f0044eb
--- /dev/null
+++ b/sound/soc/intel/boards/Makefile
@@ -0,0 +1,15 @@
+snd-soc-sst-haswell-objs := haswell.o
+snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o
+snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o
+snd-soc-sst-broadwell-objs := broadwell.o
+snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o
+snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o
+snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o
+
+obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
+obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
+obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o
+obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o
+obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o
+obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o
+obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o
diff --git a/sound/soc/intel/broadwell.c b/sound/soc/intel/boards/broadwell.c
index fc5542034b9b..8bafaf6ceab1 100644
--- a/sound/soc/intel/broadwell.c
+++ b/sound/soc/intel/boards/broadwell.c
@@ -22,10 +22,10 @@
 #include <sound/jack.h>
 #include <sound/pcm_params.h>
 
-#include "sst-dsp.h"
-#include "sst-haswell-ipc.h"
+#include "../common/sst-dsp.h"
+#include "../haswell/sst-haswell-ipc.h"
 
-#include "../codecs/rt286.h"
+#include "../../codecs/rt286.h"
 
 static struct snd_soc_jack broadwell_headset;
 /* Headset jack detection DAPM pins */
@@ -219,6 +219,32 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
         },
 };
 
+static int broadwell_suspend(struct snd_soc_card *card){
+        struct snd_soc_codec *codec;
+
+        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
+                if (!strcmp(codec->component.name, "i2c-INT343A:00")) {
+                        dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n");
+                        rt286_mic_detect(codec, NULL);
+                        break;
+                }
+        }
+        return 0;
+}
+
+static int broadwell_resume(struct snd_soc_card *card){
+        struct snd_soc_codec *codec;
+
+        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
+                if (!strcmp(codec->component.name, "i2c-INT343A:00")) {
+                        dev_dbg(codec->dev, "enabling jack detect for resume.\n");
+                        rt286_mic_detect(codec, &broadwell_headset);
+                        break;
+                }
+        }
+        return 0;
+}
+
 /* broadwell audio machine driver for WPT + RT286S */
 static struct snd_soc_card broadwell_rt286 = {
         .name = "broadwell-rt286",
@@ -232,6 +258,8 @@ static struct snd_soc_card broadwell_rt286 = {
         .dapm_routes = broadwell_rt286_map,
         .num_dapm_routes = ARRAY_SIZE(broadwell_rt286_map),
         .fully_routed = true,
+        .suspend_pre = broadwell_suspend,
+        .resume_post = broadwell_resume,
 };
 
 static int broadwell_audio_probe(struct platform_device *pdev)
diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/boards/byt-max98090.c
index d8b1f038da1c..7ab8cc9fbfd5 100644
--- a/sound/soc/intel/byt-max98090.c
+++ b/sound/soc/intel/boards/byt-max98090.c
@@ -24,7 +24,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/jack.h>
-#include "../codecs/max98090.h"
+#include "../../codecs/max98090.h"
 
 struct byt_max98090_private {
         struct snd_soc_jack jack;
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/boards/byt-rt5640.c
index 354eaad886e1..ae89b9b966d9 100644
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/boards/byt-rt5640.c
@@ -23,9 +23,9 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/jack.h>
-#include "../codecs/rt5640.h"
+#include "../../codecs/rt5640.h"
 
-#include "sst-dsp.h"
+#include "../common/sst-dsp.h"
 
 static const struct snd_soc_dapm_widget byt_rt5640_widgets[] = {
         SND_SOC_DAPM_HP("Headphone", NULL),
diff --git a/sound/soc/intel/bytcr_dpcm_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 3b262d01c1b3..7f55d59024a8 100644
--- a/sound/soc/intel/bytcr_dpcm_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -26,8 +26,8 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include "../codecs/rt5640.h"
-#include "sst-atom-controls.h"
+#include "../../codecs/rt5640.h"
+#include "../atom/sst-atom-controls.h"
 
 static const struct snd_soc_dapm_widget byt_dapm_widgets[] = {
         SND_SOC_DAPM_HP("Headphone", NULL),
diff --git a/sound/soc/intel/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index 012227997ed9..20a28b22e30f 100644
--- a/sound/soc/intel/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -27,8 +27,8 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/jack.h>
-#include "../codecs/rt5645.h"
-#include "sst-atom-controls.h"
+#include "../../codecs/rt5645.h"
+#include "../atom/sst-atom-controls.h"
 
 #define CHT_PLAT_CLK_3_HZ       19200000
 #define CHT_CODEC_DAI   "rt5645-aif1"
diff --git a/sound/soc/intel/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index bc8dcacd5e6a..2c9cc5be439e 100644
--- a/sound/soc/intel/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -22,13 +22,28 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include "../codecs/rt5670.h"
-#include "sst-atom-controls.h"
+#include <sound/jack.h>
+#include "../../codecs/rt5670.h"
+#include "../atom/sst-atom-controls.h"
 
 /* The platform clock #3 outputs 19.2Mhz clock to codec as I2S MCLK */
 #define CHT_PLAT_CLK_3_HZ       19200000
 #define CHT_CODEC_DAI   "rt5670-aif1"
 
+static struct snd_soc_jack cht_bsw_headset;
+
+/* Headset jack detection DAPM pins */
+static struct snd_soc_jack_pin cht_bsw_headset_pins[] = {
+        {
+                .pin = "Headset Mic",
+                .mask = SND_JACK_MICROPHONE,
+        },
+        {
+                .pin = "Headphone",
+                .mask = SND_JACK_HEADPHONE,
+        },
+};
+
 static inline struct snd_soc_dai *cht_get_codec_dai(struct snd_soc_card *card)
 {
         int i;
@@ -50,6 +65,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
         struct snd_soc_dapm_context *dapm = w->dapm;
         struct snd_soc_card *card = dapm->card;
         struct snd_soc_dai *codec_dai;
+        int ret;
 
         codec_dai = cht_get_codec_dai(card);
         if (!codec_dai) {
@@ -57,17 +73,31 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
                 return -EIO;
         }
 
-        if (!SND_SOC_DAPM_EVENT_OFF(event))
-                return 0;
-
-        /* Set codec sysclk source to its internal clock because codec PLL will
-         * be off when idle and MCLK will also be off by ACPI when codec is
-         * runtime suspended. Codec needs clock for jack detection and button
-         * press.
-         */
-        snd_soc_dai_set_sysclk(codec_dai, RT5670_SCLK_S_RCCLK,
-                               0, SND_SOC_CLOCK_IN);
-
+        if (SND_SOC_DAPM_EVENT_ON(event)) {
+                /* set codec PLL source to the 19.2MHz platform clock (MCLK) */
+                ret = snd_soc_dai_set_pll(codec_dai, 0, RT5670_PLL1_S_MCLK,
+                                CHT_PLAT_CLK_3_HZ, 48000 * 512);
+                if (ret < 0) {
+                        dev_err(card->dev, "can't set codec pll: %d\n", ret);
+                        return ret;
+                }
+
+                /* set codec sysclk source to PLL */
+                ret = snd_soc_dai_set_sysclk(codec_dai, RT5670_SCLK_S_PLL1,
+                        48000 * 512, SND_SOC_CLOCK_IN);
+                if (ret < 0) {
+                        dev_err(card->dev, "can't set codec sysclk: %d\n", ret);
+                        return ret;
+                }
+        } else {
+                /* Set codec sysclk source to its internal clock because codec
+                 * PLL will be off when idle and MCLK will also be off by ACPI
+                 * when codec is runtime suspended. Codec needs clock for jack
+                 * detection and button press.
+                 */
+                snd_soc_dai_set_sysclk(codec_dai, RT5670_SCLK_S_RCCLK,
+                                       48000 * 512, SND_SOC_CLOCK_IN);
+        }
         return 0;
 }
 
@@ -77,7 +107,8 @@ static const struct snd_soc_dapm_widget cht_dapm_widgets[] = {
         SND_SOC_DAPM_MIC("Int Mic", NULL),
         SND_SOC_DAPM_SPK("Ext Spk", NULL),
         SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
-                        platform_clock_control, SND_SOC_DAPM_POST_PMD),
+                        platform_clock_control, SND_SOC_DAPM_PRE_PMU |
+                        SND_SOC_DAPM_POST_PMD),
 };
 
 static const struct snd_soc_dapm_route cht_audio_map[] = {
@@ -162,6 +193,15 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
                                 | RT5670_AD_MONO_L_FILTER
                                 | RT5670_AD_MONO_R_FILTER,
                                 RT5670_CLK_SEL_I2S1_ASRC);
+
+        ret = snd_soc_card_jack_new(runtime->card, "Headset",
+                SND_JACK_HEADSET | SND_JACK_BTN_0 |
+                SND_JACK_BTN_1 | SND_JACK_BTN_2, &cht_bsw_headset,
+                cht_bsw_headset_pins, ARRAY_SIZE(cht_bsw_headset_pins));
+        if (ret)
+                return ret;
+
+        rt5670_set_jack_detect(codec, &cht_bsw_headset);
         return 0;
 }
 
@@ -251,6 +291,35 @@ static struct snd_soc_dai_link cht_dailink[] = {
         },
 };
 
+static int cht_suspend_pre(struct snd_soc_card *card)
+{
+        struct snd_soc_codec *codec;
+
+        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
+                if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
+                        dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n");
+                        rt5670_jack_suspend(codec);
+                        break;
+                }
+        }
+        return 0;
+}
+
+static int cht_resume_post(struct snd_soc_card *card)
+{
+        struct snd_soc_codec *codec;
+
+        list_for_each_entry(codec, &card->codec_dev_list, card_list) {
+                if (!strcmp(codec->component.name, "i2c-10EC5670:00")) {
+                        dev_dbg(codec->dev, "enabling jack detect for resume.\n");
+                        rt5670_jack_resume(codec);
+                        break;
+                }
+        }
+
+        return 0;
+}
+
 /* SoC card */
 static struct snd_soc_card snd_soc_card_cht = {
         .name = "cherrytrailcraudio",
@@ -262,6 +331,8 @@ static struct snd_soc_card snd_soc_card_cht = {
         .num_dapm_routes = ARRAY_SIZE(cht_audio_map),
         .controls = cht_mc_controls,
         .num_controls = ARRAY_SIZE(cht_mc_controls),
+        .suspend_pre = cht_suspend_pre,
+        .resume_post = cht_resume_post,
 };
 
 static int snd_cht_mc_probe(struct platform_device *pdev)
diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/boards/haswell.c
index 00fddd3f5dfb..22558572cb9c 100644
--- a/sound/soc/intel/haswell.c
+++ b/sound/soc/intel/boards/haswell.c
@@ -21,10 +21,10 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include "sst-dsp.h"
-#include "sst-haswell-ipc.h"
+#include "../common/sst-dsp.h"
+#include "../haswell/sst-haswell-ipc.h"
 
-#include "../codecs/rt5640.h"
+#include "../../codecs/rt5640.h"
 
 /* Haswell ULT platforms have a Headphone and Mic jack */
 static const struct snd_soc_dapm_widget haswell_widgets[] = {
diff --git a/sound/soc/intel/mfld_machine.c b/sound/soc/intel/boards/mfld_machine.c
index 49c09a0add79..49c09a0add79 100644
--- a/sound/soc/intel/mfld_machine.c
+++ b/sound/soc/intel/boards/mfld_machine.c
diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile
new file mode 100644
index 000000000000..f24154ca4e98
--- /dev/null
+++ b/sound/soc/intel/common/Makefile
@@ -0,0 +1,7 @@
+snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o
+snd-soc-sst-acpi-objs := sst-acpi.o
+snd-soc-sst-ipc-objs := sst-ipc.o
+
+obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o
+obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o
+
diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c
index b3d84560fbb5..42f293f9c6e2 100644
--- a/sound/soc/intel/sst-acpi.c
+++ b/sound/soc/intel/common/sst-acpi.c
@@ -142,6 +142,7 @@ static int sst_acpi_probe(struct platform_device *pdev)
         sst_acpi->desc = desc;
         sst_acpi->mach = mach;
 
+        sst_pdata->resindex_dma_base = desc->resindex_dma_base;
         if (desc->resindex_dma_base >= 0) {
                 sst_pdata->dma_engine = desc->dma_engine;
                 sst_pdata->dma_base = desc->resindex_dma_base;
diff --git a/sound/soc/intel/sst-dsp-priv.h b/sound/soc/intel/common/sst-dsp-priv.h
index b9da030e312d..396d54510350 100644
--- a/sound/soc/intel/sst-dsp-priv.h
+++ b/sound/soc/intel/common/sst-dsp-priv.h
@@ -173,6 +173,16 @@ struct sst_module_runtime_context {
 };
 
 /*
+ * Audio DSP Module State
+ */
+enum sst_module_state {
+        SST_MODULE_STATE_UNLOADED = 0,  /* default state */
+        SST_MODULE_STATE_LOADED,
+        SST_MODULE_STATE_INITIALIZED,   /* and inactive */
+        SST_MODULE_STATE_ACTIVE,
+};
+
+/*
  * Audio DSP Generic Module.
  *
  * Each Firmware file can consist of 1..N modules. A module can span multiple
@@ -203,6 +213,9 @@ struct sst_module {
         struct list_head list;          /* DSP list of modules */
         struct list_head list_fw;       /* FW list of modules */
         struct list_head runtime_list;  /* list of runtime module objects*/
+
+        /* state */
+        enum sst_module_state state;
 };
 
 /*
diff --git a/sound/soc/intel/sst-dsp.c b/sound/soc/intel/common/sst-dsp.c
index 64e94212d2d2..64e94212d2d2 100644
--- a/sound/soc/intel/sst-dsp.c
+++ b/sound/soc/intel/common/sst-dsp.c
diff --git a/sound/soc/intel/sst-dsp.h b/sound/soc/intel/common/sst-dsp.h
index f291e32f0077..96aeb2556ad4 100644
--- a/sound/soc/intel/sst-dsp.h
+++ b/sound/soc/intel/common/sst-dsp.h
@@ -28,7 +28,6 @@
 
 /* Supported SST DMA Devices */
 #define SST_DMA_TYPE_DW         1
-#define SST_DMA_TYPE_MID        2
 
 /* autosuspend delay 5s*/
 #define SST_RUNTIME_SUSPEND_DELAY       (5 * 1000)
@@ -206,6 +205,7 @@ struct sst_pdata {
         const struct firmware *fw;
 
         /* DMA */
+        int resindex_dma_base; /* other fields invalid if equals to -1 */
         u32 dma_base;
         u32 dma_size;
         int dma_engine;
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c
index 5f71ef607a57..ebcca6dc48d1 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/common/sst-firmware.c
@@ -221,8 +221,6 @@ int sst_dsp_dma_get_channel(struct sst_dsp *dsp, int chan_id)
         dma_cap_mask_t mask;
         int ret;
 
-        /* The Intel MID DMA engine driver needs the slave config set but
-         * Synopsis DMA engine driver safely ignores the slave config */
         dma_cap_zero(mask);
         dma_cap_set(DMA_SLAVE, mask);
         dma_cap_set(DMA_MEMCPY, mask);
@@ -271,15 +269,16 @@ int sst_dma_new(struct sst_dsp *sst)
         const char *dma_dev_name;
         int ret = 0;
 
+        if (sst->pdata->resindex_dma_base == -1)
+                /* DMA is not used, return and squelsh error messages */
+                return 0;
+
         /* configure the correct platform data for whatever DMA engine
         * is attached to the ADSP IP. */
         switch (sst->pdata->dma_engine) {
         case SST_DMA_TYPE_DW:
                 dma_dev_name = "dw_dmac";
                 break;
-        case SST_DMA_TYPE_MID:
-                dma_dev_name = "Intel MID DMA";
-                break;
         default:
                 dev_err(sst->dev, "error: invalid DMA engine %d\n",
                         sst->pdata->dma_engine);
@@ -498,6 +497,7 @@ struct sst_module *sst_module_new(struct sst_fw *sst_fw,
         sst_module->scratch_size = template->scratch_size;
         sst_module->persistent_size = template->persistent_size;
         sst_module->entry = template->entry;
+        sst_module->state = SST_MODULE_STATE_UNLOADED;
 
         INIT_LIST_HEAD(&sst_module->block_list);
         INIT_LIST_HEAD(&sst_module->runtime_list);
diff --git a/sound/soc/intel/common/sst-ipc.c b/sound/soc/intel/common/sst-ipc.c
new file mode 100644
index 000000000000..4b62a553823c
--- /dev/null
+++ b/sound/soc/intel/common/sst-ipc.c
@@ -0,0 +1,294 @@
+/*
+ * Intel SST generic IPC Support
+ *
+ * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/wait.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/device.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/kthread.h>
+#include <sound/asound.h>
+
+#include "sst-dsp.h"
+#include "sst-dsp-priv.h"
+#include "sst-ipc.h"
+
+/* IPC message timeout (msecs) */
+#define IPC_TIMEOUT_MSECS       300
+
+#define IPC_EMPTY_LIST_SIZE     8
+
+/* locks held by caller */
+static struct ipc_message *msg_get_empty(struct sst_generic_ipc *ipc)
+{
+        struct ipc_message *msg = NULL;
+
+        if (!list_empty(&ipc->empty_list)) {
+                msg = list_first_entry(&ipc->empty_list, struct ipc_message,
+                        list);
+                list_del(&msg->list);
+        }
+
+        return msg;
+}
+
+static int tx_wait_done(struct sst_generic_ipc *ipc,
+        struct ipc_message *msg, void *rx_data)
+{
+        unsigned long flags;
+        int ret;
+
+        /* wait for DSP completion (in all cases atm inc pending) */
+        ret = wait_event_timeout(msg->waitq, msg->complete,
+                msecs_to_jiffies(IPC_TIMEOUT_MSECS));
+
+        spin_lock_irqsave(&ipc->dsp->spinlock, flags);
+        if (ret == 0) {
+                if (ipc->ops.shim_dbg != NULL)
+                        ipc->ops.shim_dbg(ipc, "message timeout");
+
+                list_del(&msg->list);
+                ret = -ETIMEDOUT;
+        } else {
+
+                /* copy the data returned from DSP */
+                if (msg->rx_size)
+                        memcpy(rx_data, msg->rx_data, msg->rx_size);
+                ret = msg->errno;
+        }
+
+        list_add_tail(&msg->list, &ipc->empty_list);
+        spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
+        return ret;
+}
+
+static int ipc_tx_message(struct sst_generic_ipc *ipc, u64 header,
+        void *tx_data, size_t tx_bytes, void *rx_data,
+        size_t rx_bytes, int wait)
+{
+        struct ipc_message *msg;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ipc->dsp->spinlock, flags);
+
+        msg = msg_get_empty(ipc);
+        if (msg == NULL) {
+                spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
+                return -EBUSY;
+        }
+
+        msg->header = header;
+        msg->tx_size = tx_bytes;
+        msg->rx_size = rx_bytes;
+        msg->wait = wait;
+        msg->errno = 0;
+        msg->pending = false;
+        msg->complete = false;
+
+        if ((tx_bytes) && (ipc->ops.tx_data_copy != NULL))
+                ipc->ops.tx_data_copy(msg, tx_data, tx_bytes);
+
+        list_add_tail(&msg->list, &ipc->tx_list);
+        spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
+
+        queue_kthread_work(&ipc->kworker, &ipc->kwork);
+
+        if (wait)
+                return tx_wait_done(ipc, msg, rx_data);
+        else
+                return 0;
+}
+
+static int msg_empty_list_init(struct sst_generic_ipc *ipc)
+{
+        int i;
+
+        ipc->msg = kzalloc(sizeof(struct ipc_message) *
+                IPC_EMPTY_LIST_SIZE, GFP_KERNEL);
+        if (ipc->msg == NULL)
+                return -ENOMEM;
+
+        for (i = 0; i < IPC_EMPTY_LIST_SIZE; i++) {
+                init_waitqueue_head(&ipc->msg[i].waitq);
+                list_add(&ipc->msg[i].list, &ipc->empty_list);
+        }
+
+        return 0;
+}
+
+static void ipc_tx_msgs(struct kthread_work *work)
+{
+        struct sst_generic_ipc *ipc =
+                container_of(work, struct sst_generic_ipc, kwork);
+        struct ipc_message *msg;
+        unsigned long flags;
+        u64 ipcx;
+
+        spin_lock_irqsave(&ipc->dsp->spinlock, flags);
+
+        if (list_empty(&ipc->tx_list) || ipc->pending) {
+                spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
+                return;
+        }
+
+        /* if the DSP is busy, we will TX messages after IRQ.
+         * also postpone if we are in the middle of procesing completion irq*/
+        ipcx = sst_dsp_shim_read_unlocked(ipc->dsp, SST_IPCX);
+        if (ipcx & (SST_IPCX_BUSY | SST_IPCX_DONE)) {
+                spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
+                return;
+        }
+
+        msg = list_first_entry(&ipc->tx_list, struct ipc_message, list);
+        list_move(&msg->list, &ipc->rx_list);
+
+        if (ipc->ops.tx_msg != NULL)
+                ipc->ops.tx_msg(ipc, msg);
+
+        spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
+}
+
+int sst_ipc_tx_message_wait(struct sst_generic_ipc *ipc, u64 header,
+        void *tx_data, size_t tx_bytes, void *rx_data, size_t rx_bytes)
+{
+        return ipc_tx_message(ipc, header, tx_data, tx_bytes,
+                rx_data, rx_bytes, 1);
+}
+EXPORT_SYMBOL_GPL(sst_ipc_tx_message_wait);
+
+int sst_ipc_tx_message_nowait(struct sst_generic_ipc *ipc, u64 header,
+        void *tx_data, size_t tx_bytes)
+{
+        return ipc_tx_message(ipc, header, tx_data, tx_bytes,
+                NULL, 0, 0);
+}
+EXPORT_SYMBOL_GPL(sst_ipc_tx_message_nowait);
+
+struct ipc_message *sst_ipc_reply_find_msg(struct sst_generic_ipc *ipc,
+        u64 header)
+{
+        struct ipc_message *msg;
+        u64 mask;
+
+        if (ipc->ops.reply_msg_match != NULL)
+                header = ipc->ops.reply_msg_match(header, &mask);
+
+        if (list_empty(&ipc->rx_list)) {
+                dev_err(ipc->dev, "error: rx list empty but received 0x%llx\n",
+                        header);
+                return NULL;
+        }
+
+        list_for_each_entry(msg, &ipc->rx_list, list) {
+                if ((msg->header & mask) == header)
+                        return msg;
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(sst_ipc_reply_find_msg);
+
+/* locks held by caller */
+void sst_ipc_tx_msg_reply_complete(struct sst_generic_ipc *ipc,
+        struct ipc_message *msg)
+{
+        msg->complete = true;
+
+        if (!msg->wait)
+                list_add_tail(&msg->list, &ipc->empty_list);
+        else
+                wake_up(&msg->waitq);
+}
+EXPORT_SYMBOL_GPL(sst_ipc_tx_msg_reply_complete);
+
+void sst_ipc_drop_all(struct sst_generic_ipc *ipc)
+{
+        struct ipc_message *msg, *tmp;
+        unsigned long flags;
+        int tx_drop_cnt = 0, rx_drop_cnt = 0;
+
+        /* drop all TX and Rx messages before we stall + reset DSP */
+        spin_lock_irqsave(&ipc->dsp->spinlock, flags);
+
+        list_for_each_entry_safe(msg, tmp, &ipc->tx_list, list) {
+                list_move(&msg->list, &ipc->empty_list);
+                tx_drop_cnt++;
+        }
+
+        list_for_each_entry_safe(msg, tmp, &ipc->rx_list, list) {
+                list_move(&msg->list, &ipc->empty_list);
+                rx_drop_cnt++;
+        }
+
+        spin_unlock_irqrestore(&ipc->dsp->spinlock, flags);
+
+        if (tx_drop_cnt || rx_drop_cnt)
+                dev_err(ipc->dev, "dropped IPC msg RX=%d, TX=%d\n",
+                        tx_drop_cnt, rx_drop_cnt);
+}
+EXPORT_SYMBOL_GPL(sst_ipc_drop_all);
+
+int sst_ipc_init(struct sst_generic_ipc *ipc)
+{
+        int ret;
+
+        INIT_LIST_HEAD(&ipc->tx_list);
+        INIT_LIST_HEAD(&ipc->rx_list);
+        INIT_LIST_HEAD(&ipc->empty_list);
+        init_waitqueue_head(&ipc->wait_txq);
+
+        ret = msg_empty_list_init(ipc);
+        if (ret < 0)
+                return -ENOMEM;
+
+        /* start the IPC message thread */
+        init_kthread_worker(&ipc->kworker);
+        ipc->tx_thread = kthread_run(kthread_worker_fn,
+                                        &ipc->kworker, "%s",
+                                        dev_name(ipc->dev));
+        if (IS_ERR(ipc->tx_thread)) {
+                dev_err(ipc->dev, "error: failed to create message TX task\n");
+                ret = PTR_ERR(ipc->tx_thread);
+                kfree(ipc->msg);
+                return ret;
+        }
+
+        init_kthread_work(&ipc->kwork, ipc_tx_msgs);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(sst_ipc_init);
+
+void sst_ipc_fini(struct sst_generic_ipc *ipc)
+{
+        if (ipc->tx_thread)
+                kthread_stop(ipc->tx_thread);
+
+        if (ipc->msg)
+                kfree(ipc->msg);
+}
+EXPORT_SYMBOL_GPL(sst_ipc_fini);
+
+/* Module information */
+MODULE_AUTHOR("Jin Yao");
+MODULE_DESCRIPTION("Intel SST IPC generic");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/intel/common/sst-ipc.h b/sound/soc/intel/common/sst-ipc.h
new file mode 100644
index 000000000000..125ea451a373
--- /dev/null
+++ b/sound/soc/intel/common/sst-ipc.h
@@ -0,0 +1,91 @@
+/*
+ * Intel SST generic IPC Support
+ *
+ * Copyright (C) 2015, Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version
+ * 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __SST_GENERIC_IPC_H
+#define __SST_GENERIC_IPC_H
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/wait.h>
+#include <linux/list.h>
+#include <linux/workqueue.h>
+#include <linux/sched.h>
+#include <linux/kthread.h>
+
+#define IPC_MAX_MAILBOX_BYTES   256
+
+struct ipc_message {
+        struct list_head list;
+        u64 header;
+
+        /* direction wrt host CPU */
+        char tx_data[IPC_MAX_MAILBOX_BYTES];
+        size_t tx_size;
+        char rx_data[IPC_MAX_MAILBOX_BYTES];
+        size_t rx_size;
+
+        wait_queue_head_t waitq;
+        bool pending;
+        bool complete;
+        bool wait;
+        int errno;
+};
+
+struct sst_generic_ipc;
+
+struct sst_plat_ipc_ops {
+        void (*tx_msg)(struct sst_generic_ipc *, struct ipc_message *);
+        void (*shim_dbg)(struct sst_generic_ipc *, const char *);
+        void (*tx_data_copy)(struct ipc_message *, char *, size_t);
+        u64  (*reply_msg_match)(u64 header, u64 *mask);
+};
+
+/* SST generic IPC data */
+struct sst_generic_ipc {
+        struct device *dev;
+        struct sst_dsp *dsp;
+
+        /* IPC messaging */
+        struct list_head tx_list;
+        struct list_head rx_list;
+        struct list_head empty_list;
+        wait_queue_head_t wait_txq;
+        struct task_struct *tx_thread;
+        struct kthread_worker kworker;
+        struct kthread_work kwork;
+        bool pending;
+        struct ipc_message *msg;
+
+        struct sst_plat_ipc_ops ops;
+};
+
+int sst_ipc_tx_message_wait(struct sst_generic_ipc *ipc, u64 header,
+        void *tx_data, size_t tx_bytes, void *rx_data, size_t rx_bytes);
+
+int sst_ipc_tx_message_nowait(struct sst_generic_ipc *ipc, u64 header,
+        void *tx_data, size_t tx_bytes);
+
+struct ipc_message *sst_ipc_reply_find_msg(struct sst_generic_ipc *ipc,
+        u64 header);
+
+void sst_ipc_tx_msg_reply_complete(struct sst_generic_ipc *ipc,
+        struct ipc_message *msg);
+
+void sst_ipc_drop_all(struct sst_generic_ipc *ipc);
+int sst_ipc_init(struct sst_generic_ipc *ipc);
+void sst_ipc_fini(struct sst_generic_ipc *ipc);
+
+#endif
diff --git a/sound/soc/intel/haswell/Makefile b/sound/soc/intel/haswell/Makefile
new file mode 100644
index 000000000000..9c1723112d22
--- /dev/null
+++ b/sound/soc/intel/haswell/Makefile
@@ -0,0 +1,4 @@
+snd-soc-sst-haswell-pcm-objs := \
+                sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o
+
+obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += snd-soc-sst-haswell-pcm.o
diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/haswell/sst-haswell-dsp.c
index 402b728c0a06..7f94920c8a4d 100644
--- a/sound/soc/intel/sst-haswell-dsp.c
+++ b/sound/soc/intel/haswell/sst-haswell-dsp.c
@@ -28,9 +28,9 @@
 #include <linux/firmware.h>
 #include <linux/pm_runtime.h>
 
-#include "sst-dsp.h"
-#include "sst-dsp-priv.h"
-#include "sst-haswell-ipc.h"
+#include "../common/sst-dsp.h"
+#include "../common/sst-dsp-priv.h"
+#include "../haswell/sst-haswell-ipc.h"
 
 #include <trace/events/hswadsp.h>
 
@@ -100,6 +100,7 @@ static int hsw_parse_module(struct sst_dsp *dsp, struct sst_fw *fw,
                 && module->type != SST_HSW_MODULE_PCM
                 && module->type != SST_HSW_MODULE_PCM_REFERENCE
                 && module->type != SST_HSW_MODULE_PCM_CAPTURE
+                && module->type != SST_HSW_MODULE_WAVES
                 && module->type != SST_HSW_MODULE_LPAL)
                 return 0;
 
@@ -139,6 +140,7 @@ static int hsw_parse_module(struct sst_dsp *dsp, struct sst_fw *fw,
                         mod->type = SST_MEM_IRAM;
                         break;
                 case SST_HSW_DRAM:
+                case SST_HSW_REGS:
                         ram = dsp->addr.lpe;
                         mod->offset = block->ram_offset;
                         mod->type = SST_MEM_DRAM;
@@ -169,6 +171,7 @@ static int hsw_parse_module(struct sst_dsp *dsp, struct sst_fw *fw,
 
                 block = (void *)block + sizeof(*block) + block->size;
         }
+        mod->state = SST_MODULE_STATE_LOADED;
 
         return 0;
 }
diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c
index 863a9ca34b8e..344a1e9bbce5 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/haswell/sst-haswell-ipc.c
@@ -34,8 +34,9 @@
 #include <sound/asound.h>
 
 #include "sst-haswell-ipc.h"
-#include "sst-dsp.h"
-#include "sst-dsp-priv.h"
+#include "../common/sst-dsp.h"
+#include "../common/sst-dsp-priv.h"
+#include "../common/sst-ipc.h"
 
 /* Global Message - Generic */
 #define IPC_GLB_TYPE_SHIFT      24
@@ -79,6 +80,15 @@
 #define IPC_LOG_ID_MASK         (0xf << IPC_LOG_ID_SHIFT)
 #define IPC_LOG_ID(x)           (x << IPC_LOG_ID_SHIFT)
 
+/* Module Message */
+#define IPC_MODULE_OPERATION_SHIFT      20
+#define IPC_MODULE_OPERATION_MASK       (0xf << IPC_MODULE_OPERATION_SHIFT)
+#define IPC_MODULE_OPERATION(x) (x << IPC_MODULE_OPERATION_SHIFT)
+
+#define IPC_MODULE_ID_SHIFT     16
+#define IPC_MODULE_ID_MASK      (0xf << IPC_MODULE_ID_SHIFT)
+#define IPC_MODULE_ID(x)        (x << IPC_MODULE_ID_SHIFT)
+
 /* IPC message timeout (msecs) */
 #define IPC_TIMEOUT_MSECS       300
 #define IPC_BOOT_MSECS          200
@@ -115,6 +125,7 @@ enum ipc_glb_type {
         IPC_GLB_ENTER_DX_STATE = 12,
         IPC_GLB_GET_MIXER_STREAM_INFO = 13,     /* Request mixer stream params */
         IPC_GLB_DEBUG_LOG_MESSAGE = 14,         /* Message to or from the debug logger. */
+        IPC_GLB_MODULE_OPERATION = 15,          /* Message to loadable fw module */
         IPC_GLB_REQUEST_TRANSFER = 16,          /* < Request Transfer for host */
         IPC_GLB_MAX_IPC_MESSAGE_TYPE = 17,      /* Maximum message number */
 };
@@ -133,6 +144,16 @@ enum ipc_glb_reply {
         IPC_GLB_REPLY_SOURCE_NOT_STARTED = 10,  /* Source was not started. */
 };
 
+enum ipc_module_operation {
+        IPC_MODULE_NOTIFICATION = 0,
+        IPC_MODULE_ENABLE = 1,
+        IPC_MODULE_DISABLE = 2,
+        IPC_MODULE_GET_PARAMETER = 3,
+        IPC_MODULE_SET_PARAMETER = 4,
+        IPC_MODULE_GET_INFO = 5,
+        IPC_MODULE_MAX_MESSAGE
+};
+
 /* Stream Message - Types */
 enum ipc_str_operation {
         IPC_STR_RESET = 0,
@@ -190,23 +211,6 @@ struct sst_hsw_ipc_fw_ready {
         u8 fw_info[IPC_MAX_MAILBOX_BYTES - 5 * sizeof(u32)];
 } __attribute__((packed));
 
-struct ipc_message {
-        struct list_head list;
-        u32 header;
-
-        /* direction wrt host CPU */
-        char tx_data[IPC_MAX_MAILBOX_BYTES];
-        size_t tx_size;
-        char rx_data[IPC_MAX_MAILBOX_BYTES];
-        size_t rx_size;
-
-        wait_queue_head_t waitq;
-        bool pending;
-        bool complete;
-        bool wait;
-        int errno;
-};
-
 struct sst_hsw_stream;
 struct sst_hsw;
 
@@ -305,18 +309,19 @@ struct sst_hsw {
         bool shutdown;
 
         /* IPC messaging */
-        struct list_head tx_list;
-        struct list_head rx_list;
-        struct list_head empty_list;
-        wait_queue_head_t wait_txq;
-        struct task_struct *tx_thread;
-        struct kthread_worker kworker;
-        struct kthread_work kwork;
-        bool pending;
-        struct ipc_message *msg;
+        struct sst_generic_ipc ipc;
 
         /* FW log stream */
         struct sst_hsw_log_stream log_stream;
+
+        /* flags bit field to track module state when resume from RTD3,
+         * each bit represent state (enabled/disabled) of single module */
+        u32 enabled_modules_rtd3;
+
+        /* buffer to store parameter lines */
+        u32 param_idx_w;        /* write index */
+        u32 param_idx_r;        /* read index */
+        u8 param_buf[WAVES_PARAM_LINES][WAVES_PARAM_COUNT];
 };
 
 #define CREATE_TRACE_POINTS
@@ -352,6 +357,16 @@ static inline u32 msg_get_notify_reason(u32 msg)
         return (msg & IPC_STG_TYPE_MASK) >> IPC_STG_TYPE_SHIFT;
 }
 
+static inline u32 msg_get_module_operation(u32 msg)
+{
+        return (msg & IPC_MODULE_OPERATION_MASK) >> IPC_MODULE_OPERATION_SHIFT;
+}
+
+static inline u32 msg_get_module_id(u32 msg)
+{
+        return (msg & IPC_MODULE_ID_MASK) >> IPC_MODULE_ID_SHIFT;
+}
+
 u32 create_channel_map(enum sst_hsw_channel_config config)
 {
         switch (config) {
@@ -417,159 +432,6 @@ static struct sst_hsw_stream *get_stream_by_id(struct sst_hsw *hsw,
         return NULL;
 }
 
-static void ipc_shim_dbg(struct sst_hsw *hsw, const char *text)
-{
-        struct sst_dsp *sst = hsw->dsp;
-        u32 isr, ipcd, imrx, ipcx;
-
-        ipcx = sst_dsp_shim_read_unlocked(sst, SST_IPCX);
-        isr = sst_dsp_shim_read_unlocked(sst, SST_ISRX);
-        ipcd = sst_dsp_shim_read_unlocked(sst, SST_IPCD);
-        imrx = sst_dsp_shim_read_unlocked(sst, SST_IMRX);
-
-        dev_err(hsw->dev, "ipc: --%s-- ipcx 0x%8.8x isr 0x%8.8x ipcd 0x%8.8x imrx 0x%8.8x\n",
-                text, ipcx, isr, ipcd, imrx);
-}
-
-/* locks held by caller */
-static struct ipc_message *msg_get_empty(struct sst_hsw *hsw)
-{
-        struct ipc_message *msg = NULL;
-
-        if (!list_empty(&hsw->empty_list)) {
-                msg = list_first_entry(&hsw->empty_list, struct ipc_message,
-                        list);
-                list_del(&msg->list);
-        }
-
-        return msg;
-}
-
-static void ipc_tx_msgs(struct kthread_work *work)
-{
-        struct sst_hsw *hsw =
-                container_of(work, struct sst_hsw, kwork);
-        struct ipc_message *msg;
-        unsigned long flags;
-        u32 ipcx;
-
-        spin_lock_irqsave(&hsw->dsp->spinlock, flags);
-
-        if (list_empty(&hsw->tx_list) || hsw->pending) {
-                spin_unlock_irqrestore(&hsw->dsp->spinlock, flags);
-                return;
-        }
-
-        /* if the DSP is busy, we will TX messages after IRQ.
-         * also postpone if we are in the middle of procesing completion irq*/
-        ipcx = sst_dsp_shim_read_unlocked(hsw->dsp, SST_IPCX);
-        if (ipcx & (SST_IPCX_BUSY | SST_IPCX_DONE)) {
-                spin_unlock_irqrestore(&hsw->dsp->spinlock, flags);
-                return;
-        }
-
-        msg = list_first_entry(&hsw->tx_list, struct ipc_message, list);
-
-        list_move(&msg->list, &hsw->rx_list);
-
-        /* send the message */
-        sst_dsp_outbox_write(hsw->dsp, msg->tx_data, msg->tx_size);
-        sst_dsp_ipc_msg_tx(hsw->dsp, msg->header | SST_IPCX_BUSY);
-
-        spin_unlock_irqrestore(&hsw->dsp->spinlock, flags);
-}
-
-/* locks held by caller */
-static void tx_msg_reply_complete(struct sst_hsw *hsw, struct ipc_message *msg)
-{
-        msg->complete = true;
-        trace_ipc_reply("completed", msg->header);
-
-        if (!msg->wait)
-                list_add_tail(&msg->list, &hsw->empty_list);
-        else
-                wake_up(&msg->waitq);
-}
-
-static int tx_wait_done(struct sst_hsw *hsw, struct ipc_message *msg,
-        void *rx_data)
-{
-        unsigned long flags;
-        int ret;
-
-        /* wait for DSP completion (in all cases atm inc pending) */
-        ret = wait_event_timeout(msg->waitq, msg->complete,
-                msecs_to_jiffies(IPC_TIMEOUT_MSECS));
-
-        spin_lock_irqsave(&hsw->dsp->spinlock, flags);
-        if (ret == 0) {
-                ipc_shim_dbg(hsw, "message timeout");
-
-                trace_ipc_error("error message timeout for", msg->header);
-                list_del(&msg->list);
-                ret = -ETIMEDOUT;
-        } else {
-
-                /* copy the data returned from DSP */
-                if (msg->rx_size)
-                        memcpy(rx_data, msg->rx_data, msg->rx_size);
-                ret = msg->errno;
-        }
-
-        list_add_tail(&msg->list, &hsw->empty_list);
-        spin_unlock_irqrestore(&hsw->dsp->spinlock, flags);
-        return ret;
-}
-
-static int ipc_tx_message(struct sst_hsw *hsw, u32 header, void *tx_data,
-        size_t tx_bytes, void *rx_data, size_t rx_bytes, int wait)
-{
-        struct ipc_message *msg;
-        unsigned long flags;
-
-        spin_lock_irqsave(&hsw->dsp->spinlock, flags);
-
-        msg = msg_get_empty(hsw);
-        if (msg == NULL) {
-                spin_unlock_irqrestore(&hsw->dsp->spinlock, flags);
-                return -EBUSY;
-        }
-
-        if (tx_bytes)
-                memcpy(msg->tx_data, tx_data, tx_bytes);
-
-        msg->header = header;
-        msg->tx_size = tx_bytes;
-        msg->rx_size = rx_bytes;
-        msg->wait = wait;
-        msg->errno = 0;
-        msg->pending = false;
-        msg->complete = false;
-
-        list_add_tail(&msg->list, &hsw->tx_list);
-        spin_unlock_irqrestore(&hsw->dsp->spinlock, flags);
-
-        queue_kthread_work(&hsw->kworker, &hsw->kwork);
-
-        if (wait)
-                return tx_wait_done(hsw, msg, rx_data);
-        else
-                return 0;
-}
-
-static inline int ipc_tx_message_wait(struct sst_hsw *hsw, u32 header,
-        void *tx_data, size_t tx_bytes, void *rx_data, size_t rx_bytes)
-{
-        return ipc_tx_message(hsw, header, tx_data, tx_bytes, rx_data,
-                rx_bytes, 1);
-}
-
-static inline int ipc_tx_message_nowait(struct sst_hsw *hsw, u32 header,
-        void *tx_data, size_t tx_bytes)
-{
-        return ipc_tx_message(hsw, header, tx_data, tx_bytes, NULL, 0, 0);
-}
-
 static void hsw_fw_ready(struct sst_hsw *hsw, u32 header)
 {
         struct sst_hsw_ipc_fw_ready fw_ready;
@@ -604,7 +466,7 @@ static void hsw_fw_ready(struct sst_hsw *hsw, u32 header)
                 /* log the FW version info got from the mailbox here. */
                 memcpy(fw_info, fw_ready.fw_info, fw_ready.fw_info_size);
                 pinfo = &fw_info[0];
-                for (i = 0; i < sizeof(tmp) / sizeof(char *); i++)
+                for (i = 0; i < ARRAY_SIZE(tmp); i++)
                         tmp[i] = strsep(&pinfo, " ");
                 dev_info(hsw->dev, "FW loaded, mailbox readback FW info: type %s, - "
                         "version: %s.%s, build %s, source commit id: %s\n",
@@ -657,27 +519,6 @@ static void hsw_notification_work(struct work_struct *work)
         sst_dsp_shim_update_bits(hsw->dsp, SST_IMRX, SST_IMRX_BUSY, 0);
 }
 
-static struct ipc_message *reply_find_msg(struct sst_hsw *hsw, u32 header)
-{
-        struct ipc_message *msg;
-
-        /* clear reply bits & status bits */
-        header &= ~(IPC_STATUS_MASK | IPC_GLB_REPLY_MASK);
-
-        if (list_empty(&hsw->rx_list)) {
-                dev_err(hsw->dev, "error: rx list empty but received 0x%x\n",
-                        header);
-                return NULL;
-        }
-
-        list_for_each_entry(msg, &hsw->rx_list, list) {
-                if (msg->header == header)
-                        return msg;
-        }
-
-        return NULL;
-}
-
 static void hsw_stream_update(struct sst_hsw *hsw, struct ipc_message *msg)
 {
         struct sst_hsw_stream *stream;
@@ -716,7 +557,7 @@ static int hsw_process_reply(struct sst_hsw *hsw, u32 header)
 
         trace_ipc_reply("processing -->", header);
 
-        msg = reply_find_msg(hsw, header);
+        msg = sst_ipc_reply_find_msg(&hsw->ipc, header);
         if (msg == NULL) {
                 trace_ipc_error("error: can't find message header", header);
                 return -EIO;
@@ -727,14 +568,14 @@ static int hsw_process_reply(struct sst_hsw *hsw, u32 header)
         case IPC_GLB_REPLY_PENDING:
                 trace_ipc_pending_reply("received", header);
                 msg->pending = true;
-                hsw->pending = true;
+                hsw->ipc.pending = true;
                 return 1;
         case IPC_GLB_REPLY_SUCCESS:
                 if (msg->pending) {
                         trace_ipc_pending_reply("completed", header);
                         sst_dsp_inbox_read(hsw->dsp, msg->rx_data,
                                 msg->rx_size);
-                        hsw->pending = false;
+                        hsw->ipc.pending = false;
                 } else {
                         /* copy data from the DSP */
                         sst_dsp_outbox_read(hsw->dsp, msg->rx_data,
@@ -790,11 +631,36 @@ static int hsw_process_reply(struct sst_hsw *hsw, u32 header)
 
         /* wake up and return the error if we have waiters on this message ? */
         list_del(&msg->list);
-        tx_msg_reply_complete(hsw, msg);
+        sst_ipc_tx_msg_reply_complete(&hsw->ipc, msg);
 
         return 1;
 }
 
+static int hsw_module_message(struct sst_hsw *hsw, u32 header)
+{
+        u32 operation, module_id;
+        int handled = 0;
+
+        operation = msg_get_module_operation(header);
+        module_id = msg_get_module_id(header);
+        dev_dbg(hsw->dev, "received module message header: 0x%8.8x\n",
+                        header);
+        dev_dbg(hsw->dev, "operation: 0x%8.8x module_id: 0x%8.8x\n",
+                        operation, module_id);
+
+        switch (operation) {
+        case IPC_MODULE_NOTIFICATION:
+                dev_dbg(hsw->dev, "module notification received");
+                handled = 1;
+                break;
+        default:
+                handled = hsw_process_reply(hsw, header);
+                break;
+        }
+
+        return handled;
+}
+
 static int hsw_stream_message(struct sst_hsw *hsw, u32 header)
 {
         u32 stream_msg, stream_id, stage_type;
@@ -890,6 +756,9 @@ static int hsw_process_notification(struct sst_hsw *hsw)
         case IPC_GLB_DEBUG_LOG_MESSAGE:
                 handled = hsw_log_message(hsw, header);
                 break;
+        case IPC_GLB_MODULE_OPERATION:
+                handled = hsw_module_message(hsw, header);
+                break;
         default:
                 dev_err(hsw->dev, "error: unexpected type %d hdr 0x%8.8x\n",
                         type, header);
@@ -903,6 +772,7 @@ static irqreturn_t hsw_irq_thread(int irq, void *context)
 {
         struct sst_dsp *sst = (struct sst_dsp *) context;
         struct sst_hsw *hsw = sst_dsp_get_thread_context(sst);
+        struct sst_generic_ipc *ipc = &hsw->ipc;
         u32 ipcx, ipcd;
         int handled;
         unsigned long flags;
@@ -949,7 +819,7 @@ static irqreturn_t hsw_irq_thread(int irq, void *context)
         spin_unlock_irqrestore(&sst->spinlock, flags);
 
         /* continue to send any remaining messages... */
-        queue_kthread_work(&hsw->kworker, &hsw->kwork);
+        queue_kthread_work(&ipc->kworker, &ipc->kwork);
 
         return IRQ_HANDLED;
 }
@@ -959,7 +829,8 @@ int sst_hsw_fw_get_version(struct sst_hsw *hsw,
 {
         int ret;
 
-        ret = ipc_tx_message_wait(hsw, IPC_GLB_TYPE(IPC_GLB_GET_FW_VERSION),
+        ret = sst_ipc_tx_message_wait(&hsw->ipc,
+                IPC_GLB_TYPE(IPC_GLB_GET_FW_VERSION),
                 NULL, 0, version, sizeof(*version));
         if (ret < 0)
                 dev_err(hsw->dev, "error: get version failed\n");
@@ -1023,7 +894,8 @@ int sst_hsw_stream_set_volume(struct sst_hsw *hsw,
                 req->channel = channel;
         }
 
-        ret = ipc_tx_message_wait(hsw, header, req, sizeof(*req), NULL, 0);
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header, req,
+                sizeof(*req), NULL, 0);
         if (ret < 0) {
                 dev_err(hsw->dev, "error: set stream volume failed\n");
                 return ret;
@@ -1088,7 +960,8 @@ int sst_hsw_mixer_set_volume(struct sst_hsw *hsw, u32 stage_id, u32 channel,
         req.curve_type = hsw->curve_type;
         req.target_volume = volume;
 
-        ret = ipc_tx_message_wait(hsw, header, &req, sizeof(req), NULL, 0);
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header, &req,
+                sizeof(req), NULL, 0);
         if (ret < 0) {
                 dev_err(hsw->dev, "error: set mixer volume failed\n");
                 return ret;
@@ -1146,7 +1019,7 @@ int sst_hsw_stream_free(struct sst_hsw *hsw, struct sst_hsw_stream *stream)
         stream->free_req.stream_id = stream->reply.stream_hw_id;
         header = IPC_GLB_TYPE(IPC_GLB_FREE_STREAM);
 
-        ret = ipc_tx_message_wait(hsw, header, &stream->free_req,
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header, &stream->free_req,
                 sizeof(stream->free_req), NULL, 0);
         if (ret < 0) {
                 dev_err(hsw->dev, "error: free stream %d failed\n",
@@ -1338,8 +1211,8 @@ int sst_hsw_stream_commit(struct sst_hsw *hsw, struct sst_hsw_stream *stream)
 
         header = IPC_GLB_TYPE(IPC_GLB_ALLOCATE_STREAM);
 
-        ret = ipc_tx_message_wait(hsw, header, str_req, sizeof(*str_req),
-                reply, sizeof(*reply));
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header, str_req,
+                sizeof(*str_req), reply, sizeof(*reply));
         if (ret < 0) {
                 dev_err(hsw->dev, "error: stream commit failed\n");
                 return ret;
@@ -1388,7 +1261,8 @@ int sst_hsw_mixer_get_info(struct sst_hsw *hsw)
 
         trace_ipc_request("get global mixer info", 0);
 
-        ret = ipc_tx_message_wait(hsw, header, NULL, 0, reply, sizeof(*reply));
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header, NULL, 0,
+                reply, sizeof(*reply));
         if (ret < 0) {
                 dev_err(hsw->dev, "error: get stream info failed\n");
                 return ret;
@@ -1409,9 +1283,10 @@ static int sst_hsw_stream_operations(struct sst_hsw *hsw, int type,
         header |= (stream_id << IPC_STR_ID_SHIFT);
 
         if (wait)
-                return ipc_tx_message_wait(hsw, header, NULL, 0, NULL, 0);
+                return sst_ipc_tx_message_wait(&hsw->ipc, header,
+                        NULL, 0, NULL, 0);
         else
-                return ipc_tx_message_nowait(hsw, header, NULL, 0);
+                return sst_ipc_tx_message_nowait(&hsw->ipc, header, NULL, 0);
 }
 
 /* Stream ALSA trigger operations */
@@ -1538,8 +1413,8 @@ int sst_hsw_device_set_config(struct sst_hsw *hsw,
 
         header = IPC_GLB_TYPE(IPC_GLB_SET_DEVICE_FORMATS);
 
-        ret = ipc_tx_message_wait(hsw, header, &config, sizeof(config),
-                NULL, 0);
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header, &config,
+                sizeof(config), NULL, 0);
         if (ret < 0)
                 dev_err(hsw->dev, "error: set device formats failed\n");
 
@@ -1559,8 +1434,8 @@ int sst_hsw_dx_set_state(struct sst_hsw *hsw,
 
         trace_ipc_request("PM enter Dx state", state);
 
-        ret = ipc_tx_message_wait(hsw, header, &state_, sizeof(state_),
-                dx, sizeof(*dx));
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header, &state_,
+                sizeof(state_), dx, sizeof(*dx));
         if (ret < 0) {
                 dev_err(hsw->dev, "ipc: error set dx state %d failed\n", state);
                 return ret;
@@ -1703,32 +1578,6 @@ static int sst_hsw_dx_state_restore(struct sst_hsw *hsw)
         return 0;
 }
 
-static void sst_hsw_drop_all(struct sst_hsw *hsw)
-{
-        struct ipc_message *msg, *tmp;
-        unsigned long flags;
-        int tx_drop_cnt = 0, rx_drop_cnt = 0;
-
-        /* drop all TX and Rx messages before we stall + reset DSP */
-        spin_lock_irqsave(&hsw->dsp->spinlock, flags);
-
-        list_for_each_entry_safe(msg, tmp, &hsw->tx_list, list) {
-                list_move(&msg->list, &hsw->empty_list);
-                tx_drop_cnt++;
-        }
-
-        list_for_each_entry_safe(msg, tmp, &hsw->rx_list, list) {
-                list_move(&msg->list, &hsw->empty_list);
-                rx_drop_cnt++;
-        }
-
-        spin_unlock_irqrestore(&hsw->dsp->spinlock, flags);
-
-        if (tx_drop_cnt || rx_drop_cnt)
-                dev_err(hsw->dev, "dropped IPC msg RX=%d, TX=%d\n",
-                        tx_drop_cnt, rx_drop_cnt);
-}
-
 int sst_hsw_dsp_load(struct sst_hsw *hsw)
 {
         struct sst_dsp *dsp = hsw->dsp;
@@ -1808,7 +1657,7 @@ int sst_hsw_dsp_runtime_suspend(struct sst_hsw *hsw)
         if (ret < 0)
                 return ret;
 
-        sst_hsw_drop_all(hsw);
+        sst_ipc_drop_all(&hsw->ipc);
 
         return 0;
 }
@@ -1844,6 +1693,8 @@ int sst_hsw_dsp_runtime_resume(struct sst_hsw *hsw)
         if (ret < 0)
                 dev_err(dev, "error: audio DSP boot failure\n");
 
+        sst_hsw_init_module_state(hsw);
+
         ret = wait_event_timeout(hsw->boot_wait, hsw->boot_complete,
                 msecs_to_jiffies(IPC_BOOT_MSECS));
         if (ret == 0) {
@@ -1864,26 +1715,345 @@ int sst_hsw_dsp_runtime_resume(struct sst_hsw *hsw)
 }
 #endif
 
-static int msg_empty_list_init(struct sst_hsw *hsw)
+struct sst_dsp *sst_hsw_get_dsp(struct sst_hsw *hsw)
 {
-        int i;
+        return hsw->dsp;
+}
 
-        hsw->msg = kzalloc(sizeof(struct ipc_message) *
-                IPC_EMPTY_LIST_SIZE, GFP_KERNEL);
-        if (hsw->msg == NULL)
-                return -ENOMEM;
+void sst_hsw_init_module_state(struct sst_hsw *hsw)
+{
+        struct sst_module *module;
+        enum sst_hsw_module_id id;
+
+        /* the base fw contains several modules */
+        for (id = SST_HSW_MODULE_BASE_FW; id < SST_HSW_MAX_MODULE_ID; id++) {
+                module = sst_module_get_from_id(hsw->dsp, id);
+                if (module) {
+                        /* module waves is active only after being enabled */
+                        if (id == SST_HSW_MODULE_WAVES)
+                                module->state = SST_MODULE_STATE_INITIALIZED;
+                        else
+                                module->state = SST_MODULE_STATE_ACTIVE;
+                }
+        }
+}
+
+bool sst_hsw_is_module_loaded(struct sst_hsw *hsw, u32 module_id)
+{
+        struct sst_module *module;
+
+        module = sst_module_get_from_id(hsw->dsp, module_id);
+        if (module == NULL || module->state == SST_MODULE_STATE_UNLOADED)
+                return false;
+        else
+                return true;
+}
+
+bool sst_hsw_is_module_active(struct sst_hsw *hsw, u32 module_id)
+{
+        struct sst_module *module;
+
+        module = sst_module_get_from_id(hsw->dsp, module_id);
+        if (module != NULL && module->state == SST_MODULE_STATE_ACTIVE)
+                return true;
+        else
+                return false;
+}
 
-        for (i = 0; i < IPC_EMPTY_LIST_SIZE; i++) {
-                init_waitqueue_head(&hsw->msg[i].waitq);
-                list_add(&hsw->msg[i].list, &hsw->empty_list);
+void sst_hsw_set_module_enabled_rtd3(struct sst_hsw *hsw, u32 module_id)
+{
+        hsw->enabled_modules_rtd3 |= (1 << module_id);
+}
+
+void sst_hsw_set_module_disabled_rtd3(struct sst_hsw *hsw, u32 module_id)
+{
+        hsw->enabled_modules_rtd3 &= ~(1 << module_id);
+}
+
+bool sst_hsw_is_module_enabled_rtd3(struct sst_hsw *hsw, u32 module_id)
+{
+        return hsw->enabled_modules_rtd3 & (1 << module_id);
+}
+
+void sst_hsw_reset_param_buf(struct sst_hsw *hsw)
+{
+        hsw->param_idx_w = 0;
+        hsw->param_idx_r = 0;
+        memset((void *)hsw->param_buf, 0, sizeof(hsw->param_buf));
+}
+
+int sst_hsw_store_param_line(struct sst_hsw *hsw, u8 *buf)
+{
+        /* save line to the first available position of param buffer */
+        if (hsw->param_idx_w > WAVES_PARAM_LINES - 1) {
+                dev_warn(hsw->dev, "warning: param buffer overflow!\n");
+                return -EPERM;
+        }
+        memcpy(hsw->param_buf[hsw->param_idx_w], buf, WAVES_PARAM_COUNT);
+        hsw->param_idx_w++;
+        return 0;
+}
+
+int sst_hsw_load_param_line(struct sst_hsw *hsw, u8 *buf)
+{
+        u8 id = 0;
+
+        /* read the first matching line from param buffer */
+        while (hsw->param_idx_r < WAVES_PARAM_LINES) {
+                id = hsw->param_buf[hsw->param_idx_r][0];
+                hsw->param_idx_r++;
+                if (buf[0] == id) {
+                        memcpy(buf, hsw->param_buf[hsw->param_idx_r],
+                                WAVES_PARAM_COUNT);
+                        break;
+                }
         }
+        if (hsw->param_idx_r > WAVES_PARAM_LINES - 1) {
+                dev_dbg(hsw->dev, "end of buffer, roll to the beginning\n");
+                hsw->param_idx_r = 0;
+                return 0;
+        }
+        return 0;
+}
+
+int sst_hsw_launch_param_buf(struct sst_hsw *hsw)
+{
+        int ret, idx;
 
+        if (!sst_hsw_is_module_active(hsw, SST_HSW_MODULE_WAVES)) {
+                dev_dbg(hsw->dev, "module waves is not active\n");
+                return 0;
+        }
+
+        /* put all param lines to DSP through ipc */
+        for (idx = 0; idx < hsw->param_idx_w; idx++) {
+                ret = sst_hsw_module_set_param(hsw,
+                        SST_HSW_MODULE_WAVES, 0, hsw->param_buf[idx][0],
+                        WAVES_PARAM_COUNT, hsw->param_buf[idx]);
+                if (ret < 0)
+                        return ret;
+        }
         return 0;
 }
 
-struct sst_dsp *sst_hsw_get_dsp(struct sst_hsw *hsw)
+int sst_hsw_module_load(struct sst_hsw *hsw,
+        u32 module_id, u32 instance_id, char *name)
 {
-        return hsw->dsp;
+        int ret = 0;
+        const struct firmware *fw = NULL;
+        struct sst_fw *hsw_sst_fw;
+        struct sst_module *module;
+        struct device *dev = hsw->dev;
+        struct sst_dsp *dsp = hsw->dsp;
+
+        dev_dbg(dev, "sst_hsw_module_load id=%d, name='%s'", module_id, name);
+
+        module = sst_module_get_from_id(dsp, module_id);
+        if (module == NULL) {
+                /* loading for the first time */
+                if (module_id == SST_HSW_MODULE_BASE_FW) {
+                        /* for base module: use fw requested in acpi probe */
+                        fw = dsp->pdata->fw;
+                        if (!fw) {
+                                dev_err(dev, "request Base fw failed\n");
+                                return -ENODEV;
+                        }
+                } else {
+                        /* try and load any other optional modules if they are
+                         * available. Use dev_info instead of dev_err in case
+                         * request firmware failed */
+                        ret = request_firmware(&fw, name, dev);
+                        if (ret) {
+                                dev_info(dev, "fw image %s not available(%d)\n",
+                                                name, ret);
+                                return ret;
+                        }
+                }
+                hsw_sst_fw = sst_fw_new(dsp, fw, hsw);
+                if (hsw_sst_fw  == NULL) {
+                        dev_err(dev, "error: failed to load firmware\n");
+                        ret = -ENOMEM;
+                        goto out;
+                }
+                module = sst_module_get_from_id(dsp, module_id);
+                if (module == NULL) {
+                        dev_err(dev, "error: no module %d in firmware %s\n",
+                                        module_id, name);
+                }
+        } else
+                dev_info(dev, "module %d (%s) already loaded\n",
+                                module_id, name);
+out:
+        /* release fw, but base fw should be released by acpi driver */
+        if (fw && module_id != SST_HSW_MODULE_BASE_FW)
+                release_firmware(fw);
+
+        return ret;
+}
+
+int sst_hsw_module_enable(struct sst_hsw *hsw,
+        u32 module_id, u32 instance_id)
+{
+        int ret;
+        u32 header = 0;
+        struct sst_hsw_ipc_module_config config;
+        struct sst_module *module;
+        struct sst_module_runtime *runtime;
+        struct device *dev = hsw->dev;
+        struct sst_dsp *dsp = hsw->dsp;
+
+        if (!sst_hsw_is_module_loaded(hsw, module_id)) {
+                dev_dbg(dev, "module %d not loaded\n", module_id);
+                return 0;
+        }
+
+        if (sst_hsw_is_module_active(hsw, module_id)) {
+                dev_info(dev, "module %d already enabled\n", module_id);
+                return 0;
+        }
+
+        module = sst_module_get_from_id(dsp, module_id);
+        if (module == NULL) {
+                dev_err(dev, "module %d not valid\n", module_id);
+                return -ENXIO;
+        }
+
+        runtime = sst_module_runtime_get_from_id(module, module_id);
+        if (runtime == NULL) {
+                dev_err(dev, "runtime %d not valid", module_id);
+                return -ENXIO;
+        }
+
+        header = IPC_GLB_TYPE(IPC_GLB_MODULE_OPERATION) |
+                        IPC_MODULE_OPERATION(IPC_MODULE_ENABLE) |
+                        IPC_MODULE_ID(module_id);
+        dev_dbg(dev, "module enable header: %x\n", header);
+
+        config.map.module_entries_count = 1;
+        config.map.module_entries[0].module_id = module->id;
+        config.map.module_entries[0].entry_point = module->entry;
+
+        config.persistent_mem.offset =
+                sst_dsp_get_offset(dsp,
+                        runtime->persistent_offset, SST_MEM_DRAM);
+        config.persistent_mem.size = module->persistent_size;
+
+        config.scratch_mem.offset =
+                sst_dsp_get_offset(dsp,
+                        dsp->scratch_offset, SST_MEM_DRAM);
+        config.scratch_mem.size = module->scratch_size;
+        dev_dbg(dev, "mod %d enable p:%d @ %x, s:%d @ %x, ep: %x",
+                config.map.module_entries[0].module_id,
+                config.persistent_mem.size,
+                config.persistent_mem.offset,
+                config.scratch_mem.size, config.scratch_mem.offset,
+                config.map.module_entries[0].entry_point);
+
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header,
+                        &config, sizeof(config), NULL, 0);
+        if (ret < 0)
+                dev_err(dev, "ipc: module enable failed - %d\n", ret);
+        else
+                module->state = SST_MODULE_STATE_ACTIVE;
+
+        return ret;
+}
+
+int sst_hsw_module_disable(struct sst_hsw *hsw,
+        u32 module_id, u32 instance_id)
+{
+        int ret;
+        u32 header;
+        struct sst_module *module;
+        struct device *dev = hsw->dev;
+        struct sst_dsp *dsp = hsw->dsp;
+
+        if (!sst_hsw_is_module_loaded(hsw, module_id)) {
+                dev_dbg(dev, "module %d not loaded\n", module_id);
+                return 0;
+        }
+
+        if (!sst_hsw_is_module_active(hsw, module_id)) {
+                dev_info(dev, "module %d already disabled\n", module_id);
+                return 0;
+        }
+
+        module = sst_module_get_from_id(dsp, module_id);
+        if (module == NULL) {
+                dev_err(dev, "module %d not valid\n", module_id);
+                return -ENXIO;
+        }
+
+        header = IPC_GLB_TYPE(IPC_GLB_MODULE_OPERATION) |
+                        IPC_MODULE_OPERATION(IPC_MODULE_DISABLE) |
+                        IPC_MODULE_ID(module_id);
+
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header,  NULL, 0, NULL, 0);
+        if (ret < 0)
+                dev_err(dev, "module disable failed - %d\n", ret);
+        else
+                module->state = SST_MODULE_STATE_INITIALIZED;
+
+        return ret;
+}
+
+int sst_hsw_module_set_param(struct sst_hsw *hsw,
+        u32 module_id, u32 instance_id, u32 parameter_id,
+        u32 param_size, char *param)
+{
+        int ret;
+        unsigned char *data = NULL;
+        u32 header = 0;
+        u32 payload_size = 0, transfer_parameter_size = 0;
+        dma_addr_t dma_addr = 0;
+        struct sst_hsw_transfer_parameter *parameter;
+        struct device *dev = hsw->dev;
+
+        header = IPC_GLB_TYPE(IPC_GLB_MODULE_OPERATION) |
+                        IPC_MODULE_OPERATION(IPC_MODULE_SET_PARAMETER) |
+                        IPC_MODULE_ID(module_id);
+        dev_dbg(dev, "sst_hsw_module_set_param header=%x\n", header);
+
+        payload_size = param_size +
+                sizeof(struct sst_hsw_transfer_parameter) -
+                sizeof(struct sst_hsw_transfer_list);
+        dev_dbg(dev, "parameter size : %d\n", param_size);
+        dev_dbg(dev, "payload size   : %d\n", payload_size);
+
+        if (payload_size <= SST_HSW_IPC_MAX_SHORT_PARAMETER_SIZE) {
+                /* short parameter, mailbox can contain data */
+                dev_dbg(dev, "transfer parameter size : %d\n",
+                        transfer_parameter_size);
+
+                transfer_parameter_size = ALIGN(payload_size, 4);
+                dev_dbg(dev, "transfer parameter aligned size : %d\n",
+                        transfer_parameter_size);
+
+                parameter = kzalloc(transfer_parameter_size, GFP_KERNEL);
+                if (parameter == NULL)
+                        return -ENOMEM;
+
+                memcpy(parameter->data, param, param_size);
+        } else {
+                dev_warn(dev, "transfer parameter size too large!");
+                return 0;
+        }
+
+        parameter->parameter_id = parameter_id;
+        parameter->data_size = param_size;
+
+        ret = sst_ipc_tx_message_wait(&hsw->ipc, header,
+                parameter, transfer_parameter_size , NULL, 0);
+        if (ret < 0)
+                dev_err(dev, "ipc: module set parameter failed - %d\n", ret);
+
+        kfree(parameter);
+
+        if (data)
+                dma_free_coherent(hsw->dsp->dma_dev,
+                        param_size, (void *)data, dma_addr);
+
+        return ret;
 }
 
 static struct sst_dsp_device hsw_dev = {
@@ -1891,10 +2061,48 @@ static struct sst_dsp_device hsw_dev = {
         .ops = &haswell_ops,
 };
 
+static void hsw_tx_msg(struct sst_generic_ipc *ipc, struct ipc_message *msg)
+{
+        /* send the message */
+        sst_dsp_outbox_write(ipc->dsp, msg->tx_data, msg->tx_size);
+        sst_dsp_ipc_msg_tx(ipc->dsp, msg->header);
+}
+
+static void hsw_shim_dbg(struct sst_generic_ipc *ipc, const char *text)
+{
+        struct sst_dsp *sst = ipc->dsp;
+        u32 isr, ipcd, imrx, ipcx;
+
+        ipcx = sst_dsp_shim_read_unlocked(sst, SST_IPCX);
+        isr = sst_dsp_shim_read_unlocked(sst, SST_ISRX);
+        ipcd = sst_dsp_shim_read_unlocked(sst, SST_IPCD);
+        imrx = sst_dsp_shim_read_unlocked(sst, SST_IMRX);
+
+        dev_err(ipc->dev,
+                "ipc: --%s-- ipcx 0x%8.8x isr 0x%8.8x ipcd 0x%8.8x imrx 0x%8.8x\n",
+                text, ipcx, isr, ipcd, imrx);
+}
+
+static void hsw_tx_data_copy(struct ipc_message *msg, char *tx_data,
+        size_t tx_size)
+{
+        memcpy(msg->tx_data, tx_data, tx_size);
+}
+
+static u64 hsw_reply_msg_match(u64 header, u64 *mask)
+{
+        /* clear reply bits & status bits */
+        header &= ~(IPC_STATUS_MASK | IPC_GLB_REPLY_MASK);
+        *mask = (u64)-1;
+
+        return header;
+}
+
 int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
 {
         struct sst_hsw_ipc_fw_version version;
         struct sst_hsw *hsw;
+        struct sst_generic_ipc *ipc;
         int ret;
 
         dev_dbg(dev, "initialising Audio DSP IPC\n");
@@ -1903,39 +2111,30 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
         if (hsw == NULL)
                 return -ENOMEM;
 
-        hsw->dev = dev;
-        INIT_LIST_HEAD(&hsw->stream_list);
-        INIT_LIST_HEAD(&hsw->tx_list);
-        INIT_LIST_HEAD(&hsw->rx_list);
-        INIT_LIST_HEAD(&hsw->empty_list);
-        init_waitqueue_head(&hsw->boot_wait);
-        init_waitqueue_head(&hsw->wait_txq);
-
-        ret = msg_empty_list_init(hsw);
-        if (ret < 0)
-                return -ENOMEM;
+        ipc = &hsw->ipc;
+        ipc->dev = dev;
+        ipc->ops.tx_msg = hsw_tx_msg;
+        ipc->ops.shim_dbg = hsw_shim_dbg;
+        ipc->ops.tx_data_copy = hsw_tx_data_copy;
+        ipc->ops.reply_msg_match = hsw_reply_msg_match;
 
-        /* start the IPC message thread */
-        init_kthread_worker(&hsw->kworker);
-        hsw->tx_thread = kthread_run(kthread_worker_fn,
-                                           &hsw->kworker, "%s",
-                                           dev_name(hsw->dev));
-        if (IS_ERR(hsw->tx_thread)) {
-                ret = PTR_ERR(hsw->tx_thread);
-                dev_err(hsw->dev, "error: failed to create message TX task\n");
-                goto err_free_msg;
-        }
-        init_kthread_work(&hsw->kwork, ipc_tx_msgs);
+        ret = sst_ipc_init(ipc);
+        if (ret != 0)
+                goto ipc_init_err;
 
+        INIT_LIST_HEAD(&hsw->stream_list);
+        init_waitqueue_head(&hsw->boot_wait);
         hsw_dev.thread_context = hsw;
 
         /* init SST shim */
         hsw->dsp = sst_dsp_new(dev, &hsw_dev, pdata);
         if (hsw->dsp == NULL) {
                 ret = -ENODEV;
-                goto dsp_err;
+                goto dsp_new_err;
         }
 
+        ipc->dsp = hsw->dsp;
+
         /* allocate DMA buffer for context storage */
         hsw->dx_context = dma_alloc_coherent(hsw->dsp->dma_dev,
                 SST_HSW_DX_CONTEXT_SIZE, &hsw->dx_context_paddr, GFP_KERNEL);
@@ -1947,18 +2146,22 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
         /* keep the DSP in reset state for base FW loading */
         sst_dsp_reset(hsw->dsp);
 
-        hsw->sst_fw = sst_fw_new(hsw->dsp, pdata->fw, hsw);
-        if (hsw->sst_fw == NULL) {
-                ret = -ENODEV;
-                dev_err(dev, "error: failed to load firmware\n");
+        /* load base module and other modules in base firmware image */
+        ret = sst_hsw_module_load(hsw, SST_HSW_MODULE_BASE_FW, 0, "Base");
+        if (ret < 0)
                 goto fw_err;
-        }
+
+        /* try to load module waves */
+        sst_hsw_module_load(hsw, SST_HSW_MODULE_WAVES, 0, "intel/IntcPP01.bin");
 
         /* allocate scratch mem regions */
         ret = sst_block_alloc_scratch(hsw->dsp);
         if (ret < 0)
                 goto boot_err;
 
+        /* init param buffer */
+        sst_hsw_reset_param_buf(hsw);
+
         /* wait for DSP boot completion */
         sst_dsp_boot(hsw->dsp);
         ret = wait_event_timeout(hsw->boot_wait, hsw->boot_complete,
@@ -1971,6 +2174,9 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
                 goto boot_err;
         }
 
+        /* init module state after boot */
+        sst_hsw_init_module_state(hsw);
+
         /* get the FW version */
         sst_hsw_fw_get_version(hsw, &version);
 
@@ -1986,17 +2192,16 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
 
 boot_err:
         sst_dsp_reset(hsw->dsp);
-        sst_fw_free(hsw->sst_fw);
+        sst_fw_free_all(hsw->dsp);
 fw_err:
         dma_free_coherent(hsw->dsp->dma_dev, SST_HSW_DX_CONTEXT_SIZE,
                         hsw->dx_context, hsw->dx_context_paddr);
 dma_err:
         sst_dsp_free(hsw->dsp);
-dsp_err:
-        kthread_stop(hsw->tx_thread);
-err_free_msg:
-        kfree(hsw->msg);
-
+dsp_new_err:
+        sst_ipc_fini(ipc);
+ipc_init_err:
+        kfree(hsw);
         return ret;
 }
 EXPORT_SYMBOL_GPL(sst_hsw_dsp_init);
@@ -2010,7 +2215,6 @@ void sst_hsw_dsp_free(struct device *dev, struct sst_pdata *pdata)
         dma_free_coherent(hsw->dsp->dma_dev, SST_HSW_DX_CONTEXT_SIZE,
                         hsw->dx_context, hsw->dx_context_paddr);
         sst_dsp_free(hsw->dsp);
-        kthread_stop(hsw->tx_thread);
-        kfree(hsw->msg);
+        sst_ipc_fini(&hsw->ipc);
 }
 EXPORT_SYMBOL_GPL(sst_hsw_dsp_free);
diff --git a/sound/soc/intel/sst-haswell-ipc.h b/sound/soc/intel/haswell/sst-haswell-ipc.h
index 858096041cb1..06d71aefa1fe 100644
--- a/sound/soc/intel/sst-haswell-ipc.h
+++ b/sound/soc/intel/haswell/sst-haswell-ipc.h
@@ -37,6 +37,9 @@
 #define SST_HSW_IPC_MAX_PAYLOAD_SIZE    400
 #define SST_HSW_MAX_INFO_SIZE           64
 #define SST_HSW_BUILD_HASH_LENGTH       40
+#define SST_HSW_IPC_MAX_SHORT_PARAMETER_SIZE    500
+#define WAVES_PARAM_COUNT               128
+#define WAVES_PARAM_LINES               160
 
 struct sst_hsw;
 struct sst_hsw_stream;
@@ -187,6 +190,28 @@ enum sst_hsw_performance_action {
         SST_HSW_PERF_STOP = 1,
 };
 
+struct sst_hsw_transfer_info {
+        uint32_t destination;       /* destination address */
+        uint32_t reverse:1;         /* if 1 data flows from destination */
+        uint32_t size:31;           /* transfer size in bytes.*/
+        uint16_t first_page_offset; /* offset to data in the first page. */
+        uint8_t  packed_pages;   /* page addresses. Each occupies 20 bits */
+} __attribute__((packed));
+
+struct sst_hsw_transfer_list {
+        uint32_t transfers_count;
+        struct sst_hsw_transfer_info transfers;
+} __attribute__((packed));
+
+struct sst_hsw_transfer_parameter {
+        uint32_t parameter_id;
+        uint32_t data_size;
+        union {
+                uint8_t data[1];
+                struct sst_hsw_transfer_list transfer_list;
+        };
+} __attribute__((packed));
+
 /* SST firmware module info */
 struct sst_hsw_module_info {
         u8 name[SST_HSW_MAX_INFO_SIZE];
@@ -215,6 +240,12 @@ struct sst_hsw_fx_enable {
         struct sst_hsw_memory_info persistent_mem;
 } __attribute__((packed));
 
+struct sst_hsw_ipc_module_config {
+        struct sst_hsw_module_map map;
+        struct sst_hsw_memory_info persistent_mem;
+        struct sst_hsw_memory_info scratch_mem;
+} __attribute__((packed));
+
 struct sst_hsw_get_fx_param {
         u32 parameter_id;
         u32 param_size;
@@ -467,6 +498,28 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata);
 void sst_hsw_dsp_free(struct device *dev, struct sst_pdata *pdata);
 struct sst_dsp *sst_hsw_get_dsp(struct sst_hsw *hsw);
 
+/* fw module function */
+void sst_hsw_init_module_state(struct sst_hsw *hsw);
+bool sst_hsw_is_module_loaded(struct sst_hsw *hsw, u32 module_id);
+bool sst_hsw_is_module_active(struct sst_hsw *hsw, u32 module_id);
+void sst_hsw_set_module_enabled_rtd3(struct sst_hsw *hsw, u32 module_id);
+void sst_hsw_set_module_disabled_rtd3(struct sst_hsw *hsw, u32 module_id);
+bool sst_hsw_is_module_enabled_rtd3(struct sst_hsw *hsw, u32 module_id);
+void sst_hsw_reset_param_buf(struct sst_hsw *hsw);
+int sst_hsw_store_param_line(struct sst_hsw *hsw, u8 *buf);
+int sst_hsw_load_param_line(struct sst_hsw *hsw, u8 *buf);
+int sst_hsw_launch_param_buf(struct sst_hsw *hsw);
+
+int sst_hsw_module_load(struct sst_hsw *hsw,
+        u32 module_id, u32 instance_id, char *name);
+int sst_hsw_module_enable(struct sst_hsw *hsw,
+        u32 module_id, u32 instance_id);
+int sst_hsw_module_disable(struct sst_hsw *hsw,
+        u32 module_id, u32 instance_id);
+int sst_hsw_module_set_param(struct sst_hsw *hsw,
+        u32 module_id, u32 instance_id, u32 parameter_id,
+        u32 param_size, char *param);
+
 /* runtime module management */
 struct sst_module_runtime *sst_hsw_runtime_module_create(struct sst_hsw *hsw,
         int mod_id, int offset);
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c
index 7e21e8f85885..23ae0400d6db 100644
--- a/sound/soc/intel/sst-haswell-pcm.c
+++ b/sound/soc/intel/haswell/sst-haswell-pcm.c
@@ -29,9 +29,9 @@
 #include <sound/tlv.h>
 #include <sound/compress_driver.h>
 
-#include "sst-haswell-ipc.h"
-#include "sst-dsp-priv.h"
-#include "sst-dsp.h"
+#include "../haswell/sst-haswell-ipc.h"
+#include "../common/sst-dsp-priv.h"
+#include "../common/sst-dsp.h"
 
 #define HSW_PCM_COUNT           6
 #define HSW_VOLUME_MAX          0x7FFFFFFF      /* 0dB */
@@ -137,6 +137,7 @@ struct hsw_priv_data {
         struct device *dev;
         enum hsw_pm_state pm_state;
         struct snd_soc_card *soc_card;
+        struct sst_module_runtime *runtime_waves; /* sound effect module */
 
         /* page tables */
         struct snd_dma_buffer dmab[HSW_PCM_COUNT][2];
@@ -318,6 +319,93 @@ static int hsw_volume_get(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
+static int hsw_waves_switch_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_platform *platform = snd_soc_kcontrol_platform(kcontrol);
+        struct hsw_priv_data *pdata = snd_soc_platform_get_drvdata(platform);
+        struct sst_hsw *hsw = pdata->hsw;
+        enum sst_hsw_module_id id = SST_HSW_MODULE_WAVES;
+
+        ucontrol->value.integer.value[0] =
+                (sst_hsw_is_module_active(hsw, id) ||
+                sst_hsw_is_module_enabled_rtd3(hsw, id));
+        return 0;
+}
+
+static int hsw_waves_switch_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_platform *platform = snd_soc_kcontrol_platform(kcontrol);
+        struct hsw_priv_data *pdata = snd_soc_platform_get_drvdata(platform);
+        struct sst_hsw *hsw = pdata->hsw;
+        int ret = 0;
+        enum sst_hsw_module_id id = SST_HSW_MODULE_WAVES;
+        bool switch_on = (bool)ucontrol->value.integer.value[0];
+
+        /* if module is in RAM on the DSP, apply user settings to module through
+         * ipc. If module is not in RAM on the DSP, store user setting for
+         * track */
+        if (sst_hsw_is_module_loaded(hsw, id)) {
+                if (switch_on == sst_hsw_is_module_active(hsw, id))
+                        return 0;
+
+                if (switch_on)
+                        ret = sst_hsw_module_enable(hsw, id, 0);
+                else
+                        ret = sst_hsw_module_disable(hsw, id, 0);
+        } else {
+                if (switch_on == sst_hsw_is_module_enabled_rtd3(hsw, id))
+                        return 0;
+
+                if (switch_on)
+                        sst_hsw_set_module_enabled_rtd3(hsw, id);
+                else
+                        sst_hsw_set_module_disabled_rtd3(hsw, id);
+        }
+
+        return ret;
+}
+
+static int hsw_waves_param_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_platform *platform = snd_soc_kcontrol_platform(kcontrol);
+        struct hsw_priv_data *pdata = snd_soc_platform_get_drvdata(platform);
+        struct sst_hsw *hsw = pdata->hsw;
+
+        /* return a matching line from param buffer */
+        return sst_hsw_load_param_line(hsw, ucontrol->value.bytes.data);
+}
+
+static int hsw_waves_param_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_platform *platform = snd_soc_kcontrol_platform(kcontrol);
+        struct hsw_priv_data *pdata = snd_soc_platform_get_drvdata(platform);
+        struct sst_hsw *hsw = pdata->hsw;
+        int ret;
+        enum sst_hsw_module_id id = SST_HSW_MODULE_WAVES;
+        int param_id = ucontrol->value.bytes.data[0];
+        int param_size = WAVES_PARAM_COUNT;
+
+        /* clear param buffer and reset buffer index */
+        if (param_id == 0xFF) {
+                sst_hsw_reset_param_buf(hsw);
+                return 0;
+        }
+
+        /* store params into buffer */
+        ret = sst_hsw_store_param_line(hsw, ucontrol->value.bytes.data);
+        if (ret < 0)
+                return ret;
+
+        if (sst_hsw_is_module_active(hsw, id))
+                ret = sst_hsw_module_set_param(hsw, id, 0, param_id,
+                                param_size, ucontrol->value.bytes.data);
+        return ret;
+}
+
 /* TLV used by both global and stream volumes */
 static const DECLARE_TLV_DB_SCALE(hsw_vol_tlv, -9000, 300, 1);
 
@@ -339,6 +427,12 @@ static const struct snd_kcontrol_new hsw_volume_controls[] = {
         SOC_DOUBLE_EXT_TLV("Mic Capture Volume", 4, 0, 8,
                 ARRAY_SIZE(volume_map) - 1, 0,
                 hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv),
+        /* enable/disable module waves */
+        SOC_SINGLE_BOOL_EXT("Waves Switch", 0,
+                hsw_waves_switch_get, hsw_waves_switch_put),
+        /* set parameters to module waves */
+        SND_SOC_BYTES_EXT("Waves Set Param", WAVES_PARAM_COUNT,
+                hsw_waves_param_get, hsw_waves_param_put),
 };
 
 /* Create DMA buffer page table for DSP */
@@ -807,6 +901,14 @@ static int hsw_pcm_create_modules(struct hsw_priv_data *pdata)
                         pcm_data->runtime->persistent_offset;
         }
 
+        /* create runtime blocks for module waves */
+        if (sst_hsw_is_module_loaded(hsw, SST_HSW_MODULE_WAVES)) {
+                pdata->runtime_waves = sst_hsw_runtime_module_create(hsw,
+                        SST_HSW_MODULE_WAVES, 0);
+                if (pdata->runtime_waves == NULL)
+                        goto err;
+        }
+
         return 0;
 
 err:
@@ -820,14 +922,17 @@ err:
 
 static void hsw_pcm_free_modules(struct hsw_priv_data *pdata)
 {
+        struct sst_hsw *hsw = pdata->hsw;
         struct hsw_pcm_data *pcm_data;
         int i;
 
         for (i = 0; i < ARRAY_SIZE(mod_map); i++) {
                 pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];
-
                 sst_hsw_runtime_module_free(pcm_data->runtime);
         }
+        if (sst_hsw_is_module_loaded(hsw, SST_HSW_MODULE_WAVES)) {
+                sst_hsw_runtime_module_free(pdata->runtime_waves);
+        }
 }
 
 static int hsw_pcm_new(struct snd_soc_pcm_runtime *rtd)
@@ -984,7 +1089,9 @@ static int hsw_pcm_probe(struct snd_soc_platform *platform)
         }
 
         /* allocate runtime modules */
-        hsw_pcm_create_modules(priv_data);
+        ret = hsw_pcm_create_modules(priv_data);
+        if (ret < 0)
+                goto err;
 
         /* enable runtime PM with auto suspend */
         pm_runtime_set_autosuspend_delay(platform->dev,
@@ -996,7 +1103,7 @@ static int hsw_pcm_probe(struct snd_soc_platform *platform)
         return 0;
 
 err:
-        for (;i >= 0; i--) {
+        for (--i; i >= 0; i--) {
                 if (hsw_dais[i].playback.channels_min)
                         snd_dma_free_pages(&priv_data->dmab[i][0]);
                 if (hsw_dais[i].capture.channels_min)
@@ -1101,10 +1208,18 @@ static int hsw_pcm_runtime_suspend(struct device *dev)
 {
         struct hsw_priv_data *pdata = dev_get_drvdata(dev);
         struct sst_hsw *hsw = pdata->hsw;
+        int ret;
 
         if (pdata->pm_state >= HSW_PM_STATE_RTD3)
                 return 0;
 
+        /* fw modules will be unloaded on RTD3, set flag to track */
+        if (sst_hsw_is_module_active(hsw, SST_HSW_MODULE_WAVES)) {
+                ret = sst_hsw_module_disable(hsw, SST_HSW_MODULE_WAVES, 0);
+                if (ret < 0)
+                        return ret;
+                sst_hsw_set_module_enabled_rtd3(hsw, SST_HSW_MODULE_WAVES);
+        }
         sst_hsw_dsp_runtime_suspend(hsw);
         sst_hsw_dsp_runtime_sleep(hsw);
         pdata->pm_state = HSW_PM_STATE_RTD3;
@@ -1139,6 +1254,19 @@ static int hsw_pcm_runtime_resume(struct device *dev)
         else if (ret == 1) /* no action required */
                 return 0;
 
+        /* check flag when resume */
+        if (sst_hsw_is_module_enabled_rtd3(hsw, SST_HSW_MODULE_WAVES)) {
+                ret = sst_hsw_module_enable(hsw, SST_HSW_MODULE_WAVES, 0);
+                if (ret < 0)
+                        return ret;
+                /* put parameters from buffer to dsp */
+                ret = sst_hsw_launch_param_buf(hsw);
+                if (ret < 0)
+                        return ret;
+                /* unset flag */
+                sst_hsw_set_module_disabled_rtd3(hsw, SST_HSW_MODULE_WAVES);
+        }
+
         pdata->pm_state = HSW_PM_STATE_D0;
         return ret;
 }
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 07f77815a586..b05fb1c1a848 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -58,6 +58,12 @@
 
 #define JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 12
 #define JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 8
+#define JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 24
+#define JZ4780_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 16
+#define JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_MASK \
+                        (0xf << JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET)
+#define JZ4780_AIC_CONF_FIFO_TX_THRESHOLD_MASK \
+                        (0x1f <<  JZ4780_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET)
 
 #define JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_MASK (0x7 << 19)
 #define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK (0x7 << 16)
@@ -79,6 +85,7 @@
 #define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_OFFSET  16
 
 #define JZ_AIC_I2S_FMT_DISABLE_BIT_CLK BIT(12)
+#define JZ_AIC_I2S_FMT_DISABLE_BIT_ICLK BIT(13)
 #define JZ_AIC_I2S_FMT_ENABLE_SYS_CLK BIT(4)
 #define JZ_AIC_I2S_FMT_MSB BIT(0)
 
@@ -87,6 +94,13 @@
 #define JZ_AIC_CLK_DIV_MASK 0xf
 #define I2SDIV_DV_SHIFT 8
 #define I2SDIV_DV_MASK (0xf << I2SDIV_DV_SHIFT)
+#define I2SDIV_IDV_SHIFT 8
+#define I2SDIV_IDV_MASK (0xf << I2SDIV_IDV_SHIFT)
+
+enum jz47xx_i2s_version {
+        JZ_I2S_JZ4740,
+        JZ_I2S_JZ4780,
+};
 
 struct jz4740_i2s {
         struct resource *mem;
@@ -98,6 +112,8 @@ struct jz4740_i2s {
 
         struct snd_dmaengine_dai_dma_data playback_dma_data;
         struct snd_dmaengine_dai_dma_data capture_dma_data;
+
+        enum jz47xx_i2s_version version;
 };
 
 static inline uint32_t jz4740_i2s_read(const struct jz4740_i2s *i2s,
@@ -267,13 +283,22 @@ static int jz4740_i2s_hw_params(struct snd_pcm_substream *substream,
                         ctrl |= JZ_AIC_CTRL_MONO_TO_STEREO;
                 else
                         ctrl &= ~JZ_AIC_CTRL_MONO_TO_STEREO;
+
+                div_reg &= ~I2SDIV_DV_MASK;
+                div_reg |= (div - 1) << I2SDIV_DV_SHIFT;
         } else {
                 ctrl &= ~JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK;
                 ctrl |= sample_size << JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_OFFSET;
+
+                if (i2s->version >= JZ_I2S_JZ4780) {
+                        div_reg &= ~I2SDIV_IDV_MASK;
+                        div_reg |= (div - 1) << I2SDIV_IDV_SHIFT;
+                } else {
+                        div_reg &= ~I2SDIV_DV_MASK;
+                        div_reg |= (div - 1) << I2SDIV_DV_SHIFT;
+                }
         }
 
-        div_reg &= ~I2SDIV_DV_MASK;
-        div_reg |= (div - 1) << I2SDIV_DV_SHIFT;
         jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL, ctrl);
         jz4740_i2s_write(i2s, JZ_REG_AIC_CLK_DIV, div_reg);
 
@@ -369,11 +394,19 @@ static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai)
         snd_soc_dai_init_dma_data(dai, &i2s->playback_dma_data,
                 &i2s->capture_dma_data);
 
-        conf = (7 << JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) |
-                (8 << JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) |
-                JZ_AIC_CONF_OVERFLOW_PLAY_LAST |
-                JZ_AIC_CONF_I2S |
-                JZ_AIC_CONF_INTERNAL_CODEC;
+        if (i2s->version >= JZ_I2S_JZ4780) {
+                conf = (7 << JZ4780_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) |
+                        (8 << JZ4780_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) |
+                        JZ_AIC_CONF_OVERFLOW_PLAY_LAST |
+                        JZ_AIC_CONF_I2S |
+                        JZ_AIC_CONF_INTERNAL_CODEC;
+        } else {
+                conf = (7 << JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) |
+                        (8 << JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) |
+                        JZ_AIC_CONF_OVERFLOW_PLAY_LAST |
+                        JZ_AIC_CONF_I2S |
+                        JZ_AIC_CONF_INTERNAL_CODEC;
+        }
 
         jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, JZ_AIC_CONF_RESET);
         jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);
@@ -422,13 +455,34 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = {
         .resume = jz4740_i2s_resume,
 };
 
+static struct snd_soc_dai_driver jz4780_i2s_dai = {
+        .probe = jz4740_i2s_dai_probe,
+        .remove = jz4740_i2s_dai_remove,
+        .playback = {
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_8000_48000,
+                .formats = JZ4740_I2S_FMTS,
+        },
+        .capture = {
+                .channels_min = 2,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_8000_48000,
+                .formats = JZ4740_I2S_FMTS,
+        },
+        .ops = &jz4740_i2s_dai_ops,
+        .suspend = jz4740_i2s_suspend,
+        .resume = jz4740_i2s_resume,
+};
+
 static const struct snd_soc_component_driver jz4740_i2s_component = {
         .name           = "jz4740-i2s",
 };
 
 #ifdef CONFIG_OF
 static const struct of_device_id jz4740_of_matches[] = {
-        { .compatible = "ingenic,jz4740-i2s" },
+        { .compatible = "ingenic,jz4740-i2s", .data = (void *)JZ_I2S_JZ4740 },
+        { .compatible = "ingenic,jz4780-i2s", .data = (void *)JZ_I2S_JZ4780 },
         { /* sentinel */ }
 };
 #endif
@@ -438,11 +492,16 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev)
         struct jz4740_i2s *i2s;
         struct resource *mem;
         int ret;
+        const struct of_device_id *match;
 
         i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
         if (!i2s)
                 return -ENOMEM;
 
+        match = of_match_device(jz4740_of_matches, &pdev->dev);
+        if (match)
+                i2s->version = (enum jz47xx_i2s_version)match->data;
+
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         i2s->base = devm_ioremap_resource(&pdev->dev, mem);
         if (IS_ERR(i2s->base))
@@ -460,8 +519,13 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, i2s);
 
-        ret = devm_snd_soc_register_component(&pdev->dev,
-                &jz4740_i2s_component, &jz4740_i2s_dai, 1);
+        if (i2s->version == JZ_I2S_JZ4780)
+                ret = devm_snd_soc_register_component(&pdev->dev,
+                        &jz4740_i2s_component, &jz4780_i2s_dai, 1);
+        else
+                ret = devm_snd_soc_register_component(&pdev->dev,
+                        &jz4740_i2s_component, &jz4740_i2s_dai, 1);
+
         if (ret)
                 return ret;
 
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index d19483081f9b..3a36d60e1785 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -643,7 +643,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_OF
-static struct of_device_id mvebu_audio_of_match[] = {
+static const struct of_device_id mvebu_audio_of_match[] = {
         { .compatible = "marvell,kirkwood-audio" },
         { .compatible = "marvell,dove-audio" },
         { .compatible = "marvell,armada370-audio" },
diff --git a/sound/soc/nuc900/nuc900-audio.h b/sound/soc/nuc900/nuc900-audio.h
index 59f7e8ed1a68..d0b725705914 100644
--- a/sound/soc/nuc900/nuc900-audio.h
+++ b/sound/soc/nuc900/nuc900-audio.h
@@ -100,10 +100,7 @@
 struct nuc900_audio {
         void __iomem *mmio;
         spinlock_t lock;
-        dma_addr_t dma_addr[2];
-        unsigned long buffersize[2];
         unsigned long irq_num;
-        struct snd_pcm_substream *substream;
         struct resource *res;
         struct clk *clk;
         struct device *dev;
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c
index b809fa909e4d..5ae5ca15b6d6 100644
--- a/sound/soc/nuc900/nuc900-pcm.c
+++ b/sound/soc/nuc900/nuc900-pcm.c
@@ -42,29 +42,10 @@ static const struct snd_pcm_hardware nuc900_pcm_hardware = {
 static int nuc900_dma_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct nuc900_audio *nuc900_audio = runtime->private_data;
-        unsigned long flags;
-        int ret = 0;
-
-        ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
-        if (ret < 0)
-                return ret;
-
-        spin_lock_irqsave(&nuc900_audio->lock, flags);
-
-        nuc900_audio->substream = substream;
-        nuc900_audio->dma_addr[substream->stream] = runtime->dma_addr;
-        nuc900_audio->buffersize[substream->stream] =
-                                                params_buffer_bytes(params);
-
-        spin_unlock_irqrestore(&nuc900_audio->lock, flags);
-
-        return ret;
+        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
 }
 
-static void nuc900_update_dma_register(struct snd_pcm_substream *substream,
-                                dma_addr_t dma_addr, size_t count)
+static void nuc900_update_dma_register(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct nuc900_audio *nuc900_audio = runtime->private_data;
@@ -78,8 +59,8 @@ static void nuc900_update_dma_register(struct snd_pcm_substream *substream,
                 mmio_len = nuc900_audio->mmio + ACTL_RDST_LENGTH;
         }
 
-        AUDIO_WRITE(mmio_addr, dma_addr);
-        AUDIO_WRITE(mmio_len, count);
+        AUDIO_WRITE(mmio_addr, runtime->dma_addr);
+        AUDIO_WRITE(mmio_len, runtime->dma_bytes);
 }
 
 static void nuc900_dma_start(struct snd_pcm_substream *substream)
@@ -170,9 +151,7 @@ static int nuc900_dma_prepare(struct snd_pcm_substream *substream)
 
         spin_lock_irqsave(&nuc900_audio->lock, flags);
 
-        nuc900_update_dma_register(substream,
-                                nuc900_audio->dma_addr[substream->stream],
-                                nuc900_audio->buffersize[substream->stream]);
+        nuc900_update_dma_register(substream);
 
         val = AUDIO_READ(nuc900_audio->mmio + ACTL_RESET);
 
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index e7c78b0406b5..6768e4f7d7d0 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -105,7 +105,7 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040
         select SND_OMAP_SOC_MCPDM
         select SND_SOC_TWL6040
         select SND_SOC_DMIC
-        select COMMON_CLK_PALMAS if SOC_OMAP5
+        select COMMON_CLK_PALMAS if MFD_PALMAS
         help
           Say Y if you want to add support for SoC audio on OMAP boards using
           ABE and twl6040 codec. This driver currently supports:
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index 5d7f9cebe041..dcb5336b5698 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -98,12 +98,11 @@ static int n810_startup(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec = rtd->codec;
 
         snd_pcm_hw_constraint_minmax(runtime,
                                      SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2);
 
-        n810_ext_control(&codec->dapm);
+        n810_ext_control(&rtd->card->dapm);
         return clk_prepare_enable(sys_clkout2);
 }
 
@@ -255,24 +254,6 @@ static const struct snd_kcontrol_new aic33_n810_controls[] = {
                      n810_get_input, n810_set_input),
 };
 
-static int n810_aic33_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        /* Not connected */
-        snd_soc_dapm_nc_pin(dapm, "MONO_LOUT");
-        snd_soc_dapm_nc_pin(dapm, "HPLCOM");
-        snd_soc_dapm_nc_pin(dapm, "HPRCOM");
-        snd_soc_dapm_nc_pin(dapm, "MIC3L");
-        snd_soc_dapm_nc_pin(dapm, "MIC3R");
-        snd_soc_dapm_nc_pin(dapm, "LINE1R");
-        snd_soc_dapm_nc_pin(dapm, "LINE2L");
-        snd_soc_dapm_nc_pin(dapm, "LINE2R");
-
-        return 0;
-}
-
 /* Digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link n810_dai = {
         .name = "TLV320AIC33",
@@ -283,7 +264,6 @@ static struct snd_soc_dai_link n810_dai = {
         .codec_dai_name = "tlv320aic3x-hifi",
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                    SND_SOC_DAIFMT_CBM_CFM,
-        .init = n810_aic33_init,
         .ops = &n810_ops,
 };
 
@@ -300,6 +280,7 @@ static struct snd_soc_card snd_soc_n810 = {
         .num_dapm_widgets = ARRAY_SIZE(aic33_dapm_widgets),
         .dapm_routes = audio_map,
         .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed = true,
 };
 
 static struct platform_device *n810_snd_device;
diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c
index f7eb42aa3f38..4775da4c4db5 100644
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/omap/omap-hdmi-audio.c
@@ -142,8 +142,6 @@ static int hdmi_dai_hw_params(struct snd_pcm_substream *substream,
 
         iec->status[0] |= IEC958_AES0_CON_EMPHASIS_NONE;
 
-        iec->status[0] |= IEC958_AES1_PRO_MODE_NOTID;
-
         iec->status[1] = IEC958_AES1_CON_GENERAL;
 
         iec->status[2] |= IEC958_AES2_CON_SOURCE_UNSPEC;
diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
new file mode 100644
index 000000000000..5f58e4f1bca9
--- /dev/null
+++ b/sound/soc/qcom/Kconfig
@@ -0,0 +1,25 @@
+config SND_SOC_QCOM
+        tristate "ASoC support for QCOM platforms"
+        help
+          Say Y or M if you want to add support to use audio devices
+          in Qualcomm Technologies SOC-based platforms.
+
+config SND_SOC_LPASS_CPU
+        tristate
+        depends on SND_SOC_QCOM
+        select REGMAP_MMIO
+
+config SND_SOC_LPASS_PLATFORM
+        tristate
+        depends on SND_SOC_QCOM
+        select REGMAP_MMIO
+
+config SND_SOC_STORM
+        tristate "ASoC I2S support for Storm boards"
+        depends on (ARCH_QCOM && SND_SOC_QCOM) || COMPILE_TEST
+        select SND_SOC_LPASS_CPU
+        select SND_SOC_LPASS_PLATFORM
+        select SND_SOC_MAX98357A
+        help
+          Say Y or M if you want add support for SoC audio on the
+          Qualcomm Technologies IPQ806X-based Storm board.
diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile
new file mode 100644
index 000000000000..c5ce96c761c4
--- /dev/null
+++ b/sound/soc/qcom/Makefile
@@ -0,0 +1,11 @@
+# Platform
+snd-soc-lpass-cpu-objs := lpass-cpu.o
+snd-soc-lpass-platform-objs := lpass-platform.o
+
+obj-$(CONFIG_SND_SOC_LPASS_CPU) += snd-soc-lpass-cpu.o
+obj-$(CONFIG_SND_SOC_LPASS_PLATFORM) += snd-soc-lpass-platform.o
+
+# Machine
+snd-soc-storm-objs := storm.o
+
+obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o
diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
new file mode 100644
index 000000000000..6698d058de29
--- /dev/null
+++ b/sound/soc/qcom/lpass-cpu.c
@@ -0,0 +1,491 @@
+/*
+ * Copyright (c) 2010-2011,2013-2015 The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * lpass-cpu.c -- ALSA SoC CPU DAI driver for QTi LPASS
+ */
+
+#include <linux/clk.h>
+#include <linux/compiler.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <linux/regmap.h>
+#include <sound/soc.h>
+#include <sound/soc-dai.h>
+#include "lpass-lpaif-ipq806x.h"
+#include "lpass.h"
+
+static int lpass_cpu_daiops_set_sysclk(struct snd_soc_dai *dai, int clk_id,
+                unsigned int freq, int dir)
+{
+        struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
+        int ret;
+
+        ret = clk_set_rate(drvdata->mi2s_osr_clk, freq);
+        if (ret)
+                dev_err(dai->dev, "%s() error setting mi2s osrclk to %u: %d\n",
+                                __func__, freq, ret);
+
+        return ret;
+}
+
+static int lpass_cpu_daiops_startup(struct snd_pcm_substream *substream,
+                struct snd_soc_dai *dai)
+{
+        struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
+        int ret;
+
+        ret = clk_prepare_enable(drvdata->mi2s_osr_clk);
+        if (ret) {
+                dev_err(dai->dev, "%s() error in enabling mi2s osr clk: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        ret = clk_prepare_enable(drvdata->mi2s_bit_clk);
+        if (ret) {
+                dev_err(dai->dev, "%s() error in enabling mi2s bit clk: %d\n",
+                                __func__, ret);
+                clk_disable_unprepare(drvdata->mi2s_osr_clk);
+                return ret;
+        }
+
+        return 0;
+}
+
+static void lpass_cpu_daiops_shutdown(struct snd_pcm_substream *substream,
+                struct snd_soc_dai *dai)
+{
+        struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
+
+        clk_disable_unprepare(drvdata->mi2s_bit_clk);
+        clk_disable_unprepare(drvdata->mi2s_osr_clk);
+}
+
+static int lpass_cpu_daiops_hw_params(struct snd_pcm_substream *substream,
+                struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
+{
+        struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
+        snd_pcm_format_t format = params_format(params);
+        unsigned int channels = params_channels(params);
+        unsigned int rate = params_rate(params);
+        unsigned int regval;
+        int bitwidth, ret;
+
+        bitwidth = snd_pcm_format_width(format);
+        if (bitwidth < 0) {
+                dev_err(dai->dev, "%s() invalid bit width given: %d\n",
+                                __func__, bitwidth);
+                return bitwidth;
+        }
+
+        regval = LPAIF_I2SCTL_LOOPBACK_DISABLE |
+                        LPAIF_I2SCTL_WSSRC_INTERNAL;
+
+        switch (bitwidth) {
+        case 16:
+                regval |= LPAIF_I2SCTL_BITWIDTH_16;
+                break;
+        case 24:
+                regval |= LPAIF_I2SCTL_BITWIDTH_24;
+                break;
+        case 32:
+                regval |= LPAIF_I2SCTL_BITWIDTH_32;
+                break;
+        default:
+                dev_err(dai->dev, "%s() invalid bitwidth given: %d\n",
+                                __func__, bitwidth);
+                return -EINVAL;
+        }
+
+        switch (channels) {
+        case 1:
+                regval |= LPAIF_I2SCTL_SPKMODE_SD0;
+                regval |= LPAIF_I2SCTL_SPKMONO_MONO;
+                break;
+        case 2:
+                regval |= LPAIF_I2SCTL_SPKMODE_SD0;
+                regval |= LPAIF_I2SCTL_SPKMONO_STEREO;
+                break;
+        case 4:
+                regval |= LPAIF_I2SCTL_SPKMODE_QUAD01;
+                regval |= LPAIF_I2SCTL_SPKMONO_STEREO;
+                break;
+        case 6:
+                regval |= LPAIF_I2SCTL_SPKMODE_6CH;
+                regval |= LPAIF_I2SCTL_SPKMONO_STEREO;
+                break;
+        case 8:
+                regval |= LPAIF_I2SCTL_SPKMODE_8CH;
+                regval |= LPAIF_I2SCTL_SPKMONO_STEREO;
+                break;
+        default:
+                dev_err(dai->dev, "%s() invalid channels given: %u\n",
+                                __func__, channels);
+                return -EINVAL;
+        }
+
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_I2SCTL_REG(LPAIF_I2S_PORT_MI2S), regval);
+        if (ret) {
+                dev_err(dai->dev, "%s() error writing to i2sctl reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        ret = clk_set_rate(drvdata->mi2s_bit_clk, rate * bitwidth * 2);
+        if (ret) {
+                dev_err(dai->dev, "%s() error setting mi2s bitclk to %u: %d\n",
+                                __func__, rate * bitwidth * 2, ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int lpass_cpu_daiops_hw_free(struct snd_pcm_substream *substream,
+                struct snd_soc_dai *dai)
+{
+        struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
+        int ret;
+
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_I2SCTL_REG(LPAIF_I2S_PORT_MI2S), 0);
+        if (ret)
+                dev_err(dai->dev, "%s() error writing to i2sctl reg: %d\n",
+                                __func__, ret);
+
+        return ret;
+}
+
+static int lpass_cpu_daiops_prepare(struct snd_pcm_substream *substream,
+                struct snd_soc_dai *dai)
+{
+        struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
+        int ret;
+
+        ret = regmap_update_bits(drvdata->lpaif_map,
+                        LPAIF_I2SCTL_REG(LPAIF_I2S_PORT_MI2S),
+                        LPAIF_I2SCTL_SPKEN_MASK, LPAIF_I2SCTL_SPKEN_ENABLE);
+        if (ret)
+                dev_err(dai->dev, "%s() error writing to i2sctl reg: %d\n",
+                                __func__, ret);
+
+        return ret;
+}
+
+static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream,
+                int cmd, struct snd_soc_dai *dai)
+{
+        struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
+        int ret;
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                ret = regmap_update_bits(drvdata->lpaif_map,
+                                LPAIF_I2SCTL_REG(LPAIF_I2S_PORT_MI2S),
+                                LPAIF_I2SCTL_SPKEN_MASK,
+                                LPAIF_I2SCTL_SPKEN_ENABLE);
+                if (ret)
+                        dev_err(dai->dev, "%s() error writing to i2sctl reg: %d\n",
+                                        __func__, ret);
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                ret = regmap_update_bits(drvdata->lpaif_map,
+                                LPAIF_I2SCTL_REG(LPAIF_I2S_PORT_MI2S),
+                                LPAIF_I2SCTL_SPKEN_MASK,
+                                LPAIF_I2SCTL_SPKEN_DISABLE);
+                if (ret)
+                        dev_err(dai->dev, "%s() error writing to i2sctl reg: %d\n",
+                                        __func__, ret);
+                break;
+        }
+
+        return ret;
+}
+
+static struct snd_soc_dai_ops lpass_cpu_dai_ops = {
+        .set_sysclk     = lpass_cpu_daiops_set_sysclk,
+        .startup        = lpass_cpu_daiops_startup,
+        .shutdown       = lpass_cpu_daiops_shutdown,
+        .hw_params      = lpass_cpu_daiops_hw_params,
+        .hw_free        = lpass_cpu_daiops_hw_free,
+        .prepare        = lpass_cpu_daiops_prepare,
+        .trigger        = lpass_cpu_daiops_trigger,
+};
+
+static int lpass_cpu_dai_probe(struct snd_soc_dai *dai)
+{
+        struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
+        int ret;
+
+        /* ensure audio hardware is disabled */
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_I2SCTL_REG(LPAIF_I2S_PORT_MI2S), 0);
+        if (ret)
+                dev_err(dai->dev, "%s() error writing to i2sctl reg: %d\n",
+                                __func__, ret);
+
+        return ret;
+}
+
+static struct snd_soc_dai_driver lpass_cpu_dai_driver = {
+        .playback = {
+                .stream_name    = "lpass-cpu-playback",
+                .formats        = SNDRV_PCM_FMTBIT_S16 |
+                                        SNDRV_PCM_FMTBIT_S24 |
+                                        SNDRV_PCM_FMTBIT_S32,
+                .rates          = SNDRV_PCM_RATE_8000 |
+                                        SNDRV_PCM_RATE_16000 |
+                                        SNDRV_PCM_RATE_32000 |
+                                        SNDRV_PCM_RATE_48000 |
+                                        SNDRV_PCM_RATE_96000,
+                .rate_min       = 8000,
+                .rate_max       = 96000,
+                .channels_min   = 1,
+                .channels_max   = 8,
+        },
+        .probe  = &lpass_cpu_dai_probe,
+        .ops    = &lpass_cpu_dai_ops,
+};
+
+static const struct snd_soc_component_driver lpass_cpu_comp_driver = {
+        .name = "lpass-cpu",
+};
+
+static bool lpass_cpu_regmap_writeable(struct device *dev, unsigned int reg)
+{
+        int i;
+
+        for (i = 0; i < LPAIF_I2S_PORT_NUM; ++i)
+                if (reg == LPAIF_I2SCTL_REG(i))
+                        return true;
+
+        for (i = 0; i < LPAIF_IRQ_PORT_NUM; ++i) {
+                if (reg == LPAIF_IRQEN_REG(i))
+                        return true;
+                if (reg == LPAIF_IRQCLEAR_REG(i))
+                        return true;
+        }
+
+        for (i = 0; i < LPAIF_RDMA_CHAN_NUM; ++i) {
+                if (reg == LPAIF_RDMACTL_REG(i))
+                        return true;
+                if (reg == LPAIF_RDMABASE_REG(i))
+                        return true;
+                if (reg == LPAIF_RDMABUFF_REG(i))
+                        return true;
+                if (reg == LPAIF_RDMAPER_REG(i))
+                        return true;
+        }
+
+        return false;
+}
+
+static bool lpass_cpu_regmap_readable(struct device *dev, unsigned int reg)
+{
+        int i;
+
+        for (i = 0; i < LPAIF_I2S_PORT_NUM; ++i)
+                if (reg == LPAIF_I2SCTL_REG(i))
+                        return true;
+
+        for (i = 0; i < LPAIF_IRQ_PORT_NUM; ++i) {
+                if (reg == LPAIF_IRQEN_REG(i))
+                        return true;
+                if (reg == LPAIF_IRQSTAT_REG(i))
+                        return true;
+        }
+
+        for (i = 0; i < LPAIF_RDMA_CHAN_NUM; ++i) {
+                if (reg == LPAIF_RDMACTL_REG(i))
+                        return true;
+                if (reg == LPAIF_RDMABASE_REG(i))
+                        return true;
+                if (reg == LPAIF_RDMABUFF_REG(i))
+                        return true;
+                if (reg == LPAIF_RDMACURR_REG(i))
+                        return true;
+                if (reg == LPAIF_RDMAPER_REG(i))
+                        return true;
+        }
+
+        return false;
+}
+
+static bool lpass_cpu_regmap_volatile(struct device *dev, unsigned int reg)
+{
+        int i;
+
+        for (i = 0; i < LPAIF_IRQ_PORT_NUM; ++i)
+                if (reg == LPAIF_IRQSTAT_REG(i))
+                        return true;
+
+        for (i = 0; i < LPAIF_RDMA_CHAN_NUM; ++i)
+                if (reg == LPAIF_RDMACURR_REG(i))
+                        return true;
+
+        return false;
+}
+
+static const struct regmap_config lpass_cpu_regmap_config = {
+        .reg_bits = 32,
+        .reg_stride = 4,
+        .val_bits = 32,
+        .max_register = LPAIF_RDMAPER_REG(LPAIF_RDMA_CHAN_MAX),
+        .writeable_reg = lpass_cpu_regmap_writeable,
+        .readable_reg = lpass_cpu_regmap_readable,
+        .volatile_reg = lpass_cpu_regmap_volatile,
+        .cache_type = REGCACHE_FLAT,
+};
+
+static int lpass_cpu_platform_probe(struct platform_device *pdev)
+{
+        struct lpass_data *drvdata;
+        struct device_node *dsp_of_node;
+        struct resource *res;
+        int ret;
+
+        dsp_of_node = of_parse_phandle(pdev->dev.of_node, "qcom,adsp", 0);
+        if (dsp_of_node) {
+                dev_err(&pdev->dev, "%s() DSP exists and holds audio resources\n",
+                                __func__);
+                return -EBUSY;
+        }
+
+        drvdata = devm_kzalloc(&pdev->dev, sizeof(struct lpass_data),
+                        GFP_KERNEL);
+        if (!drvdata)
+                return -ENOMEM;
+        platform_set_drvdata(pdev, drvdata);
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "lpass-lpaif");
+        if (!res) {
+                dev_err(&pdev->dev, "%s() error getting resource\n", __func__);
+                return -ENODEV;
+        }
+
+        drvdata->lpaif = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR((void const __force *)drvdata->lpaif)) {
+                dev_err(&pdev->dev, "%s() error mapping reg resource: %ld\n",
+                                __func__,
+                                PTR_ERR((void const __force *)drvdata->lpaif));
+                return PTR_ERR((void const __force *)drvdata->lpaif);
+        }
+
+        drvdata->lpaif_map = devm_regmap_init_mmio(&pdev->dev, drvdata->lpaif,
+                        &lpass_cpu_regmap_config);
+        if (IS_ERR(drvdata->lpaif_map)) {
+                dev_err(&pdev->dev, "%s() error initializing regmap: %ld\n",
+                                __func__, PTR_ERR(drvdata->lpaif_map));
+                return PTR_ERR(drvdata->lpaif_map);
+        }
+
+        drvdata->mi2s_osr_clk = devm_clk_get(&pdev->dev, "mi2s-osr-clk");
+        if (IS_ERR(drvdata->mi2s_osr_clk)) {
+                dev_err(&pdev->dev, "%s() error getting mi2s-osr-clk: %ld\n",
+                                __func__, PTR_ERR(drvdata->mi2s_osr_clk));
+                return PTR_ERR(drvdata->mi2s_osr_clk);
+        }
+
+        drvdata->mi2s_bit_clk = devm_clk_get(&pdev->dev, "mi2s-bit-clk");
+        if (IS_ERR(drvdata->mi2s_bit_clk)) {
+                dev_err(&pdev->dev, "%s() error getting mi2s-bit-clk: %ld\n",
+                                __func__, PTR_ERR(drvdata->mi2s_bit_clk));
+                return PTR_ERR(drvdata->mi2s_bit_clk);
+        }
+
+        drvdata->ahbix_clk = devm_clk_get(&pdev->dev, "ahbix-clk");
+        if (IS_ERR(drvdata->ahbix_clk)) {
+                dev_err(&pdev->dev, "%s() error getting ahbix-clk: %ld\n",
+                                __func__, PTR_ERR(drvdata->ahbix_clk));
+                return PTR_ERR(drvdata->ahbix_clk);
+        }
+
+        ret = clk_set_rate(drvdata->ahbix_clk, LPASS_AHBIX_CLOCK_FREQUENCY);
+        if (ret) {
+                dev_err(&pdev->dev, "%s() error setting rate on ahbix_clk: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+        dev_dbg(&pdev->dev, "%s() set ahbix_clk rate to %lu\n", __func__,
+                        clk_get_rate(drvdata->ahbix_clk));
+
+        ret = clk_prepare_enable(drvdata->ahbix_clk);
+        if (ret) {
+                dev_err(&pdev->dev, "%s() error enabling ahbix_clk: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        ret = devm_snd_soc_register_component(&pdev->dev,
+                        &lpass_cpu_comp_driver, &lpass_cpu_dai_driver, 1);
+        if (ret) {
+                dev_err(&pdev->dev, "%s() error registering cpu driver: %d\n",
+                                __func__, ret);
+                goto err_clk;
+        }
+
+        ret = asoc_qcom_lpass_platform_register(pdev);
+        if (ret) {
+                dev_err(&pdev->dev, "%s() error registering platform driver: %d\n",
+                                __func__, ret);
+                goto err_clk;
+        }
+
+        return 0;
+
+err_clk:
+        clk_disable_unprepare(drvdata->ahbix_clk);
+        return ret;
+}
+
+static int lpass_cpu_platform_remove(struct platform_device *pdev)
+{
+        struct lpass_data *drvdata = platform_get_drvdata(pdev);
+
+        clk_disable_unprepare(drvdata->ahbix_clk);
+
+        return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id lpass_cpu_device_id[] = {
+        { .compatible = "qcom,lpass-cpu" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, lpass_cpu_device_id);
+#endif
+
+static struct platform_driver lpass_cpu_platform_driver = {
+        .driver = {
+                .name           = "lpass-cpu",
+                .of_match_table = of_match_ptr(lpass_cpu_device_id),
+        },
+        .probe  = lpass_cpu_platform_probe,
+        .remove = lpass_cpu_platform_remove,
+};
+module_platform_driver(lpass_cpu_platform_driver);
+
+MODULE_DESCRIPTION("QTi LPASS CPU Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/qcom/lpass-lpaif-ipq806x.h b/sound/soc/qcom/lpass-lpaif-ipq806x.h
new file mode 100644
index 000000000000..dc423b888842
--- /dev/null
+++ b/sound/soc/qcom/lpass-lpaif-ipq806x.h
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2010-2011,2013-2015 The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * lpass-lpaif-ipq806x.h -- Definitions for the QTi LPAIF in the ipq806x LPASS
+ */
+
+#ifndef __LPASS_LPAIF_H__
+#define __LPASS_LPAIF_H__
+
+#define LPAIF_BANK_OFFSET               0x1000
+
+/* LPAIF I2S */
+
+#define LPAIF_I2SCTL_REG_BASE           0x0010
+#define LPAIF_I2SCTL_REG_STRIDE         0x4
+#define LPAIF_I2SCTL_REG_ADDR(addr, port) \
+        (LPAIF_I2SCTL_REG_BASE + (addr) + (LPAIF_I2SCTL_REG_STRIDE * (port)))
+
+enum lpaif_i2s_ports {
+        LPAIF_I2S_PORT_MIN              = 0,
+
+        LPAIF_I2S_PORT_CODEC_SPK        = 0,
+        LPAIF_I2S_PORT_CODEC_MIC        = 1,
+        LPAIF_I2S_PORT_SEC_SPK          = 2,
+        LPAIF_I2S_PORT_SEC_MIC          = 3,
+        LPAIF_I2S_PORT_MI2S             = 4,
+
+        LPAIF_I2S_PORT_MAX              = 4,
+        LPAIF_I2S_PORT_NUM              = 5,
+};
+
+#define LPAIF_I2SCTL_REG(port)          LPAIF_I2SCTL_REG_ADDR(0x0, (port))
+
+#define LPAIF_I2SCTL_LOOPBACK_MASK      0x8000
+#define LPAIF_I2SCTL_LOOPBACK_SHIFT     15
+#define LPAIF_I2SCTL_LOOPBACK_DISABLE   (0 << LPAIF_I2SCTL_LOOPBACK_SHIFT)
+#define LPAIF_I2SCTL_LOOPBACK_ENABLE    (1 << LPAIF_I2SCTL_LOOPBACK_SHIFT)
+
+#define LPAIF_I2SCTL_SPKEN_MASK         0x4000
+#define LPAIF_I2SCTL_SPKEN_SHIFT        14
+#define LPAIF_I2SCTL_SPKEN_DISABLE      (0 << LPAIF_I2SCTL_SPKEN_SHIFT)
+#define LPAIF_I2SCTL_SPKEN_ENABLE       (1 << LPAIF_I2SCTL_SPKEN_SHIFT)
+
+#define LPAIF_I2SCTL_SPKMODE_MASK       0x3C00
+#define LPAIF_I2SCTL_SPKMODE_SHIFT      10
+#define LPAIF_I2SCTL_SPKMODE_NONE       (0 << LPAIF_I2SCTL_SPKMODE_SHIFT)
+#define LPAIF_I2SCTL_SPKMODE_SD0        (1 << LPAIF_I2SCTL_SPKMODE_SHIFT)
+#define LPAIF_I2SCTL_SPKMODE_SD1        (2 << LPAIF_I2SCTL_SPKMODE_SHIFT)
+#define LPAIF_I2SCTL_SPKMODE_SD2        (3 << LPAIF_I2SCTL_SPKMODE_SHIFT)
+#define LPAIF_I2SCTL_SPKMODE_SD3        (4 << LPAIF_I2SCTL_SPKMODE_SHIFT)
+#define LPAIF_I2SCTL_SPKMODE_QUAD01     (5 << LPAIF_I2SCTL_SPKMODE_SHIFT)
+#define LPAIF_I2SCTL_SPKMODE_QUAD23     (6 << LPAIF_I2SCTL_SPKMODE_SHIFT)
+#define LPAIF_I2SCTL_SPKMODE_6CH        (7 << LPAIF_I2SCTL_SPKMODE_SHIFT)
+#define LPAIF_I2SCTL_SPKMODE_8CH        (8 << LPAIF_I2SCTL_SPKMODE_SHIFT)
+
+#define LPAIF_I2SCTL_SPKMONO_MASK       0x0200
+#define LPAIF_I2SCTL_SPKMONO_SHIFT      9
+#define LPAIF_I2SCTL_SPKMONO_STEREO     (0 << LPAIF_I2SCTL_SPKMONO_SHIFT)
+#define LPAIF_I2SCTL_SPKMONO_MONO       (1 << LPAIF_I2SCTL_SPKMONO_SHIFT)
+
+#define LPAIF_I2SCTL_WSSRC_MASK         0x0004
+#define LPAIF_I2SCTL_WSSRC_SHIFT        2
+#define LPAIF_I2SCTL_WSSRC_INTERNAL     (0 << LPAIF_I2SCTL_WSSRC_SHIFT)
+#define LPAIF_I2SCTL_WSSRC_EXTERNAL     (1 << LPAIF_I2SCTL_WSSRC_SHIFT)
+
+#define LPAIF_I2SCTL_BITWIDTH_MASK      0x0003
+#define LPAIF_I2SCTL_BITWIDTH_SHIFT     0
+#define LPAIF_I2SCTL_BITWIDTH_16        (0 << LPAIF_I2SCTL_BITWIDTH_SHIFT)
+#define LPAIF_I2SCTL_BITWIDTH_24        (1 << LPAIF_I2SCTL_BITWIDTH_SHIFT)
+#define LPAIF_I2SCTL_BITWIDTH_32        (2 << LPAIF_I2SCTL_BITWIDTH_SHIFT)
+
+/* LPAIF IRQ */
+
+#define LPAIF_IRQ_REG_BASE              0x3000
+#define LPAIF_IRQ_REG_STRIDE            0x1000
+#define LPAIF_IRQ_REG_ADDR(addr, port) \
+        (LPAIF_IRQ_REG_BASE + (addr) + (LPAIF_IRQ_REG_STRIDE * (port)))
+
+enum lpaif_irq_ports {
+        LPAIF_IRQ_PORT_MIN              = 0,
+
+        LPAIF_IRQ_PORT_HOST             = 0,
+        LPAIF_IRQ_PORT_ADSP             = 1,
+
+        LPAIF_IRQ_PORT_MAX              = 2,
+        LPAIF_IRQ_PORT_NUM              = 3,
+};
+
+#define LPAIF_IRQEN_REG(port)           LPAIF_IRQ_REG_ADDR(0x0, (port))
+#define LPAIF_IRQSTAT_REG(port)         LPAIF_IRQ_REG_ADDR(0x4, (port))
+#define LPAIF_IRQCLEAR_REG(port)        LPAIF_IRQ_REG_ADDR(0xC, (port))
+
+#define LPAIF_IRQ_BITSTRIDE             3
+#define LPAIF_IRQ_PER(chan)             (1 << (LPAIF_IRQ_BITSTRIDE * (chan)))
+#define LPAIF_IRQ_XRUN(chan)            (2 << (LPAIF_IRQ_BITSTRIDE * (chan)))
+#define LPAIF_IRQ_ERR(chan)             (4 << (LPAIF_IRQ_BITSTRIDE * (chan)))
+#define LPAIF_IRQ_ALL(chan)             (7 << (LPAIF_IRQ_BITSTRIDE * (chan)))
+
+/* LPAIF DMA */
+
+#define LPAIF_RDMA_REG_BASE             0x6000
+#define LPAIF_RDMA_REG_STRIDE           0x1000
+#define LPAIF_RDMA_REG_ADDR(addr, chan) \
+        (LPAIF_RDMA_REG_BASE + (addr) + (LPAIF_RDMA_REG_STRIDE * (chan)))
+
+enum lpaif_dma_channels {
+        LPAIF_RDMA_CHAN_MIN             = 0,
+
+        LPAIF_RDMA_CHAN_MI2S            = 0,
+        LPAIF_RDMA_CHAN_PCM0            = 1,
+        LPAIF_RDMA_CHAN_PCM1            = 2,
+
+        LPAIF_RDMA_CHAN_MAX             = 4,
+        LPAIF_RDMA_CHAN_NUM             = 5,
+};
+
+#define LPAIF_RDMACTL_REG(chan)         LPAIF_RDMA_REG_ADDR(0x00, (chan))
+#define LPAIF_RDMABASE_REG(chan)        LPAIF_RDMA_REG_ADDR(0x04, (chan))
+#define LPAIF_RDMABUFF_REG(chan)        LPAIF_RDMA_REG_ADDR(0x08, (chan))
+#define LPAIF_RDMACURR_REG(chan)        LPAIF_RDMA_REG_ADDR(0x0C, (chan))
+#define LPAIF_RDMAPER_REG(chan)         LPAIF_RDMA_REG_ADDR(0x10, (chan))
+
+#define LPAIF_RDMACTL_BURSTEN_MASK      0x800
+#define LPAIF_RDMACTL_BURSTEN_SHIFT     11
+#define LPAIF_RDMACTL_BURSTEN_SINGLE    (0 << LPAIF_RDMACTL_BURSTEN_SHIFT)
+#define LPAIF_RDMACTL_BURSTEN_INCR4     (1 << LPAIF_RDMACTL_BURSTEN_SHIFT)
+
+#define LPAIF_RDMACTL_WPSCNT_MASK       0x700
+#define LPAIF_RDMACTL_WPSCNT_SHIFT      8
+#define LPAIF_RDMACTL_WPSCNT_ONE        (0 << LPAIF_RDMACTL_WPSCNT_SHIFT)
+#define LPAIF_RDMACTL_WPSCNT_TWO        (1 << LPAIF_RDMACTL_WPSCNT_SHIFT)
+#define LPAIF_RDMACTL_WPSCNT_THREE      (2 << LPAIF_RDMACTL_WPSCNT_SHIFT)
+#define LPAIF_RDMACTL_WPSCNT_FOUR       (3 << LPAIF_RDMACTL_WPSCNT_SHIFT)
+#define LPAIF_RDMACTL_WPSCNT_SIX        (5 << LPAIF_RDMACTL_WPSCNT_SHIFT)
+#define LPAIF_RDMACTL_WPSCNT_EIGHT      (7 << LPAIF_RDMACTL_WPSCNT_SHIFT)
+
+#define LPAIF_RDMACTL_AUDINTF_MASK      0x0F0
+#define LPAIF_RDMACTL_AUDINTF_SHIFT     4
+#define LPAIF_RDMACTL_AUDINTF_NONE      (0 << LPAIF_RDMACTL_AUDINTF_SHIFT)
+#define LPAIF_RDMACTL_AUDINTF_CODEC     (1 << LPAIF_RDMACTL_AUDINTF_SHIFT)
+#define LPAIF_RDMACTL_AUDINTF_PCM       (2 << LPAIF_RDMACTL_AUDINTF_SHIFT)
+#define LPAIF_RDMACTL_AUDINTF_SEC_I2S   (3 << LPAIF_RDMACTL_AUDINTF_SHIFT)
+#define LPAIF_RDMACTL_AUDINTF_MI2S      (4 << LPAIF_RDMACTL_AUDINTF_SHIFT)
+#define LPAIF_RDMACTL_AUDINTF_HDMI      (5 << LPAIF_RDMACTL_AUDINTF_SHIFT)
+#define LPAIF_RDMACTL_AUDINTF_SEC_PCM   (7 << LPAIF_RDMACTL_AUDINTF_SHIFT)
+
+#define LPAIF_RDMACTL_FIFOWM_MASK       0x00E
+#define LPAIF_RDMACTL_FIFOWM_SHIFT      1
+#define LPAIF_RDMACTL_FIFOWM_1          (0 << LPAIF_RDMACTL_FIFOWM_SHIFT)
+#define LPAIF_RDMACTL_FIFOWM_2          (1 << LPAIF_RDMACTL_FIFOWM_SHIFT)
+#define LPAIF_RDMACTL_FIFOWM_3          (2 << LPAIF_RDMACTL_FIFOWM_SHIFT)
+#define LPAIF_RDMACTL_FIFOWM_4          (3 << LPAIF_RDMACTL_FIFOWM_SHIFT)
+#define LPAIF_RDMACTL_FIFOWM_5          (4 << LPAIF_RDMACTL_FIFOWM_SHIFT)
+#define LPAIF_RDMACTL_FIFOWM_6          (5 << LPAIF_RDMACTL_FIFOWM_SHIFT)
+#define LPAIF_RDMACTL_FIFOWM_7          (6 << LPAIF_RDMACTL_FIFOWM_SHIFT)
+#define LPAIF_RDMACTL_FIFOWM_8          (7 << LPAIF_RDMACTL_FIFOWM_SHIFT)
+
+#define LPAIF_RDMACTL_ENABLE_MASK       0x1
+#define LPAIF_RDMACTL_ENABLE_SHIFT      0
+#define LPAIF_RDMACTL_ENABLE_OFF        (0 << LPAIF_RDMACTL_ENABLE_SHIFT)
+#define LPAIF_RDMACTL_ENABLE_ON         (1 << LPAIF_RDMACTL_ENABLE_SHIFT)
+
+#endif /* __LPASS_LPAIF_H__ */
diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
new file mode 100644
index 000000000000..2fa6280dfb23
--- /dev/null
+++ b/sound/soc/qcom/lpass-platform.c
@@ -0,0 +1,526 @@
+/*
+ * Copyright (c) 2010-2011,2013-2015 The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * lpass-platform.c -- ALSA SoC platform driver for QTi LPASS
+ */
+
+#include <linux/compiler.h>
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <linux/err.h>
+#include <linux/export.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <sound/memalloc.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <linux/regmap.h>
+#include <sound/soc.h>
+#include "lpass-lpaif-ipq806x.h"
+#include "lpass.h"
+
+#define LPASS_PLATFORM_BUFFER_SIZE      (16 * 1024)
+#define LPASS_PLATFORM_PERIODS          2
+
+static struct snd_pcm_hardware lpass_platform_pcm_hardware = {
+        .info                   =       SNDRV_PCM_INFO_MMAP |
+                                        SNDRV_PCM_INFO_MMAP_VALID |
+                                        SNDRV_PCM_INFO_INTERLEAVED |
+                                        SNDRV_PCM_INFO_PAUSE |
+                                        SNDRV_PCM_INFO_RESUME,
+        .formats                =       SNDRV_PCM_FMTBIT_S16 |
+                                        SNDRV_PCM_FMTBIT_S24 |
+                                        SNDRV_PCM_FMTBIT_S32,
+        .rates                  =       SNDRV_PCM_RATE_8000_192000,
+        .rate_min               =       8000,
+        .rate_max               =       192000,
+        .channels_min           =       1,
+        .channels_max           =       8,
+        .buffer_bytes_max       =       LPASS_PLATFORM_BUFFER_SIZE,
+        .period_bytes_max       =       LPASS_PLATFORM_BUFFER_SIZE /
+                                                LPASS_PLATFORM_PERIODS,
+        .period_bytes_min       =       LPASS_PLATFORM_BUFFER_SIZE /
+                                                LPASS_PLATFORM_PERIODS,
+        .periods_min            =       LPASS_PLATFORM_PERIODS,
+        .periods_max            =       LPASS_PLATFORM_PERIODS,
+        .fifo_size              =       0,
+};
+
+static int lpass_platform_pcmops_open(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
+        int ret;
+
+        snd_soc_set_runtime_hwparams(substream, &lpass_platform_pcm_hardware);
+
+        runtime->dma_bytes = lpass_platform_pcm_hardware.buffer_bytes_max;
+
+        ret = snd_pcm_hw_constraint_integer(runtime,
+                        SNDRV_PCM_HW_PARAM_PERIODS);
+        if (ret < 0) {
+                dev_err(soc_runtime->dev, "%s() setting constraints failed: %d\n",
+                                __func__, ret);
+                return -EINVAL;
+        }
+
+        snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
+
+        return 0;
+}
+
+static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream,
+                struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
+        struct lpass_data *drvdata =
+                snd_soc_platform_get_drvdata(soc_runtime->platform);
+        snd_pcm_format_t format = params_format(params);
+        unsigned int channels = params_channels(params);
+        unsigned int regval;
+        int bitwidth;
+        int ret;
+
+        bitwidth = snd_pcm_format_width(format);
+        if (bitwidth < 0) {
+                dev_err(soc_runtime->dev, "%s() invalid bit width given: %d\n",
+                                __func__, bitwidth);
+                return bitwidth;
+        }
+
+        regval = LPAIF_RDMACTL_BURSTEN_INCR4 |
+                        LPAIF_RDMACTL_AUDINTF_MI2S |
+                        LPAIF_RDMACTL_FIFOWM_8;
+
+        switch (bitwidth) {
+        case 16:
+                switch (channels) {
+                case 1:
+                case 2:
+                        regval |= LPAIF_RDMACTL_WPSCNT_ONE;
+                        break;
+                case 4:
+                        regval |= LPAIF_RDMACTL_WPSCNT_TWO;
+                        break;
+                case 6:
+                        regval |= LPAIF_RDMACTL_WPSCNT_THREE;
+                        break;
+                case 8:
+                        regval |= LPAIF_RDMACTL_WPSCNT_FOUR;
+                        break;
+                default:
+                        dev_err(soc_runtime->dev, "%s() invalid PCM config given: bw=%d, ch=%u\n",
+                                        __func__, bitwidth, channels);
+                        return -EINVAL;
+                }
+                break;
+        case 24:
+        case 32:
+                switch (channels) {
+                case 1:
+                        regval |= LPAIF_RDMACTL_WPSCNT_ONE;
+                        break;
+                case 2:
+                        regval |= LPAIF_RDMACTL_WPSCNT_TWO;
+                        break;
+                case 4:
+                        regval |= LPAIF_RDMACTL_WPSCNT_FOUR;
+                        break;
+                case 6:
+                        regval |= LPAIF_RDMACTL_WPSCNT_SIX;
+                        break;
+                case 8:
+                        regval |= LPAIF_RDMACTL_WPSCNT_EIGHT;
+                        break;
+                default:
+                        dev_err(soc_runtime->dev, "%s() invalid PCM config given: bw=%d, ch=%u\n",
+                                        __func__, bitwidth, channels);
+                        return -EINVAL;
+                }
+                break;
+        default:
+                dev_err(soc_runtime->dev, "%s() invalid PCM config given: bw=%d, ch=%u\n",
+                                __func__, bitwidth, channels);
+                return -EINVAL;
+        }
+
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_RDMACTL_REG(LPAIF_RDMA_CHAN_MI2S), regval);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() error writing to rdmactl reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int lpass_platform_pcmops_hw_free(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
+        struct lpass_data *drvdata =
+                snd_soc_platform_get_drvdata(soc_runtime->platform);
+        int ret;
+
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_RDMACTL_REG(LPAIF_RDMA_CHAN_MI2S), 0);
+        if (ret)
+                dev_err(soc_runtime->dev, "%s() error writing to rdmactl reg: %d\n",
+                                __func__, ret);
+
+        return ret;
+}
+
+static int lpass_platform_pcmops_prepare(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
+        struct lpass_data *drvdata =
+                snd_soc_platform_get_drvdata(soc_runtime->platform);
+        int ret;
+
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_RDMABASE_REG(LPAIF_RDMA_CHAN_MI2S),
+                        runtime->dma_addr);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() error writing to rdmabase reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_RDMABUFF_REG(LPAIF_RDMA_CHAN_MI2S),
+                        (snd_pcm_lib_buffer_bytes(substream) >> 2) - 1);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() error writing to rdmabuff reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_RDMAPER_REG(LPAIF_RDMA_CHAN_MI2S),
+                        (snd_pcm_lib_period_bytes(substream) >> 2) - 1);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() error writing to rdmaper reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        ret = regmap_update_bits(drvdata->lpaif_map,
+                        LPAIF_RDMACTL_REG(LPAIF_RDMA_CHAN_MI2S),
+                        LPAIF_RDMACTL_ENABLE_MASK, LPAIF_RDMACTL_ENABLE_ON);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() error writing to rdmactl reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int lpass_platform_pcmops_trigger(struct snd_pcm_substream *substream,
+                int cmd)
+{
+        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
+        struct lpass_data *drvdata =
+                snd_soc_platform_get_drvdata(soc_runtime->platform);
+        int ret;
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                /* clear status before enabling interrupts */
+                ret = regmap_write(drvdata->lpaif_map,
+                                LPAIF_IRQCLEAR_REG(LPAIF_IRQ_PORT_HOST),
+                                LPAIF_IRQ_ALL(LPAIF_RDMA_CHAN_MI2S));
+                if (ret) {
+                        dev_err(soc_runtime->dev, "%s() error writing to irqclear reg: %d\n",
+                                        __func__, ret);
+                        return ret;
+                }
+
+                ret = regmap_update_bits(drvdata->lpaif_map,
+                                LPAIF_IRQEN_REG(LPAIF_IRQ_PORT_HOST),
+                                LPAIF_IRQ_ALL(LPAIF_RDMA_CHAN_MI2S),
+                                LPAIF_IRQ_ALL(LPAIF_RDMA_CHAN_MI2S));
+                if (ret) {
+                        dev_err(soc_runtime->dev, "%s() error writing to irqen reg: %d\n",
+                                        __func__, ret);
+                        return ret;
+                }
+
+                ret = regmap_update_bits(drvdata->lpaif_map,
+                                LPAIF_RDMACTL_REG(LPAIF_RDMA_CHAN_MI2S),
+                                LPAIF_RDMACTL_ENABLE_MASK,
+                                LPAIF_RDMACTL_ENABLE_ON);
+                if (ret) {
+                        dev_err(soc_runtime->dev, "%s() error writing to rdmactl reg: %d\n",
+                                        __func__, ret);
+                        return ret;
+                }
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                ret = regmap_update_bits(drvdata->lpaif_map,
+                                LPAIF_RDMACTL_REG(LPAIF_RDMA_CHAN_MI2S),
+                                LPAIF_RDMACTL_ENABLE_MASK,
+                                LPAIF_RDMACTL_ENABLE_OFF);
+                if (ret) {
+                        dev_err(soc_runtime->dev, "%s() error writing to rdmactl reg: %d\n",
+                                        __func__, ret);
+                        return ret;
+                }
+
+                ret = regmap_update_bits(drvdata->lpaif_map,
+                                LPAIF_IRQEN_REG(LPAIF_IRQ_PORT_HOST),
+                                LPAIF_IRQ_ALL(LPAIF_RDMA_CHAN_MI2S), 0);
+                if (ret) {
+                        dev_err(soc_runtime->dev, "%s() error writing to irqen reg: %d\n",
+                                        __func__, ret);
+                        return ret;
+                }
+                break;
+        }
+
+        return 0;
+}
+
+static snd_pcm_uframes_t lpass_platform_pcmops_pointer(
+                struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
+        struct lpass_data *drvdata =
+                        snd_soc_platform_get_drvdata(soc_runtime->platform);
+        unsigned int base_addr, curr_addr;
+        int ret;
+
+        ret = regmap_read(drvdata->lpaif_map,
+                        LPAIF_RDMABASE_REG(LPAIF_RDMA_CHAN_MI2S), &base_addr);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() error reading from rdmabase reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        ret = regmap_read(drvdata->lpaif_map,
+                        LPAIF_RDMACURR_REG(LPAIF_RDMA_CHAN_MI2S), &curr_addr);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() error reading from rdmacurr reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        return bytes_to_frames(substream->runtime, curr_addr - base_addr);
+}
+
+static int lpass_platform_pcmops_mmap(struct snd_pcm_substream *substream,
+                struct vm_area_struct *vma)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+
+        return dma_mmap_coherent(substream->pcm->card->dev, vma,
+                        runtime->dma_area, runtime->dma_addr,
+                        runtime->dma_bytes);
+}
+
+static struct snd_pcm_ops lpass_platform_pcm_ops = {
+        .open           = lpass_platform_pcmops_open,
+        .ioctl          = snd_pcm_lib_ioctl,
+        .hw_params      = lpass_platform_pcmops_hw_params,
+        .hw_free        = lpass_platform_pcmops_hw_free,
+        .prepare        = lpass_platform_pcmops_prepare,
+        .trigger        = lpass_platform_pcmops_trigger,
+        .pointer        = lpass_platform_pcmops_pointer,
+        .mmap           = lpass_platform_pcmops_mmap,
+};
+
+static irqreturn_t lpass_platform_lpaif_irq(int irq, void *data)
+{
+        struct snd_pcm_substream *substream = data;
+        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
+        struct lpass_data *drvdata =
+                snd_soc_platform_get_drvdata(soc_runtime->platform);
+        unsigned int interrupts;
+        irqreturn_t ret = IRQ_NONE;
+        int rv;
+
+        rv = regmap_read(drvdata->lpaif_map,
+                        LPAIF_IRQSTAT_REG(LPAIF_IRQ_PORT_HOST), &interrupts);
+        if (rv) {
+                dev_err(soc_runtime->dev, "%s() error reading from irqstat reg: %d\n",
+                                __func__, rv);
+                return IRQ_NONE;
+        }
+        interrupts &= LPAIF_IRQ_ALL(LPAIF_RDMA_CHAN_MI2S);
+
+        if (interrupts & LPAIF_IRQ_PER(LPAIF_RDMA_CHAN_MI2S)) {
+                rv = regmap_write(drvdata->lpaif_map,
+                                LPAIF_IRQCLEAR_REG(LPAIF_IRQ_PORT_HOST),
+                                LPAIF_IRQ_PER(LPAIF_RDMA_CHAN_MI2S));
+                if (rv) {
+                        dev_err(soc_runtime->dev, "%s() error writing to irqclear reg: %d\n",
+                                        __func__, rv);
+                        return IRQ_NONE;
+                }
+                snd_pcm_period_elapsed(substream);
+                ret = IRQ_HANDLED;
+        }
+
+        if (interrupts & LPAIF_IRQ_XRUN(LPAIF_RDMA_CHAN_MI2S)) {
+                rv = regmap_write(drvdata->lpaif_map,
+                                LPAIF_IRQCLEAR_REG(LPAIF_IRQ_PORT_HOST),
+                                LPAIF_IRQ_XRUN(LPAIF_RDMA_CHAN_MI2S));
+                if (rv) {
+                        dev_err(soc_runtime->dev, "%s() error writing to irqclear reg: %d\n",
+                                        __func__, rv);
+                        return IRQ_NONE;
+                }
+                dev_warn(soc_runtime->dev, "%s() xrun warning\n", __func__);
+                snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+                ret = IRQ_HANDLED;
+        }
+
+        if (interrupts & LPAIF_IRQ_ERR(LPAIF_RDMA_CHAN_MI2S)) {
+                rv = regmap_write(drvdata->lpaif_map,
+                                LPAIF_IRQCLEAR_REG(LPAIF_IRQ_PORT_HOST),
+                                LPAIF_IRQ_ERR(LPAIF_RDMA_CHAN_MI2S));
+                if (rv) {
+                        dev_err(soc_runtime->dev, "%s() error writing to irqclear reg: %d\n",
+                                        __func__, rv);
+                        return IRQ_NONE;
+                }
+                dev_err(soc_runtime->dev, "%s() bus access error\n", __func__);
+                snd_pcm_stop(substream, SNDRV_PCM_STATE_DISCONNECTED);
+                ret = IRQ_HANDLED;
+        }
+
+        return ret;
+}
+
+static int lpass_platform_alloc_buffer(struct snd_pcm_substream *substream,
+                struct snd_soc_pcm_runtime *soc_runtime)
+{
+        struct snd_dma_buffer *buf = &substream->dma_buffer;
+        size_t size = lpass_platform_pcm_hardware.buffer_bytes_max;
+
+        buf->dev.type = SNDRV_DMA_TYPE_DEV;
+        buf->dev.dev = soc_runtime->dev;
+        buf->private_data = NULL;
+        buf->area = dma_alloc_coherent(soc_runtime->dev, size, &buf->addr,
+                        GFP_KERNEL);
+        if (!buf->area) {
+                dev_err(soc_runtime->dev, "%s: Could not allocate DMA buffer\n",
+                                __func__);
+                return -ENOMEM;
+        }
+        buf->bytes = size;
+
+        return 0;
+}
+
+static void lpass_platform_free_buffer(struct snd_pcm_substream *substream,
+                struct snd_soc_pcm_runtime *soc_runtime)
+{
+        struct snd_dma_buffer *buf = &substream->dma_buffer;
+
+        if (buf->area) {
+                dma_free_coherent(soc_runtime->dev, buf->bytes, buf->area,
+                                buf->addr);
+        }
+        buf->area = NULL;
+}
+
+static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)
+{
+        struct snd_pcm *pcm = soc_runtime->pcm;
+        struct snd_pcm_substream *substream =
+                pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
+        struct lpass_data *drvdata =
+                snd_soc_platform_get_drvdata(soc_runtime->platform);
+        int ret;
+
+        soc_runtime->dev->coherent_dma_mask = DMA_BIT_MASK(32);
+        soc_runtime->dev->dma_mask = &soc_runtime->dev->coherent_dma_mask;
+
+        ret = lpass_platform_alloc_buffer(substream, soc_runtime);
+        if (ret)
+                return ret;
+
+        ret = devm_request_irq(soc_runtime->dev, drvdata->lpaif_irq,
+                        lpass_platform_lpaif_irq, IRQF_TRIGGER_RISING,
+                        "lpass-irq-lpaif", substream);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() irq request failed: %d\n",
+                                __func__, ret);
+                goto err_buf;
+        }
+
+        /* ensure audio hardware is disabled */
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_IRQEN_REG(LPAIF_IRQ_PORT_HOST), 0);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() error writing to irqen reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+        ret = regmap_write(drvdata->lpaif_map,
+                        LPAIF_RDMACTL_REG(LPAIF_RDMA_CHAN_MI2S), 0);
+        if (ret) {
+                dev_err(soc_runtime->dev, "%s() error writing to rdmactl reg: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        return 0;
+
+err_buf:
+        lpass_platform_free_buffer(substream, soc_runtime);
+        return ret;
+}
+
+static void lpass_platform_pcm_free(struct snd_pcm *pcm)
+{
+        struct snd_pcm_substream *substream =
+                pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
+        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
+
+        lpass_platform_free_buffer(substream, soc_runtime);
+}
+
+static struct snd_soc_platform_driver lpass_platform_driver = {
+        .pcm_new        = lpass_platform_pcm_new,
+        .pcm_free       = lpass_platform_pcm_free,
+        .ops            = &lpass_platform_pcm_ops,
+};
+
+int asoc_qcom_lpass_platform_register(struct platform_device *pdev)
+{
+        struct lpass_data *drvdata = platform_get_drvdata(pdev);
+
+        drvdata->lpaif_irq = platform_get_irq_byname(pdev, "lpass-irq-lpaif");
+        if (drvdata->lpaif_irq < 0) {
+                dev_err(&pdev->dev, "%s() error getting irq handle: %d\n",
+                                __func__, drvdata->lpaif_irq);
+                return -ENODEV;
+        }
+
+        return devm_snd_soc_register_platform(&pdev->dev,
+                        &lpass_platform_driver);
+}
+EXPORT_SYMBOL_GPL(asoc_qcom_lpass_platform_register);
+
+MODULE_DESCRIPTION("QTi LPASS Platform Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h
new file mode 100644
index 000000000000..5c99b3dace86
--- /dev/null
+++ b/sound/soc/qcom/lpass.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010-2011,2013-2015 The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * lpass.h - Definitions for the QTi LPASS
+ */
+
+#ifndef __LPASS_H__
+#define __LPASS_H__
+
+#include <linux/clk.h>
+#include <linux/compiler.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+
+#define LPASS_AHBIX_CLOCK_FREQUENCY             131072000
+
+/* Both the CPU DAI and platform drivers will access this data */
+struct lpass_data {
+
+        /* AHB-I/X bus clocks inside the low-power audio subsystem (LPASS) */
+        struct clk *ahbix_clk;
+
+        /* MI2S system clock */
+        struct clk *mi2s_osr_clk;
+
+        /* MI2S bit clock (derived from system clock by a divider */
+        struct clk *mi2s_bit_clk;
+
+        /* low-power audio interface (LPAIF) registers */
+        void __iomem *lpaif;
+
+        /* regmap backed by the low-power audio interface (LPAIF) registers */
+        struct regmap *lpaif_map;
+
+        /* interrupts from the low-power audio interface (LPAIF) */
+        int lpaif_irq;
+};
+
+/* register the platform driver from the CPU DAI driver */
+int asoc_qcom_lpass_platform_register(struct platform_device *);
+
+#endif /* __LPASS_H__ */
diff --git a/sound/soc/qcom/storm.c b/sound/soc/qcom/storm.c
new file mode 100644
index 000000000000..b8bd296190ad
--- /dev/null
+++ b/sound/soc/qcom/storm.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2010-2011,2013-2015 The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * storm.c -- ALSA SoC machine driver for QTi ipq806x-based Storm board
+ */
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/mod_devicetable.h>
+#include <linux/platform_device.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#define STORM_SYSCLK_MULT                       4
+
+static int storm_ops_hw_params(struct snd_pcm_substream *substream,
+                struct snd_pcm_hw_params *params)
+{
+        struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;
+        struct snd_soc_card *card = soc_runtime->card;
+        snd_pcm_format_t format = params_format(params);
+        unsigned int rate = params_rate(params);
+        unsigned int sysclk_freq;
+        int bitwidth, ret;
+
+        bitwidth = snd_pcm_format_width(format);
+        if (bitwidth < 0) {
+                dev_err(card->dev, "%s() invalid bit width given: %d\n",
+                                __func__, bitwidth);
+                return bitwidth;
+        }
+
+        /*
+         * as the CPU DAI is the I2S bus master and no system clock is needed by
+         * the MAX98357a DAC, simply set the system clock to be a constant
+         * multiple of the bit clock for the clock divider
+         */
+        sysclk_freq = rate * bitwidth * 2 * STORM_SYSCLK_MULT;
+
+        ret = snd_soc_dai_set_sysclk(soc_runtime->cpu_dai, 0, sysclk_freq, 0);
+        if (ret) {
+                dev_err(card->dev, "%s() error setting sysclk to %u: %d\n",
+                                __func__, sysclk_freq, ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static struct snd_soc_ops storm_soc_ops = {
+        .hw_params      = storm_ops_hw_params,
+};
+
+static struct snd_soc_dai_link storm_dai_link = {
+        .name           = "Primary",
+        .stream_name    = "Primary",
+        .codec_dai_name = "HiFi",
+        .ops            = &storm_soc_ops,
+};
+
+static struct snd_soc_card storm_soc_card = {
+        .name   = "ipq806x-storm",
+        .dev    = NULL,
+};
+
+static int storm_parse_of(struct snd_soc_card *card)
+{
+        struct snd_soc_dai_link *dai_link = card->dai_link;
+        struct device_node *np = card->dev->of_node;
+
+        dai_link->cpu_of_node = of_parse_phandle(np, "cpu", 0);
+        if (!dai_link->cpu_of_node) {
+                dev_err(card->dev, "%s() error getting cpu phandle\n",
+                                __func__);
+                return -EINVAL;
+        }
+        dai_link->platform_of_node = dai_link->cpu_of_node;
+
+        dai_link->codec_of_node = of_parse_phandle(np, "codec", 0);
+        if (!dai_link->codec_of_node) {
+                dev_err(card->dev, "%s() error getting codec phandle\n",
+                                __func__);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int storm_platform_probe(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = &storm_soc_card;
+        int ret;
+
+        if (card->dev) {
+                dev_err(&pdev->dev, "%s() error, existing soundcard\n",
+                                __func__);
+                return -ENODEV;
+        }
+        card->dev = &pdev->dev;
+        platform_set_drvdata(pdev, card);
+
+        ret = snd_soc_of_parse_card_name(card, "qcom,model");
+        if (ret) {
+                dev_err(&pdev->dev, "%s() error parsing card name: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        card->dai_link  = &storm_dai_link;
+        card->num_links = 1;
+
+        ret = storm_parse_of(card);
+        if (ret) {
+                dev_err(&pdev->dev, "%s() error resolving dai links: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret == -EPROBE_DEFER) {
+                card->dev = NULL;
+                return ret;
+        } else if (ret) {
+                dev_err(&pdev->dev, "%s() error registering soundcard: %d\n",
+                                __func__, ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id storm_device_id[]  = {
+        { .compatible = "google,storm-audio" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, storm_device_id);
+#endif
+
+static struct platform_driver storm_platform_driver = {
+        .driver = {
+                .name = "storm-audio",
+                .of_match_table =
+                        of_match_ptr(storm_device_id),
+        },
+        .probe = storm_platform_probe,
+};
+module_platform_driver(storm_platform_driver);
+
+MODULE_DESCRIPTION("QTi IPQ806x-based Storm Machine Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index 80245b6eebd6..07114b0b0dc1 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -36,11 +36,17 @@ config SND_SOC_SH4_SIU
 
 config SND_SOC_RCAR
         tristate "R-Car series SRU/SCU/SSIU/SSI support"
+        depends on DMA_OF
         select SND_SIMPLE_CARD
         select REGMAP_MMIO
         help
           This option enables R-Car SUR/SCU/SSIU/SSI sound support
 
+config SND_SOC_RSRC_CARD
+        tristate "Renesas Sampling Rate Convert Sound Card"
+        help
+          This option enables simple sound if you need sampling rate convert
+
 ##
 ## Boards
 ##
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index b87b22e88e43..0c2af21b0b82 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1876,7 +1876,40 @@ static void fsi_handler_init(struct fsi_priv *fsi,
         }
 }
 
-static struct of_device_id fsi_of_match[];
+static const struct fsi_core fsi1_core = {
+        .ver    = 1,
+
+        /* Interrupt */
+        .int_st = INT_ST,
+        .iemsk  = IEMSK,
+        .imsk   = IMSK,
+};
+
+static const struct fsi_core fsi2_core = {
+        .ver    = 2,
+
+        /* Interrupt */
+        .int_st = CPU_INT_ST,
+        .iemsk  = CPU_IEMSK,
+        .imsk   = CPU_IMSK,
+        .a_mclk = A_MST_CTLR,
+        .b_mclk = B_MST_CTLR,
+};
+
+static const struct of_device_id fsi_of_match[] = {
+        { .compatible = "renesas,sh_fsi",       .data = &fsi1_core},
+        { .compatible = "renesas,sh_fsi2",      .data = &fsi2_core},
+        {},
+};
+MODULE_DEVICE_TABLE(of, fsi_of_match);
+
+static const struct platform_device_id fsi_id_table[] = {
+        { "sh_fsi",     (kernel_ulong_t)&fsi1_core },
+        { "sh_fsi2",    (kernel_ulong_t)&fsi2_core },
+        {},
+};
+MODULE_DEVICE_TABLE(platform, fsi_id_table);
+
 static int fsi_probe(struct platform_device *pdev)
 {
         struct fsi_master *master;
@@ -2072,40 +2105,6 @@ static struct dev_pm_ops fsi_pm_ops = {
         .resume                 = fsi_resume,
 };
 
-static struct fsi_core fsi1_core = {
-        .ver    = 1,
-
-        /* Interrupt */
-        .int_st = INT_ST,
-        .iemsk  = IEMSK,
-        .imsk   = IMSK,
-};
-
-static struct fsi_core fsi2_core = {
-        .ver    = 2,
-
-        /* Interrupt */
-        .int_st = CPU_INT_ST,
-        .iemsk  = CPU_IEMSK,
-        .imsk   = CPU_IMSK,
-        .a_mclk = A_MST_CTLR,
-        .b_mclk = B_MST_CTLR,
-};
-
-static struct of_device_id fsi_of_match[] = {
-        { .compatible = "renesas,sh_fsi",       .data = &fsi1_core},
-        { .compatible = "renesas,sh_fsi2",      .data = &fsi2_core},
-        {},
-};
-MODULE_DEVICE_TABLE(of, fsi_of_match);
-
-static struct platform_device_id fsi_id_table[] = {
-        { "sh_fsi",     (kernel_ulong_t)&fsi1_core },
-        { "sh_fsi2",    (kernel_ulong_t)&fsi2_core },
-        {},
-};
-MODULE_DEVICE_TABLE(platform, fsi_id_table);
-
 static struct platform_driver fsi_driver = {
         .driver         = {
                 .name   = "fsi-pcm-audio",
@@ -2119,7 +2118,7 @@ static struct platform_driver fsi_driver = {
 
 module_platform_driver(fsi_driver);
 
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("SuperH onchip FSI audio driver");
 MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori@renesas.com>");
 MODULE_ALIAS("platform:fsi-pcm-audio");
diff --git a/sound/soc/sh/rcar/Makefile b/sound/soc/sh/rcar/Makefile
index 9ac536429800..f1b445173fba 100644
--- a/sound/soc/sh/rcar/Makefile
+++ b/sound/soc/sh/rcar/Makefile
@@ -1,2 +1,5 @@
-snd-soc-rcar-objs       := core.o gen.o src.o adg.o ssi.o dvc.o
-obj-$(CONFIG_SND_SOC_RCAR)      += snd-soc-rcar.o
\ No newline at end of file
+snd-soc-rcar-objs       := core.o gen.o dma.o src.o adg.o ssi.o dvc.o
+obj-$(CONFIG_SND_SOC_RCAR)      += snd-soc-rcar.o
+
+snd-soc-rsrc-card-objs  := rsrc-card.o
+obj-$(CONFIG_SND_SOC_RSRC_CARD) += snd-soc-rsrc-card.o
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 7ac35c9d1cb8..fefc881dbac2 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -183,6 +183,8 @@ int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod,
 
         rsnd_mod_bset(mod, DIV_EN, en, en);
 
+        dev_dbg(dev, "convert rate %d <-> %d\n", src_rate, dst_rate);
+
         return 0;
 }
 
@@ -432,7 +434,5 @@ int rsnd_adg_probe(struct platform_device *pdev,
 
         priv->adg = adg;
 
-        dev_dbg(dev, "adg probed\n");
-
         return 0;
 }
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 110577c52317..9f48d75fa992 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -94,21 +94,20 @@
  *
  */
 #include <linux/pm_runtime.h>
-#include <linux/shdma-base.h>
 #include "rsnd.h"
 
 #define RSND_RATES SNDRV_PCM_RATE_8000_96000
 #define RSND_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)
 
-static struct rsnd_of_data rsnd_of_data_gen1 = {
+static const struct rsnd_of_data rsnd_of_data_gen1 = {
         .flags = RSND_GEN1,
 };
 
-static struct rsnd_of_data rsnd_of_data_gen2 = {
+static const struct rsnd_of_data rsnd_of_data_gen2 = {
         .flags = RSND_GEN2,
 };
 
-static struct of_device_id rsnd_of_match[] = {
+static const struct of_device_id rsnd_of_match[] = {
         { .compatible = "renesas,rcar_sound-gen1", .data = &rsnd_of_data_gen1 },
         { .compatible = "renesas,rcar_sound-gen2", .data = &rsnd_of_data_gen2 },
         {},
@@ -138,249 +137,37 @@ char *rsnd_mod_name(struct rsnd_mod *mod)
         return mod->ops->name;
 }
 
-char *rsnd_mod_dma_name(struct rsnd_mod *mod)
+struct dma_chan *rsnd_mod_dma_req(struct rsnd_mod *mod)
 {
-        if (!mod || !mod->ops)
-                return "unknown";
-
-        if (!mod->ops->dma_name)
-                return mod->ops->name;
+        if (!mod || !mod->ops || !mod->ops->dma_req)
+                return NULL;
 
-        return mod->ops->dma_name(mod);
+        return mod->ops->dma_req(mod);
 }
 
-void rsnd_mod_init(struct rsnd_mod *mod,
+int rsnd_mod_init(struct rsnd_mod *mod,
                    struct rsnd_mod_ops *ops,
                    struct clk *clk,
                    enum rsnd_mod_type type,
                    int id)
 {
+        int ret = clk_prepare(clk);
+
+        if (ret)
+                return ret;
+
         mod->id         = id;
         mod->ops        = ops;
         mod->type       = type;
         mod->clk        = clk;
-}
-
-/*
- *      rsnd_dma functions
- */
-void rsnd_dma_stop(struct rsnd_dma *dma)
-{
-        dmaengine_terminate_all(dma->chan);
-}
-
-static void rsnd_dma_complete(void *data)
-{
-        struct rsnd_dma *dma = (struct rsnd_dma *)data;
-        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
-
-        /*
-         * Renesas sound Gen1 needs 1 DMAC,
-         * Gen2 needs 2 DMAC.
-         * In Gen2 case, it are Audio-DMAC, and Audio-DMAC-peri-peri.
-         * But, Audio-DMAC-peri-peri doesn't have interrupt,
-         * and this driver is assuming that here.
-         *
-         * If Audio-DMAC-peri-peri has interrpt,
-         * rsnd_dai_pointer_update() will be called twice,
-         * ant it will breaks io->byte_pos
-         */
-
-        rsnd_dai_pointer_update(io, io->byte_per_period);
-}
-
-void rsnd_dma_start(struct rsnd_dma *dma)
-{
-        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
-        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
-        struct snd_pcm_substream *substream = io->substream;
-        struct device *dev = rsnd_priv_to_dev(priv);
-        struct dma_async_tx_descriptor *desc;
-
-        desc = dmaengine_prep_dma_cyclic(dma->chan,
-                                         (dma->addr) ? dma->addr :
-                                         substream->runtime->dma_addr,
-                                         snd_pcm_lib_buffer_bytes(substream),
-                                         snd_pcm_lib_period_bytes(substream),
-                                         dma->dir,
-                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-
-        if (!desc) {
-                dev_err(dev, "dmaengine_prep_slave_sg() fail\n");
-                return;
-        }
-
-        desc->callback          = rsnd_dma_complete;
-        desc->callback_param    = dma;
-
-        if (dmaengine_submit(desc) < 0) {
-                dev_err(dev, "dmaengine_submit() fail\n");
-                return;
-        }
-
-        dma_async_issue_pending(dma->chan);
-}
-
-int rsnd_dma_available(struct rsnd_dma *dma)
-{
-        return !!dma->chan;
-}
-
-#define DMA_NAME_SIZE 16
-#define MOD_MAX 4 /* MEM/SSI/SRC/DVC */
-static int _rsnd_dma_of_name(char *dma_name, struct rsnd_mod *mod)
-{
-        if (mod)
-                return snprintf(dma_name, DMA_NAME_SIZE / 2, "%s%d",
-                         rsnd_mod_dma_name(mod), rsnd_mod_id(mod));
-        else
-                return snprintf(dma_name, DMA_NAME_SIZE / 2, "mem");
-
-}
-
-static void rsnd_dma_of_name(struct rsnd_mod *mod_from,
-                             struct rsnd_mod *mod_to,
-                             char *dma_name)
-{
-        int index = 0;
-
-        index = _rsnd_dma_of_name(dma_name + index, mod_from);
-        *(dma_name + index++) = '_';
-        index = _rsnd_dma_of_name(dma_name + index, mod_to);
-}
-
-static void rsnd_dma_of_path(struct rsnd_dma *dma,
-                             int is_play,
-                             struct rsnd_mod **mod_from,
-                             struct rsnd_mod **mod_to)
-{
-        struct rsnd_mod *this = rsnd_dma_to_mod(dma);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(this);
-        struct rsnd_mod *ssi = rsnd_io_to_mod_ssi(io);
-        struct rsnd_mod *src = rsnd_io_to_mod_src(io);
-        struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io);
-        struct rsnd_mod *mod[MOD_MAX];
-        int i, index;
 
-
-        for (i = 0; i < MOD_MAX; i++)
-                mod[i] = NULL;
-
-        /*
-         * in play case...
-         *
-         * src -> dst
-         *
-         * mem -> SSI
-         * mem -> SRC -> SSI
-         * mem -> SRC -> DVC -> SSI
-         */
-        mod[0] = NULL; /* for "mem" */
-        index = 1;
-        for (i = 1; i < MOD_MAX; i++) {
-                if (!src) {
-                        mod[i] = ssi;
-                } else if (!dvc) {
-                        mod[i] = src;
-                        src = NULL;
-                } else {
-                        if ((!is_play) && (this == src))
-                                this = dvc;
-
-                        mod[i] = (is_play) ? src : dvc;
-                        i++;
-                        mod[i] = (is_play) ? dvc : src;
-                        src = NULL;
-                        dvc = NULL;
-                }
-
-                if (mod[i] == this)
-                        index = i;
-
-                if (mod[i] == ssi)
-                        break;
-        }
-
-        if (is_play) {
-                *mod_from = mod[index - 1];
-                *mod_to   = mod[index];
-        } else {
-                *mod_from = mod[index];
-                *mod_to   = mod[index - 1];
-        }
-}
-
-int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
-                  int is_play, int id)
-{
-        struct device *dev = rsnd_priv_to_dev(priv);
-        struct dma_slave_config cfg;
-        struct rsnd_mod *mod_from;
-        struct rsnd_mod *mod_to;
-        char dma_name[DMA_NAME_SIZE];
-        dma_cap_mask_t mask;
-        int ret;
-
-        if (dma->chan) {
-                dev_err(dev, "it already has dma channel\n");
-                return -EIO;
-        }
-
-        dma_cap_zero(mask);
-        dma_cap_set(DMA_SLAVE, mask);
-
-        rsnd_dma_of_path(dma, is_play, &mod_from, &mod_to);
-        rsnd_dma_of_name(mod_from, mod_to, dma_name);
-
-        cfg.slave_id    = id;
-        cfg.direction   = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
-        cfg.src_addr    = rsnd_gen_dma_addr(priv, mod_from, is_play, 1);
-        cfg.dst_addr    = rsnd_gen_dma_addr(priv, mod_to,   is_play, 0);
-        cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-        cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-
-        dev_dbg(dev, "dma : %s %pad -> %pad\n",
-                dma_name, &cfg.src_addr, &cfg.dst_addr);
-
-        dma->chan = dma_request_slave_channel_compat(mask, shdma_chan_filter,
-                                                     (void *)id, dev,
-                                                     dma_name);
-        if (!dma->chan) {
-                dev_err(dev, "can't get dma channel\n");
-                goto rsnd_dma_channel_err;
-        }
-
-        ret = dmaengine_slave_config(dma->chan, &cfg);
-        if (ret < 0)
-                goto rsnd_dma_init_err;
-
-        dma->addr = is_play ? cfg.src_addr : cfg.dst_addr;
-        dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
-
-        return 0;
-
-rsnd_dma_init_err:
-        rsnd_dma_quit(priv, dma);
-rsnd_dma_channel_err:
-
-        /*
-         * DMA failed. try to PIO mode
-         * see
-         *      rsnd_ssi_fallback()
-         *      rsnd_rdai_continuance_probe()
-         */
-        return -EAGAIN;
+        return ret;
 }
 
-void  rsnd_dma_quit(struct rsnd_priv *priv,
-                    struct rsnd_dma *dma)
+void rsnd_mod_quit(struct rsnd_mod *mod)
 {
-        if (dma->chan)
-                dma_release_channel(dma->chan);
-
-        dma->chan = NULL;
+        if (mod->clk)
+                clk_unprepare(mod->clk);
 }
 
 /*
@@ -416,7 +203,7 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod)
 ({                                                              \
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);         \
         struct device *dev = rsnd_priv_to_dev(priv);            \
-        u32 mask = 1 << __rsnd_mod_shift_##func;                        \
+        u32 mask = (1 << __rsnd_mod_shift_##func) & ~(1 << 31); \
         u32 call = __rsnd_mod_call_##func << __rsnd_mod_shift_##func;   \
         int ret = 0;                                                    \
         if ((mod->status & mask) == call) {                             \
@@ -458,7 +245,7 @@ static int rsnd_dai_connect(struct rsnd_mod *mod,
                 struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
                 struct device *dev = rsnd_priv_to_dev(priv);
 
-                dev_err(dev, "%s%d is not empty\n",
+                dev_err(dev, "%s[%d] is not empty\n",
                         rsnd_mod_name(mod),
                         rsnd_mod_id(mod));
                 return -EIO;
@@ -874,20 +661,28 @@ static int rsnd_dai_probe(struct platform_device *pdev,
                 drv[i].name     = rdai[i].name;
                 drv[i].ops      = &rsnd_soc_dai_ops;
                 if (pmod) {
+                        snprintf(rdai[i].playback.name, RSND_DAI_NAME_SIZE,
+                                 "DAI%d Playback", i);
+
                         drv[i].playback.rates           = RSND_RATES;
                         drv[i].playback.formats         = RSND_FMTS;
                         drv[i].playback.channels_min    = 2;
                         drv[i].playback.channels_max    = 2;
+                        drv[i].playback.stream_name     = rdai[i].playback.name;
 
                         rdai[i].playback.info = &info->dai_info[i].playback;
                         rdai[i].playback.rdai = rdai + i;
                         rsnd_path_init(priv, &rdai[i], &rdai[i].playback);
                 }
                 if (cmod) {
+                        snprintf(rdai[i].capture.name, RSND_DAI_NAME_SIZE,
+                                 "DAI%d Capture", i);
+
                         drv[i].capture.rates            = RSND_RATES;
                         drv[i].capture.formats          = RSND_FMTS;
                         drv[i].capture.channels_min     = 2;
                         drv[i].capture.channels_max     = 2;
+                        drv[i].capture.stream_name      = rdai[i].capture.name;
 
                         rdai[i].capture.info = &info->dai_info[i].capture;
                         rdai[i].capture.rdai = rdai + i;
@@ -933,6 +728,15 @@ static int rsnd_pcm_open(struct snd_pcm_substream *substream)
 static int rsnd_hw_params(struct snd_pcm_substream *substream,
                          struct snd_pcm_hw_params *hw_params)
 {
+        struct snd_soc_dai *dai = rsnd_substream_to_dai(substream);
+        struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
+        struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);
+        int ret;
+
+        ret = rsnd_dai_call(hw_params, io, substream, hw_params);
+        if (ret)
+                return ret;
+
         return snd_pcm_lib_malloc_pages(substream,
                                         params_buffer_bytes(hw_params));
 }
@@ -1197,6 +1001,7 @@ static int rsnd_probe(struct platform_device *pdev)
                             const struct rsnd_of_data *of_data,
                             struct rsnd_priv *priv) = {
                 rsnd_gen_probe,
+                rsnd_dma_probe,
                 rsnd_ssi_probe,
                 rsnd_src_probe,
                 rsnd_dvc_probe,
@@ -1290,6 +1095,12 @@ static int rsnd_remove(struct platform_device *pdev)
 {
         struct rsnd_priv *priv = dev_get_drvdata(&pdev->dev);
         struct rsnd_dai *rdai;
+        void (*remove_func[])(struct platform_device *pdev,
+                              struct rsnd_priv *priv) = {
+                rsnd_ssi_remove,
+                rsnd_src_remove,
+                rsnd_dvc_remove,
+        };
         int ret = 0, i;
 
         pm_runtime_disable(&pdev->dev);
@@ -1299,6 +1110,9 @@ static int rsnd_remove(struct platform_device *pdev)
                 ret |= rsnd_dai_call(remove, &rdai->capture, priv);
         }
 
+        for (i = 0; i < ARRAY_SIZE(remove_func); i++)
+                remove_func[i](pdev, priv);
+
         snd_soc_unregister_component(&pdev->dev);
         snd_soc_unregister_platform(&pdev->dev);
 
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
new file mode 100644
index 000000000000..ac3756f6af60
--- /dev/null
+++ b/sound/soc/sh/rcar/dma.c
@@ -0,0 +1,616 @@
+/*
+ * Renesas R-Car Audio DMAC support
+ *
+ * Copyright (C) 2015 Renesas Electronics Corp.
+ * Copyright (c) 2015 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * 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.
+ */
+#include <linux/delay.h>
+#include <linux/of_dma.h>
+#include "rsnd.h"
+
+/*
+ * Audio DMAC peri peri register
+ */
+#define PDMASAR         0x00
+#define PDMADAR         0x04
+#define PDMACHCR        0x0c
+
+/* PDMACHCR */
+#define PDMACHCR_DE             (1 << 0)
+
+struct rsnd_dma_ctrl {
+        void __iomem *base;
+        int dmapp_num;
+};
+
+#define rsnd_priv_to_dmac(p)    ((struct rsnd_dma_ctrl *)(p)->dma)
+
+/*
+ *              Audio DMAC
+ */
+static void rsnd_dmaen_complete(void *data)
+{
+        struct rsnd_dma *dma = (struct rsnd_dma *)data;
+        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+
+        /*
+         * Renesas sound Gen1 needs 1 DMAC,
+         * Gen2 needs 2 DMAC.
+         * In Gen2 case, it are Audio-DMAC, and Audio-DMAC-peri-peri.
+         * But, Audio-DMAC-peri-peri doesn't have interrupt,
+         * and this driver is assuming that here.
+         *
+         * If Audio-DMAC-peri-peri has interrpt,
+         * rsnd_dai_pointer_update() will be called twice,
+         * ant it will breaks io->byte_pos
+         */
+
+        rsnd_dai_pointer_update(io, io->byte_per_period);
+}
+
+static void rsnd_dmaen_stop(struct rsnd_dma *dma)
+{
+        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
+
+        dmaengine_terminate_all(dmaen->chan);
+}
+
+static void rsnd_dmaen_start(struct rsnd_dma *dma)
+{
+        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
+        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct snd_pcm_substream *substream = io->substream;
+        struct device *dev = rsnd_priv_to_dev(priv);
+        struct dma_async_tx_descriptor *desc;
+        int is_play = rsnd_io_is_play(io);
+
+        desc = dmaengine_prep_dma_cyclic(dmaen->chan,
+                                         substream->runtime->dma_addr,
+                                         snd_pcm_lib_buffer_bytes(substream),
+                                         snd_pcm_lib_period_bytes(substream),
+                                         is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM,
+                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+
+        if (!desc) {
+                dev_err(dev, "dmaengine_prep_slave_sg() fail\n");
+                return;
+        }
+
+        desc->callback          = rsnd_dmaen_complete;
+        desc->callback_param    = dma;
+
+        if (dmaengine_submit(desc) < 0) {
+                dev_err(dev, "dmaengine_submit() fail\n");
+                return;
+        }
+
+        dma_async_issue_pending(dmaen->chan);
+}
+
+struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
+                                          struct rsnd_mod *mod, char *name)
+{
+        struct dma_chan *chan;
+        struct device_node *np;
+        int i = 0;
+
+        for_each_child_of_node(of_node, np) {
+                if (i == rsnd_mod_id(mod))
+                        break;
+                i++;
+        }
+
+        chan = of_dma_request_slave_channel(np, name);
+
+        of_node_put(np);
+        of_node_put(of_node);
+
+        return chan;
+}
+
+static struct dma_chan *rsnd_dmaen_request_channel(struct rsnd_mod *mod_from,
+                                                   struct rsnd_mod *mod_to)
+{
+        if ((!mod_from && !mod_to) ||
+            (mod_from && mod_to))
+                return NULL;
+
+        if (mod_from)
+                return rsnd_mod_dma_req(mod_from);
+        else
+                return rsnd_mod_dma_req(mod_to);
+}
+
+static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
+                           struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)
+{
+        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        struct dma_slave_config cfg = {};
+        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        int is_play = rsnd_io_is_play(io);
+        int ret;
+
+        if (dmaen->chan) {
+                dev_err(dev, "it already has dma channel\n");
+                return -EIO;
+        }
+
+        if (dev->of_node) {
+                dmaen->chan = rsnd_dmaen_request_channel(mod_from, mod_to);
+        } else {
+                dma_cap_mask_t mask;
+
+                dma_cap_zero(mask);
+                dma_cap_set(DMA_SLAVE, mask);
+
+                dmaen->chan = dma_request_channel(mask, shdma_chan_filter,
+                                                  (void *)id);
+        }
+        if (IS_ERR_OR_NULL(dmaen->chan)) {
+                dev_err(dev, "can't get dma channel\n");
+                goto rsnd_dma_channel_err;
+        }
+
+        cfg.direction   = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
+        cfg.src_addr    = dma->src_addr;
+        cfg.dst_addr    = dma->dst_addr;
+        cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+        cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+
+        dev_dbg(dev, "dma : %pad -> %pad\n",
+                &cfg.src_addr, &cfg.dst_addr);
+
+        ret = dmaengine_slave_config(dmaen->chan, &cfg);
+        if (ret < 0)
+                goto rsnd_dma_init_err;
+
+        return 0;
+
+rsnd_dma_init_err:
+        rsnd_dma_quit(dma);
+rsnd_dma_channel_err:
+
+        /*
+         * DMA failed. try to PIO mode
+         * see
+         *      rsnd_ssi_fallback()
+         *      rsnd_rdai_continuance_probe()
+         */
+        return -EAGAIN;
+}
+
+static void rsnd_dmaen_quit(struct rsnd_dma *dma)
+{
+        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
+
+        if (dmaen->chan)
+                dma_release_channel(dmaen->chan);
+
+        dmaen->chan = NULL;
+}
+
+static struct rsnd_dma_ops rsnd_dmaen_ops = {
+        .start  = rsnd_dmaen_start,
+        .stop   = rsnd_dmaen_stop,
+        .init   = rsnd_dmaen_init,
+        .quit   = rsnd_dmaen_quit,
+};
+
+/*
+ *              Audio DMAC peri peri
+ */
+static const u8 gen2_id_table_ssiu[] = {
+        0x00, /* SSI00 */
+        0x04, /* SSI10 */
+        0x08, /* SSI20 */
+        0x0c, /* SSI3  */
+        0x0d, /* SSI4  */
+        0x0e, /* SSI5  */
+        0x0f, /* SSI6  */
+        0x10, /* SSI7  */
+        0x11, /* SSI8  */
+        0x12, /* SSI90 */
+};
+static const u8 gen2_id_table_scu[] = {
+        0x2d, /* SCU_SRCI0 */
+        0x2e, /* SCU_SRCI1 */
+        0x2f, /* SCU_SRCI2 */
+        0x30, /* SCU_SRCI3 */
+        0x31, /* SCU_SRCI4 */
+        0x32, /* SCU_SRCI5 */
+        0x33, /* SCU_SRCI6 */
+        0x34, /* SCU_SRCI7 */
+        0x35, /* SCU_SRCI8 */
+        0x36, /* SCU_SRCI9 */
+};
+static const u8 gen2_id_table_cmd[] = {
+        0x37, /* SCU_CMD0 */
+        0x38, /* SCU_CMD1 */
+};
+
+static u32 rsnd_dmapp_get_id(struct rsnd_mod *mod)
+{
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct rsnd_mod *ssi = rsnd_io_to_mod_ssi(io);
+        struct rsnd_mod *src = rsnd_io_to_mod_src(io);
+        struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io);
+        const u8 *entry = NULL;
+        int id = rsnd_mod_id(mod);
+        int size = 0;
+
+        if (mod == ssi) {
+                entry = gen2_id_table_ssiu;
+                size = ARRAY_SIZE(gen2_id_table_ssiu);
+        } else if (mod == src) {
+                entry = gen2_id_table_scu;
+                size = ARRAY_SIZE(gen2_id_table_scu);
+        } else if (mod == dvc) {
+                entry = gen2_id_table_cmd;
+                size = ARRAY_SIZE(gen2_id_table_cmd);
+        }
+
+        if (!entry)
+                return 0xFF;
+
+        if (size <= id)
+                return 0xFF;
+
+        return entry[id];
+}
+
+static u32 rsnd_dmapp_get_chcr(struct rsnd_mod *mod_from,
+                               struct rsnd_mod *mod_to)
+{
+        return  (rsnd_dmapp_get_id(mod_from) << 24) +
+                (rsnd_dmapp_get_id(mod_to) << 16);
+}
+
+#define rsnd_dmapp_addr(dmac, dma, reg) \
+        (dmac->base + 0x20 + reg + \
+         (0x10 * rsnd_dma_to_dmapp(dma)->dmapp_id))
+static void rsnd_dmapp_write(struct rsnd_dma *dma, u32 data, u32 reg)
+{
+        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
+        struct device *dev = rsnd_priv_to_dev(priv);
+
+        dev_dbg(dev, "w %p : %08x\n", rsnd_dmapp_addr(dmac, dma, reg), data);
+
+        iowrite32(data, rsnd_dmapp_addr(dmac, dma, reg));
+}
+
+static u32 rsnd_dmapp_read(struct rsnd_dma *dma, u32 reg)
+{
+        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
+
+        return ioread32(rsnd_dmapp_addr(dmac, dma, reg));
+}
+
+static void rsnd_dmapp_stop(struct rsnd_dma *dma)
+{
+        int i;
+
+        rsnd_dmapp_write(dma, 0, PDMACHCR);
+
+        for (i = 0; i < 1024; i++) {
+                if (0 == rsnd_dmapp_read(dma, PDMACHCR))
+                        return;
+                udelay(1);
+        }
+}
+
+static void rsnd_dmapp_start(struct rsnd_dma *dma)
+{
+        struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma);
+
+        rsnd_dmapp_write(dma, dma->src_addr,    PDMASAR);
+        rsnd_dmapp_write(dma, dma->dst_addr,    PDMADAR);
+        rsnd_dmapp_write(dma, dmapp->chcr,      PDMACHCR);
+}
+
+static int rsnd_dmapp_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
+                           struct rsnd_mod *mod_from, struct rsnd_mod *mod_to)
+{
+        struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma);
+        struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
+        struct device *dev = rsnd_priv_to_dev(priv);
+
+        dmapp->dmapp_id = dmac->dmapp_num;
+        dmapp->chcr = rsnd_dmapp_get_chcr(mod_from, mod_to) | PDMACHCR_DE;
+
+        dmac->dmapp_num++;
+
+        rsnd_dmapp_stop(dma);
+
+        dev_dbg(dev, "id/src/dst/chcr = %d/%pad/%pad/%08x\n",
+                dmapp->dmapp_id, &dma->src_addr, &dma->dst_addr, dmapp->chcr);
+
+        return 0;
+}
+
+static struct rsnd_dma_ops rsnd_dmapp_ops = {
+        .start  = rsnd_dmapp_start,
+        .stop   = rsnd_dmapp_stop,
+        .init   = rsnd_dmapp_init,
+        .quit   = rsnd_dmapp_stop,
+};
+
+/*
+ *              Common DMAC Interface
+ */
+
+/*
+ *      DMA read/write register offset
+ *
+ *      RSND_xxx_I_N    for Audio DMAC input
+ *      RSND_xxx_O_N    for Audio DMAC output
+ *      RSND_xxx_I_P    for Audio DMAC peri peri input
+ *      RSND_xxx_O_P    for Audio DMAC peri peri output
+ *
+ *      ex) R-Car H2 case
+ *            mod        / DMAC in    / DMAC out   / DMAC PP in / DMAC pp out
+ *      SSI : 0xec541000 / 0xec241008 / 0xec24100c
+ *      SSIU: 0xec541000 / 0xec100000 / 0xec100000 / 0xec400000 / 0xec400000
+ *      SCU : 0xec500000 / 0xec000000 / 0xec004000 / 0xec300000 / 0xec304000
+ *      CMD : 0xec500000 /            / 0xec008000                0xec308000
+ */
+#define RDMA_SSI_I_N(addr, i)   (addr ##_reg - 0x00300000 + (0x40 * i) + 0x8)
+#define RDMA_SSI_O_N(addr, i)   (addr ##_reg - 0x00300000 + (0x40 * i) + 0xc)
+
+#define RDMA_SSIU_I_N(addr, i)  (addr ##_reg - 0x00441000 + (0x1000 * i))
+#define RDMA_SSIU_O_N(addr, i)  (addr ##_reg - 0x00441000 + (0x1000 * i))
+
+#define RDMA_SSIU_I_P(addr, i)  (addr ##_reg - 0x00141000 + (0x1000 * i))
+#define RDMA_SSIU_O_P(addr, i)  (addr ##_reg - 0x00141000 + (0x1000 * i))
+
+#define RDMA_SRC_I_N(addr, i)   (addr ##_reg - 0x00500000 + (0x400 * i))
+#define RDMA_SRC_O_N(addr, i)   (addr ##_reg - 0x004fc000 + (0x400 * i))
+
+#define RDMA_SRC_I_P(addr, i)   (addr ##_reg - 0x00200000 + (0x400 * i))
+#define RDMA_SRC_O_P(addr, i)   (addr ##_reg - 0x001fc000 + (0x400 * i))
+
+#define RDMA_CMD_O_N(addr, i)   (addr ##_reg - 0x004f8000 + (0x400 * i))
+#define RDMA_CMD_O_P(addr, i)   (addr ##_reg - 0x001f8000 + (0x400 * i))
+
+static dma_addr_t
+rsnd_gen2_dma_addr(struct rsnd_priv *priv,
+                   struct rsnd_mod *mod,
+                   int is_play, int is_from)
+{
+        struct device *dev = rsnd_priv_to_dev(priv);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        phys_addr_t ssi_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SSI);
+        phys_addr_t src_reg = rsnd_gen_get_phy_addr(priv, RSND_GEN2_SCU);
+        int is_ssi = !!(rsnd_io_to_mod_ssi(io) == mod);
+        int use_src = !!rsnd_io_to_mod_src(io);
+        int use_dvc = !!rsnd_io_to_mod_dvc(io);
+        int id = rsnd_mod_id(mod);
+        struct dma_addr {
+                dma_addr_t out_addr;
+                dma_addr_t in_addr;
+        } dma_addrs[3][2][3] = {
+                /* SRC */
+                {{{ 0,                          0 },
+                  /* Capture */
+                  { RDMA_SRC_O_N(src, id),      RDMA_SRC_I_P(src, id) },
+                  { RDMA_CMD_O_N(src, id),      RDMA_SRC_I_P(src, id) } },
+                 /* Playback */
+                 {{ 0,                          0, },
+                  { RDMA_SRC_O_P(src, id),      RDMA_SRC_I_N(src, id) },
+                  { RDMA_CMD_O_P(src, id),      RDMA_SRC_I_N(src, id) } }
+                },
+                /* SSI */
+                /* Capture */
+                {{{ RDMA_SSI_O_N(ssi, id),      0 },
+                  { RDMA_SSIU_O_P(ssi, id),     0 },
+                  { RDMA_SSIU_O_P(ssi, id),     0 } },
+                 /* Playback */
+                 {{ 0,                          RDMA_SSI_I_N(ssi, id) },
+                  { 0,                          RDMA_SSIU_I_P(ssi, id) },
+                  { 0,                          RDMA_SSIU_I_P(ssi, id) } }
+                },
+                /* SSIU */
+                /* Capture */
+                {{{ RDMA_SSIU_O_N(ssi, id),     0 },
+                  { RDMA_SSIU_O_P(ssi, id),     0 },
+                  { RDMA_SSIU_O_P(ssi, id),     0 } },
+                 /* Playback */
+                 {{ 0,                          RDMA_SSIU_I_N(ssi, id) },
+                  { 0,                          RDMA_SSIU_I_P(ssi, id) },
+                  { 0,                          RDMA_SSIU_I_P(ssi, id) } } },
+        };
+
+        /* it shouldn't happen */
+        if (use_dvc && !use_src)
+                dev_err(dev, "DVC is selected without SRC\n");
+
+        /* use SSIU or SSI ? */
+        if (is_ssi && rsnd_ssi_use_busif(mod))
+                is_ssi++;
+
+        return (is_from) ?
+                dma_addrs[is_ssi][is_play][use_src + use_dvc].out_addr :
+                dma_addrs[is_ssi][is_play][use_src + use_dvc].in_addr;
+}
+
+static dma_addr_t rsnd_dma_addr(struct rsnd_priv *priv,
+                                struct rsnd_mod *mod,
+                                int is_play, int is_from)
+{
+        /*
+         * gen1 uses default DMA addr
+         */
+        if (rsnd_is_gen1(priv))
+                return 0;
+
+        if (!mod)
+                return 0;
+
+        return rsnd_gen2_dma_addr(priv, mod, is_play, is_from);
+}
+
+#define MOD_MAX 4 /* MEM/SSI/SRC/DVC */
+static void rsnd_dma_of_path(struct rsnd_dma *dma,
+                             int is_play,
+                             struct rsnd_mod **mod_from,
+                             struct rsnd_mod **mod_to)
+{
+        struct rsnd_mod *this = rsnd_dma_to_mod(dma);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(this);
+        struct rsnd_mod *ssi = rsnd_io_to_mod_ssi(io);
+        struct rsnd_mod *src = rsnd_io_to_mod_src(io);
+        struct rsnd_mod *dvc = rsnd_io_to_mod_dvc(io);
+        struct rsnd_mod *mod[MOD_MAX];
+        int i, index;
+
+
+        for (i = 0; i < MOD_MAX; i++)
+                mod[i] = NULL;
+
+        /*
+         * in play case...
+         *
+         * src -> dst
+         *
+         * mem -> SSI
+         * mem -> SRC -> SSI
+         * mem -> SRC -> DVC -> SSI
+         */
+        mod[0] = NULL; /* for "mem" */
+        index = 1;
+        for (i = 1; i < MOD_MAX; i++) {
+                if (!src) {
+                        mod[i] = ssi;
+                } else if (!dvc) {
+                        mod[i] = src;
+                        src = NULL;
+                } else {
+                        if ((!is_play) && (this == src))
+                                this = dvc;
+
+                        mod[i] = (is_play) ? src : dvc;
+                        i++;
+                        mod[i] = (is_play) ? dvc : src;
+                        src = NULL;
+                        dvc = NULL;
+                }
+
+                if (mod[i] == this)
+                        index = i;
+
+                if (mod[i] == ssi)
+                        break;
+        }
+
+        if (is_play) {
+                *mod_from = mod[index - 1];
+                *mod_to   = mod[index];
+        } else {
+                *mod_from = mod[index];
+                *mod_to   = mod[index - 1];
+        }
+}
+
+void rsnd_dma_stop(struct rsnd_dma *dma)
+{
+        dma->ops->stop(dma);
+}
+
+void rsnd_dma_start(struct rsnd_dma *dma)
+{
+        dma->ops->start(dma);
+}
+
+void rsnd_dma_quit(struct rsnd_dma *dma)
+{
+        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
+
+        if (!dmac)
+                return;
+
+        dma->ops->quit(dma);
+}
+
+int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id)
+{
+        struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
+        struct rsnd_mod *mod_from;
+        struct rsnd_mod *mod_to;
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv);
+        int is_play = rsnd_io_is_play(io);
+
+        /*
+         * DMA failed. try to PIO mode
+         * see
+         *      rsnd_ssi_fallback()
+         *      rsnd_rdai_continuance_probe()
+         */
+        if (!dmac)
+                return -EAGAIN;
+
+        rsnd_dma_of_path(dma, is_play, &mod_from, &mod_to);
+
+        dma->src_addr = rsnd_dma_addr(priv, mod_from, is_play, 1);
+        dma->dst_addr = rsnd_dma_addr(priv, mod_to,   is_play, 0);
+
+        /* for Gen2 */
+        if (mod_from && mod_to)
+                dma->ops = &rsnd_dmapp_ops;
+        else
+                dma->ops = &rsnd_dmaen_ops;
+
+        /* for Gen1, overwrite */
+        if (rsnd_is_gen1(priv))
+                dma->ops = &rsnd_dmaen_ops;
+
+        return dma->ops->init(priv, dma, id, mod_from, mod_to);
+}
+
+int rsnd_dma_probe(struct platform_device *pdev,
+                   const struct rsnd_of_data *of_data,
+                   struct rsnd_priv *priv)
+{
+        struct device *dev = rsnd_priv_to_dev(priv);
+        struct rsnd_dma_ctrl *dmac;
+        struct resource *res;
+
+        /*
+         * for Gen1
+         */
+        if (rsnd_is_gen1(priv))
+                return 0;
+
+        /*
+         * for Gen2
+         */
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "audmapp");
+        dmac = devm_kzalloc(dev, sizeof(*dmac), GFP_KERNEL);
+        if (!dmac || !res) {
+                dev_err(dev, "dma allocate failed\n");
+                return 0; /* it will be PIO mode */
+        }
+
+        dmac->dmapp_num = 0;
+        dmac->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(dmac->base))
+                return PTR_ERR(dmac->base);
+
+        priv->dma = dmac;
+
+        return 0;
+}
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index d7f9ed959c4e..e5fcb062ad77 100644
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -24,6 +24,9 @@ struct rsnd_dvc {
         struct rsnd_kctrl_cfg_s rdown;  /* Ramp Rate Down */
 };
 
+#define rsnd_dvc_of_node(priv) \
+        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,dvc")
+
 #define rsnd_mod_to_dvc(_mod)   \
         container_of((_mod), struct rsnd_dvc, mod)
 
@@ -33,7 +36,7 @@ struct rsnd_dvc {
              ((pos) = (struct rsnd_dvc *)(priv)->dvc + i);      \
              i++)
 
-static const char const *dvc_ramp_rate[] = {
+static const char * const dvc_ramp_rate[] = {
         "128 dB/1 step",         /* 00000 */
         "64 dB/1 step",          /* 00001 */
         "32 dB/1 step",          /* 00010 */
@@ -116,17 +119,6 @@ static void rsnd_dvc_volume_update(struct rsnd_mod *mod)
         rsnd_mod_write(mod, DVC_DVUER, 1);
 }
 
-static int rsnd_dvc_probe_gen2(struct rsnd_mod *mod,
-                               struct rsnd_priv *priv)
-{
-        struct device *dev = rsnd_priv_to_dev(priv);
-
-        dev_dbg(dev, "%s[%d] (Gen2) is probed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
-
-        return 0;
-}
-
 static int rsnd_dvc_remove_gen2(struct rsnd_mod *mod,
                                 struct rsnd_priv *priv)
 {
@@ -269,9 +261,17 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
         return 0;
 }
 
+static struct dma_chan *rsnd_dvc_dma_req(struct rsnd_mod *mod)
+{
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+
+        return rsnd_dma_request_channel(rsnd_dvc_of_node(priv),
+                                        mod, "tx");
+}
+
 static struct rsnd_mod_ops rsnd_dvc_ops = {
         .name           = DVC_NAME,
-        .probe          = rsnd_dvc_probe_gen2,
+        .dma_req        = rsnd_dvc_dma_req,
         .remove         = rsnd_dvc_remove_gen2,
         .init           = rsnd_dvc_init,
         .quit           = rsnd_dvc_quit,
@@ -333,7 +333,7 @@ int rsnd_dvc_probe(struct platform_device *pdev,
         struct rsnd_dvc *dvc;
         struct clk *clk;
         char name[RSND_DVC_NAME_SIZE];
-        int i, nr;
+        int i, nr, ret;
 
         rsnd_of_parse_dvc(pdev, of_data, priv);
 
@@ -366,11 +366,22 @@ int rsnd_dvc_probe(struct platform_device *pdev,
 
                 dvc->info = &info->dvc_info[i];
 
-                rsnd_mod_init(&dvc->mod, &rsnd_dvc_ops,
+                ret = rsnd_mod_init(&dvc->mod, &rsnd_dvc_ops,
                               clk, RSND_MOD_DVC, i);
-
-                dev_dbg(dev, "CMD%d probed\n", i);
+                if (ret)
+                        return ret;
         }
 
         return 0;
 }
+
+void rsnd_dvc_remove(struct platform_device *pdev,
+                     struct rsnd_priv *priv)
+{
+        struct rsnd_dvc *dvc;
+        int i;
+
+        for_each_rsnd_dvc(dvc, priv, i) {
+                rsnd_mod_quit(&dvc->mod);
+        }
+}
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index de0685f2abae..8c7dc51b1c4f 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -28,6 +28,7 @@ struct rsnd_gen {
 
         struct regmap *regmap[RSND_BASE_MAX];
         struct regmap_field *regs[RSND_REG_MAX];
+        phys_addr_t res[RSND_REG_MAX];
 };
 
 #define rsnd_priv_to_gen(p)     ((struct rsnd_gen *)(p)->gen)
@@ -118,11 +119,19 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod,
                                   mask, data);
 }
 
-#define rsnd_gen_regmap_init(priv, id_size, reg_id, conf)               \
-        _rsnd_gen_regmap_init(priv, id_size, reg_id, conf, ARRAY_SIZE(conf))
+phys_addr_t rsnd_gen_get_phy_addr(struct rsnd_priv *priv, int reg_id)
+{
+        struct rsnd_gen *gen = rsnd_priv_to_gen(priv);
+
+        return  gen->res[reg_id];
+}
+
+#define rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf)         \
+        _rsnd_gen_regmap_init(priv, id_size, reg_id, name, conf, ARRAY_SIZE(conf))
 static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
                                  int id_size,
                                  int reg_id,
+                                 const char *name,
                                  struct rsnd_regmap_field_conf *conf,
                                  int conf_size)
 {
@@ -141,8 +150,11 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
         regc.reg_bits = 32;
         regc.val_bits = 32;
         regc.reg_stride = 4;
+        regc.name = name;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, reg_id);
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
+        if (!res)
+                res = platform_get_resource(pdev, IORESOURCE_MEM, reg_id);
         if (!res)
                 return -ENODEV;
 
@@ -156,6 +168,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
 
         gen->base[reg_id] = base;
         gen->regmap[reg_id] = regmap;
+        gen->res[reg_id] = res->start;
 
         for (i = 0; i < conf_size; i++) {
 
@@ -176,125 +189,11 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
 }
 
 /*
- *      DMA read/write register offset
- *
- *      RSND_xxx_I_N    for Audio DMAC input
- *      RSND_xxx_O_N    for Audio DMAC output
- *      RSND_xxx_I_P    for Audio DMAC peri peri input
- *      RSND_xxx_O_P    for Audio DMAC peri peri output
- *
- *      ex) R-Car H2 case
- *            mod        / DMAC in    / DMAC out   / DMAC PP in / DMAC pp out
- *      SSI : 0xec541000 / 0xec241008 / 0xec24100c
- *      SSIU: 0xec541000 / 0xec100000 / 0xec100000 / 0xec400000 / 0xec400000
- *      SCU : 0xec500000 / 0xec000000 / 0xec004000 / 0xec300000 / 0xec304000
- *      CMD : 0xec500000 /            / 0xec008000                0xec308000
- */
-#define RDMA_SSI_I_N(addr, i)   (addr ##_reg - 0x00300000 + (0x40 * i) + 0x8)
-#define RDMA_SSI_O_N(addr, i)   (addr ##_reg - 0x00300000 + (0x40 * i) + 0xc)
-
-#define RDMA_SSIU_I_N(addr, i)  (addr ##_reg - 0x00441000 + (0x1000 * i))
-#define RDMA_SSIU_O_N(addr, i)  (addr ##_reg - 0x00441000 + (0x1000 * i))
-
-#define RDMA_SSIU_I_P(addr, i)  (addr ##_reg - 0x00141000 + (0x1000 * i))
-#define RDMA_SSIU_O_P(addr, i)  (addr ##_reg - 0x00141000 + (0x1000 * i))
-
-#define RDMA_SRC_I_N(addr, i)   (addr ##_reg - 0x00500000 + (0x400 * i))
-#define RDMA_SRC_O_N(addr, i)   (addr ##_reg - 0x004fc000 + (0x400 * i))
-
-#define RDMA_SRC_I_P(addr, i)   (addr ##_reg - 0x00200000 + (0x400 * i))
-#define RDMA_SRC_O_P(addr, i)   (addr ##_reg - 0x001fc000 + (0x400 * i))
-
-#define RDMA_CMD_O_N(addr, i)   (addr ##_reg - 0x004f8000 + (0x400 * i))
-#define RDMA_CMD_O_P(addr, i)   (addr ##_reg - 0x001f8000 + (0x400 * i))
-
-static dma_addr_t
-rsnd_gen2_dma_addr(struct rsnd_priv *priv,
-                   struct rsnd_mod *mod,
-                   int is_play, int is_from)
-{
-        struct platform_device *pdev = rsnd_priv_to_pdev(priv);
-        struct device *dev = rsnd_priv_to_dev(priv);
-        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
-        dma_addr_t ssi_reg = platform_get_resource(pdev,
-                                IORESOURCE_MEM, RSND_GEN2_SSI)->start;
-        dma_addr_t src_reg = platform_get_resource(pdev,
-                                IORESOURCE_MEM, RSND_GEN2_SCU)->start;
-        int is_ssi = !!(rsnd_io_to_mod_ssi(io) == mod);
-        int use_src = !!rsnd_io_to_mod_src(io);
-        int use_dvc = !!rsnd_io_to_mod_dvc(io);
-        int id = rsnd_mod_id(mod);
-        struct dma_addr {
-                dma_addr_t out_addr;
-                dma_addr_t in_addr;
-        } dma_addrs[3][2][3] = {
-                /* SRC */
-                {{{ 0,                          0 },
-                /* Capture */
-                  { RDMA_SRC_O_N(src, id),      RDMA_SRC_I_P(src, id) },
-                  { RDMA_CMD_O_N(src, id),      RDMA_SRC_I_P(src, id) } },
-                 /* Playback */
-                 {{ 0,                          0, },
-                  { RDMA_SRC_O_P(src, id),      RDMA_SRC_I_N(src, id) },
-                  { RDMA_CMD_O_P(src, id),      RDMA_SRC_I_N(src, id) } }
-                },
-                /* SSI */
-                /* Capture */
-                {{{ RDMA_SSI_O_N(ssi, id),      0 },
-                  { RDMA_SSIU_O_P(ssi, id),     0 },
-                  { RDMA_SSIU_O_P(ssi, id),     0 } },
-                 /* Playback */
-                 {{ 0,                          RDMA_SSI_I_N(ssi, id) },
-                  { 0,                          RDMA_SSIU_I_P(ssi, id) },
-                  { 0,                          RDMA_SSIU_I_P(ssi, id) } }
-                },
-                /* SSIU */
-                /* Capture */
-                {{{ RDMA_SSIU_O_N(ssi, id),     0 },
-                  { RDMA_SSIU_O_P(ssi, id),     0 },
-                  { RDMA_SSIU_O_P(ssi, id),     0 } },
-                 /* Playback */
-                 {{ 0,                          RDMA_SSIU_I_N(ssi, id) },
-                  { 0,                          RDMA_SSIU_I_P(ssi, id) },
-                  { 0,                          RDMA_SSIU_I_P(ssi, id) } } },
-        };
-
-        /* it shouldn't happen */
-        if (use_dvc && !use_src)
-                dev_err(dev, "DVC is selected without SRC\n");
-
-        /* use SSIU or SSI ? */
-        if (is_ssi && (0 == strcmp(rsnd_mod_dma_name(mod), "ssiu")))
-                is_ssi++;
-
-        return (is_from) ?
-                dma_addrs[is_ssi][is_play][use_src + use_dvc].out_addr :
-                dma_addrs[is_ssi][is_play][use_src + use_dvc].in_addr;
-}
-
-dma_addr_t rsnd_gen_dma_addr(struct rsnd_priv *priv,
-                             struct rsnd_mod *mod,
-                             int is_play, int is_from)
-{
-        /*
-         * gen1 uses default DMA addr
-         */
-        if (rsnd_is_gen1(priv))
-                return 0;
-
-        if (!mod)
-                return 0;
-
-        return rsnd_gen2_dma_addr(priv, mod, is_play, is_from);
-}
-
-/*
  *              Gen2
  */
 static int rsnd_gen2_probe(struct platform_device *pdev,
                            struct rsnd_priv *priv)
 {
-        struct device *dev = rsnd_priv_to_dev(priv);
         struct rsnd_regmap_field_conf conf_ssiu[] = {
                 RSND_GEN_S_REG(SSI_MODE0,       0x800),
                 RSND_GEN_S_REG(SSI_MODE1,       0x804),
@@ -368,18 +267,16 @@ static int rsnd_gen2_probe(struct platform_device *pdev,
         int ret_adg;
         int ret_ssi;
 
-        ret_ssiu = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSIU, conf_ssiu);
-        ret_scu  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SCU,  conf_scu);
-        ret_adg  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_ADG,  conf_adg);
-        ret_ssi  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSI,  conf_ssi);
+        ret_ssiu = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSIU, "ssiu", conf_ssiu);
+        ret_scu  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SCU,  "scu",  conf_scu);
+        ret_adg  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_ADG,  "adg",  conf_adg);
+        ret_ssi  = rsnd_gen_regmap_init(priv, 10, RSND_GEN2_SSI,  "ssi",  conf_ssi);
         if (ret_ssiu < 0 ||
             ret_scu  < 0 ||
             ret_adg  < 0 ||
             ret_ssi  < 0)
                 return ret_ssiu | ret_scu | ret_adg | ret_ssi;
 
-        dev_dbg(dev, "Gen2 is probed\n");
-
         return 0;
 }
 
@@ -390,7 +287,6 @@ static int rsnd_gen2_probe(struct platform_device *pdev,
 static int rsnd_gen1_probe(struct platform_device *pdev,
                            struct rsnd_priv *priv)
 {
-        struct device *dev = rsnd_priv_to_dev(priv);
         struct rsnd_regmap_field_conf conf_sru[] = {
                 RSND_GEN_S_REG(SRC_ROUTE_SEL,   0x00),
                 RSND_GEN_S_REG(SRC_TMG_SEL0,    0x08),
@@ -440,16 +336,14 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
         int ret_adg;
         int ret_ssi;
 
-        ret_sru  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_SRU,  conf_sru);
-        ret_adg  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_ADG,  conf_adg);
-        ret_ssi  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_SSI,  conf_ssi);
+        ret_sru  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_SRU, "sru", conf_sru);
+        ret_adg  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_ADG, "adg", conf_adg);
+        ret_ssi  = rsnd_gen_regmap_init(priv, 9, RSND_GEN1_SSI, "ssi", conf_ssi);
         if (ret_sru  < 0 ||
             ret_adg  < 0 ||
             ret_ssi  < 0)
                 return ret_sru | ret_adg | ret_ssi;
 
-        dev_dbg(dev, "Gen1 is probed\n");
-
         return 0;
 }
 
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index e7914bd610e2..4e6de6804cfb 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -170,21 +170,47 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod);
 /*
  *      R-Car DMA
  */
-struct rsnd_dma {
-        struct sh_dmae_slave    slave;
+struct rsnd_dma;
+struct rsnd_dma_ops {
+        void (*start)(struct rsnd_dma *dma);
+        void (*stop)(struct rsnd_dma *dma);
+        int (*init)(struct rsnd_priv *priv, struct rsnd_dma *dma, int id,
+                    struct rsnd_mod *mod_from, struct rsnd_mod *mod_to);
+        void  (*quit)(struct rsnd_dma *dma);
+};
+
+struct rsnd_dmaen {
         struct dma_chan         *chan;
-        enum dma_transfer_direction dir;
-        dma_addr_t              addr;
 };
 
+struct rsnd_dmapp {
+        int                     dmapp_id;
+        u32                     chcr;
+};
+
+struct rsnd_dma {
+        struct rsnd_dma_ops     *ops;
+        dma_addr_t              src_addr;
+        dma_addr_t              dst_addr;
+        union {
+                struct rsnd_dmaen en;
+                struct rsnd_dmapp pp;
+        } dma;
+};
+#define rsnd_dma_to_dmaen(dma)  (&(dma)->dma.en)
+#define rsnd_dma_to_dmapp(dma)  (&(dma)->dma.pp)
+
 void rsnd_dma_start(struct rsnd_dma *dma);
 void rsnd_dma_stop(struct rsnd_dma *dma);
-int rsnd_dma_available(struct rsnd_dma *dma);
-int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
-        int is_play, int id);
-void  rsnd_dma_quit(struct rsnd_priv *priv,
-                    struct rsnd_dma *dma);
+int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id);
+void  rsnd_dma_quit(struct rsnd_dma *dma);
+int rsnd_dma_probe(struct platform_device *pdev,
+                   const struct rsnd_of_data *of_data,
+                   struct rsnd_priv *priv);
+struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
+                                          struct rsnd_mod *mod, char *name);
 
+#define rsnd_dma_to_mod(_dma) container_of((_dma), struct rsnd_mod, dma)
 
 /*
  *      R-Car sound mod
@@ -198,7 +224,7 @@ enum rsnd_mod_type {
 
 struct rsnd_mod_ops {
         char *name;
-        char* (*dma_name)(struct rsnd_mod *mod);
+        struct dma_chan* (*dma_req)(struct rsnd_mod *mod);
         int (*probe)(struct rsnd_mod *mod,
                      struct rsnd_priv *priv);
         int (*remove)(struct rsnd_mod *mod,
@@ -213,6 +239,9 @@ struct rsnd_mod_ops {
                     struct rsnd_priv *priv);
         int (*pcm_new)(struct rsnd_mod *mod,
                        struct snd_soc_pcm_runtime *rtd);
+        int (*hw_params)(struct rsnd_mod *mod,
+                         struct snd_pcm_substream *substream,
+                         struct snd_pcm_hw_params *hw_params);
         int (*fallback)(struct rsnd_mod *mod,
                         struct rsnd_priv *priv);
 };
@@ -236,6 +265,9 @@ struct rsnd_mod {
  * 2    0: start        1: stop
  * 3    0: pcm_new
  * 4    0: fallback
+ *
+ * 31 bit is always called (see __rsnd_mod_call)
+ * 31   0: hw_params
  */
 #define __rsnd_mod_shift_probe          0
 #define __rsnd_mod_shift_remove         0
@@ -245,6 +277,7 @@ struct rsnd_mod {
 #define __rsnd_mod_shift_stop           2
 #define __rsnd_mod_shift_pcm_new        3
 #define __rsnd_mod_shift_fallback       4
+#define __rsnd_mod_shift_hw_params      31 /* always called */
 
 #define __rsnd_mod_call_probe           0
 #define __rsnd_mod_call_remove          1
@@ -254,28 +287,30 @@ struct rsnd_mod {
 #define __rsnd_mod_call_stop            1
 #define __rsnd_mod_call_pcm_new         0
 #define __rsnd_mod_call_fallback        0
+#define __rsnd_mod_call_hw_params       0
 
 #define rsnd_mod_to_priv(mod) (rsnd_io_to_priv(rsnd_mod_to_io(mod)))
 #define rsnd_mod_to_dma(mod) (&(mod)->dma)
-#define rsnd_dma_to_mod(_dma) container_of((_dma), struct rsnd_mod, dma)
 #define rsnd_mod_to_io(mod) ((mod)->io)
 #define rsnd_mod_id(mod) ((mod)->id)
-#define rsnd_mod_hw_start(mod)  clk_prepare_enable((mod)->clk)
-#define rsnd_mod_hw_stop(mod)   clk_disable_unprepare((mod)->clk)
+#define rsnd_mod_hw_start(mod)  clk_enable((mod)->clk)
+#define rsnd_mod_hw_stop(mod)   clk_disable((mod)->clk)
 
-void rsnd_mod_init(struct rsnd_mod *mod,
+int rsnd_mod_init(struct rsnd_mod *mod,
                    struct rsnd_mod_ops *ops,
                    struct clk *clk,
                    enum rsnd_mod_type type,
                    int id);
+void rsnd_mod_quit(struct rsnd_mod *mod);
 char *rsnd_mod_name(struct rsnd_mod *mod);
-char *rsnd_mod_dma_name(struct rsnd_mod *mod);
+struct dma_chan *rsnd_mod_dma_req(struct rsnd_mod *mod);
 
 /*
  *      R-Car sound DAI
  */
 #define RSND_DAI_NAME_SIZE      16
 struct rsnd_dai_stream {
+        char name[RSND_DAI_NAME_SIZE];
         struct snd_pcm_substream *substream;
         struct rsnd_mod *mod[RSND_MOD_MAX];
         struct rsnd_dai_path_info *info; /* rcar_snd.h */
@@ -331,9 +366,7 @@ int rsnd_gen_probe(struct platform_device *pdev,
 void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
                                struct rsnd_mod *mod,
                                enum rsnd_reg reg);
-dma_addr_t rsnd_gen_dma_addr(struct rsnd_priv *priv,
-                       struct rsnd_mod *mod,
-                       int is_play,  int is_from);
+phys_addr_t rsnd_gen_get_phy_addr(struct rsnd_priv *priv, int reg_id);
 
 #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)
@@ -389,6 +422,11 @@ struct rsnd_priv {
         void *adg;
 
         /*
+         * below value will be filled on rsnd_dma_probe()
+         */
+        void *dma;
+
+        /*
          * below value will be filled on rsnd_ssi_probe()
          */
         void *ssi;
@@ -414,19 +452,6 @@ struct rsnd_priv {
 #define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags)
 #define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags)
 
-#define rsnd_info_is_playback(priv, type)                               \
-({                                                                      \
-        struct rcar_snd_info *info = rsnd_priv_to_info(priv);           \
-        int i, is_play = 0;                                             \
-        for (i = 0; i < info->dai_info_nr; i++) {                       \
-                if (info->dai_info[i].playback.type == (type)->info) {  \
-                        is_play = 1;                                    \
-                        break;                                          \
-                }                                                       \
-        }                                                               \
-        is_play;                                                        \
-})
-
 /*
  *      rsnd_kctrl
  */
@@ -480,6 +505,8 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod,
 int rsnd_src_probe(struct platform_device *pdev,
                    const struct rsnd_of_data *of_data,
                    struct rsnd_priv *priv);
+void rsnd_src_remove(struct platform_device *pdev,
+                     struct rsnd_priv *priv);
 struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *priv, int id);
 unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
                                    struct rsnd_dai_stream *io,
@@ -498,9 +525,12 @@ int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod);
 int rsnd_ssi_probe(struct platform_device *pdev,
                    const struct rsnd_of_data *of_data,
                    struct rsnd_priv *priv);
+void rsnd_ssi_remove(struct platform_device *pdev,
+                     struct rsnd_priv *priv);
 struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);
 int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);
 int rsnd_ssi_is_dma_mode(struct rsnd_mod *mod);
+int rsnd_ssi_use_busif(struct rsnd_mod *mod);
 
 /*
  *      R-Car DVC
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
new file mode 100644
index 000000000000..a68517afe615
--- /dev/null
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -0,0 +1,512 @@
+/*
+ * Renesas Sampling Rate Convert Sound Card for DPCM
+ *
+ * Copyright (C) 2015 Renesas Solutions Corp.
+ * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * based on ${LINUX}/sound/soc/generic/simple-card.c
+ *
+ * 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.
+ */
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/string.h>
+#include <sound/jack.h>
+#include <sound/soc.h>
+#include <sound/soc-dai.h>
+
+struct rsrc_card_of_data {
+        const char *prefix;
+        const struct snd_soc_dapm_route *routes;
+        int num_routes;
+};
+
+static const struct snd_soc_dapm_route routes_ssi0_ak4642[] = {
+        {"ak4642 Playback", NULL, "DAI0 Playback"},
+        {"DAI0 Capture", NULL, "ak4642 Capture"},
+};
+
+static const struct rsrc_card_of_data routes_of_ssi0_ak4642 = {
+        .prefix         = "ak4642",
+        .routes         = routes_ssi0_ak4642,
+        .num_routes     = ARRAY_SIZE(routes_ssi0_ak4642),
+};
+
+static const struct of_device_id rsrc_card_of_match[] = {
+        { .compatible = "renesas,rsrc-card,lager",      .data = &routes_of_ssi0_ak4642 },
+        { .compatible = "renesas,rsrc-card,koelsch",    .data = &routes_of_ssi0_ak4642 },
+        {},
+};
+MODULE_DEVICE_TABLE(of, rsrc_card_of_match);
+
+struct rsrc_card_dai {
+        const char *name;
+        unsigned int fmt;
+        unsigned int sysclk;
+        struct clk *clk;
+};
+
+#define RSRC_FB_NUM     2 /* FE/BE */
+#define IDX_CPU         0
+#define IDX_CODEC       1
+struct rsrc_card_priv {
+        struct snd_soc_card snd_card;
+        struct rsrc_card_dai_props {
+                struct rsrc_card_dai cpu_dai;
+                struct rsrc_card_dai codec_dai;
+        } dai_props[RSRC_FB_NUM];
+        struct snd_soc_codec_conf codec_conf;
+        struct snd_soc_dai_link dai_link[RSRC_FB_NUM];
+        u32 convert_rate;
+};
+
+#define rsrc_priv_to_dev(priv) ((priv)->snd_card.dev)
+#define rsrc_priv_to_link(priv, i) ((priv)->snd_card.dai_link + i)
+#define rsrc_priv_to_props(priv, i) ((priv)->dai_props + i)
+#define rsrc_dev_to_of_data(dev) (of_match_device(rsrc_card_of_match, (dev))->data)
+
+static int rsrc_card_startup(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct rsrc_card_priv *priv =   snd_soc_card_get_drvdata(rtd->card);
+        struct rsrc_card_dai_props *dai_props =
+                &priv->dai_props[rtd - rtd->card->rtd];
+        int ret;
+
+        ret = clk_prepare_enable(dai_props->cpu_dai.clk);
+        if (ret)
+                return ret;
+
+        ret = clk_prepare_enable(dai_props->codec_dai.clk);
+        if (ret)
+                clk_disable_unprepare(dai_props->cpu_dai.clk);
+
+        return ret;
+}
+
+static void rsrc_card_shutdown(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct rsrc_card_priv *priv =   snd_soc_card_get_drvdata(rtd->card);
+        struct rsrc_card_dai_props *dai_props =
+                &priv->dai_props[rtd - rtd->card->rtd];
+
+        clk_disable_unprepare(dai_props->cpu_dai.clk);
+
+        clk_disable_unprepare(dai_props->codec_dai.clk);
+}
+
+static struct snd_soc_ops rsrc_card_ops = {
+        .startup = rsrc_card_startup,
+        .shutdown = rsrc_card_shutdown,
+};
+
+static int __rsrc_card_dai_init(struct snd_soc_dai *dai,
+                                struct rsrc_card_dai *set)
+{
+        int ret;
+
+        if (set->fmt) {
+                ret = snd_soc_dai_set_fmt(dai, set->fmt);
+                if (ret && ret != -ENOTSUPP) {
+                        dev_err(dai->dev, "set_fmt error\n");
+                        goto err;
+                }
+        }
+
+        if (set->sysclk) {
+                ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);
+                if (ret && ret != -ENOTSUPP) {
+                        dev_err(dai->dev, "set_sysclk error\n");
+                        goto err;
+                }
+        }
+
+        ret = 0;
+
+err:
+        return ret;
+}
+
+static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct rsrc_card_priv *priv =   snd_soc_card_get_drvdata(rtd->card);
+        struct snd_soc_dai *codec = rtd->codec_dai;
+        struct snd_soc_dai *cpu = rtd->cpu_dai;
+        struct rsrc_card_dai_props *dai_props;
+        int num, ret;
+
+        num = rtd - rtd->card->rtd;
+        dai_props = &priv->dai_props[num];
+        ret = __rsrc_card_dai_init(codec, &dai_props->codec_dai);
+        if (ret < 0)
+                return ret;
+
+        ret = __rsrc_card_dai_init(cpu, &dai_props->cpu_dai);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int rsrc_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
+                                        struct snd_pcm_hw_params *params)
+{
+        struct rsrc_card_priv *priv = snd_soc_card_get_drvdata(rtd->card);
+        struct snd_interval *rate = hw_param_interval(params,
+                                                      SNDRV_PCM_HW_PARAM_RATE);
+
+        if (!priv->convert_rate)
+                return 0;
+
+        rate->min = rate->max = priv->convert_rate;
+
+        return 0;
+}
+
+static int
+rsrc_card_sub_parse_of(struct rsrc_card_priv *priv,
+                       struct device_node *np,
+                       struct rsrc_card_dai *dai,
+                       struct snd_soc_dai_link *dai_link,
+                       int *args_count)
+{
+        struct device *dev = rsrc_priv_to_dev(priv);
+        const struct rsrc_card_of_data *of_data = rsrc_dev_to_of_data(dev);
+        struct of_phandle_args args;
+        struct device_node **p_node;
+        struct clk *clk;
+        const char **dai_name;
+        const char **name;
+        u32 val;
+        int ret;
+
+        if (args_count) {
+                p_node          = &dai_link->cpu_of_node;
+                dai_name        = &dai_link->cpu_dai_name;
+                name            = &dai_link->cpu_name;
+        } else {
+                p_node          = &dai_link->codec_of_node;
+                dai_name        = &dai_link->codec_dai_name;
+                name            = &dai_link->codec_name;
+        }
+
+        if (!np) {
+                /* use snd-soc-dummy */
+                *p_node         = NULL;
+                *dai_name       = "snd-soc-dummy-dai";
+                *name           = "snd-soc-dummy";
+                return 0;
+        }
+
+        /*
+         * Get node via "sound-dai = <&phandle port>"
+         * it will be used as xxx_of_node on soc_bind_dai_link()
+         */
+        ret = of_parse_phandle_with_args(np, "sound-dai",
+                                         "#sound-dai-cells", 0, &args);
+        if (ret)
+                return ret;
+
+        *p_node = args.np;
+
+        /* Get dai->name */
+        ret = snd_soc_of_get_dai_name(np, dai_name);
+        if (ret < 0)
+                return ret;
+
+        /*
+         * FIXME
+         *
+         * rsrc assumes DPCM playback/capture
+         */
+        dai_link->dpcm_playback = 1;
+        dai_link->dpcm_capture = 1;
+
+        if (args_count) {
+                *args_count = args.args_count;
+                dai_link->dynamic = 1;
+        } else {
+                dai_link->no_pcm = 1;
+                priv->codec_conf.of_node = (*p_node);
+                priv->codec_conf.name_prefix = of_data->prefix;
+        }
+
+        /*
+         * Parse dai->sysclk come from "clocks = <&xxx>"
+         * (if system has common clock)
+         *  or "system-clock-frequency = <xxx>"
+         *  or device's module clock.
+         */
+        if (of_property_read_bool(np, "clocks")) {
+                clk = of_clk_get(np, 0);
+                if (IS_ERR(clk)) {
+                        ret = PTR_ERR(clk);
+                        return ret;
+                }
+
+                dai->sysclk = clk_get_rate(clk);
+                dai->clk = clk;
+        } else if (!of_property_read_u32(np, "system-clock-frequency", &val)) {
+                dai->sysclk = val;
+        } else {
+                clk = of_clk_get(args.np, 0);
+                if (!IS_ERR(clk))
+                        dai->sysclk = clk_get_rate(clk);
+        }
+
+        return 0;
+}
+
+static int rsrc_card_parse_daifmt(struct device_node *node,
+                                  struct rsrc_card_priv *priv,
+                                  struct device_node *codec,
+                                  int idx)
+{
+        struct device_node *bitclkmaster = NULL;
+        struct device_node *framemaster = NULL;
+        struct rsrc_card_dai_props *dai_props = rsrc_priv_to_props(priv, idx);
+        struct rsrc_card_dai *cpu_dai = &dai_props->cpu_dai;
+        struct rsrc_card_dai *codec_dai = &dai_props->codec_dai;
+        unsigned int daifmt;
+
+        daifmt = snd_soc_of_parse_daifmt(node, NULL,
+                                         &bitclkmaster, &framemaster);
+        daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
+
+        if (!bitclkmaster && !framemaster)
+                return -EINVAL;
+
+        if (codec == bitclkmaster)
+                daifmt |= (codec == framemaster) ?
+                        SND_SOC_DAIFMT_CBM_CFM : SND_SOC_DAIFMT_CBM_CFS;
+        else
+                daifmt |= (codec == framemaster) ?
+                        SND_SOC_DAIFMT_CBS_CFM : SND_SOC_DAIFMT_CBS_CFS;
+
+        cpu_dai->fmt    = daifmt;
+        codec_dai->fmt  = daifmt;
+
+        of_node_put(bitclkmaster);
+        of_node_put(framemaster);
+
+        return 0;
+}
+
+static int rsrc_card_dai_link_of(struct device_node *node,
+                                 struct rsrc_card_priv *priv,
+                                 int idx)
+{
+        struct device *dev = rsrc_priv_to_dev(priv);
+        struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx);
+        struct rsrc_card_dai_props *dai_props = rsrc_priv_to_props(priv, idx);
+        struct device_node *cpu = NULL;
+        struct device_node *codec = NULL;
+        char *name;
+        char prop[128];
+        int ret, cpu_args;
+
+        cpu = of_get_child_by_name(node, "cpu");
+        codec = of_get_child_by_name(node, "codec");
+
+        if (!cpu || !codec) {
+                ret = -EINVAL;
+                dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop);
+                goto dai_link_of_err;
+        }
+
+        ret = rsrc_card_parse_daifmt(node, priv, codec, idx);
+        if (ret < 0)
+                goto dai_link_of_err;
+
+        ret = rsrc_card_sub_parse_of(priv, (idx == IDX_CPU) ? cpu : NULL,
+                                     &dai_props->cpu_dai,
+                                     dai_link,
+                                     &cpu_args);
+        if (ret < 0)
+                goto dai_link_of_err;
+
+        ret = rsrc_card_sub_parse_of(priv, (idx == IDX_CODEC) ? codec : NULL,
+                                     &dai_props->codec_dai,
+                                     dai_link,
+                                     NULL);
+        if (ret < 0)
+                goto dai_link_of_err;
+
+        if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) {
+                ret = -EINVAL;
+                goto dai_link_of_err;
+        }
+
+        /* Simple Card assumes platform == cpu */
+        dai_link->platform_of_node = dai_link->cpu_of_node;
+
+        /* DAI link name is created from CPU/CODEC dai name */
+        name = devm_kzalloc(dev,
+                            strlen(dai_link->cpu_dai_name)   +
+                            strlen(dai_link->codec_dai_name) + 2,
+                            GFP_KERNEL);
+        if (!name) {
+                ret = -ENOMEM;
+                goto dai_link_of_err;
+        }
+
+        sprintf(name, "%s-%s", dai_link->cpu_dai_name,
+                dai_link->codec_dai_name);
+        dai_link->name = dai_link->stream_name = name;
+        dai_link->ops = &rsrc_card_ops;
+        dai_link->init = rsrc_card_dai_init;
+
+        if (idx == IDX_CODEC)
+                dai_link->be_hw_params_fixup = rsrc_card_be_hw_params_fixup;
+
+        dev_dbg(dev, "\tname : %s\n", dai_link->stream_name);
+        dev_dbg(dev, "\tcpu : %s / %04x / %d\n",
+                dai_link->cpu_dai_name,
+                dai_props->cpu_dai.fmt,
+                dai_props->cpu_dai.sysclk);
+        dev_dbg(dev, "\tcodec : %s / %04x / %d\n",
+                dai_link->codec_dai_name,
+                dai_props->codec_dai.fmt,
+                dai_props->codec_dai.sysclk);
+
+        /*
+         * In soc_bind_dai_link() will check cpu name after
+         * of_node matching if dai_link has cpu_dai_name.
+         * but, it will never match if name was created by
+         * fmt_single_name() remove cpu_dai_name if cpu_args
+         * was 0. See:
+         *      fmt_single_name()
+         *      fmt_multiple_name()
+         */
+        if (!cpu_args)
+                dai_link->cpu_dai_name = NULL;
+
+dai_link_of_err:
+        of_node_put(cpu);
+        of_node_put(codec);
+
+        return ret;
+}
+
+static int rsrc_card_parse_of(struct device_node *node,
+                              struct rsrc_card_priv *priv)
+{
+        struct device *dev = rsrc_priv_to_dev(priv);
+        const struct rsrc_card_of_data *of_data = rsrc_dev_to_of_data(dev);
+        int ret;
+        int i;
+
+        if (!node)
+                return -EINVAL;
+
+        /* Parse the card name from DT */
+        snd_soc_of_parse_card_name(&priv->snd_card, "card-name");
+
+        /* DAPM routes */
+        priv->snd_card.of_dapm_routes           = of_data->routes;
+        priv->snd_card.num_of_dapm_routes       = of_data->num_routes;
+
+        /* sampling rate convert */
+        of_property_read_u32(node, "convert-rate", &priv->convert_rate);
+
+        dev_dbg(dev, "New rsrc-audio-card: %s (%d)\n",
+                priv->snd_card.name ? priv->snd_card.name : "",
+                priv->convert_rate);
+
+        /* FE/BE */
+        for (i = 0; i < RSRC_FB_NUM; i++) {
+                ret = rsrc_card_dai_link_of(node, priv, i);
+                if (ret < 0)
+                        return ret;
+        }
+
+        if (!priv->snd_card.name)
+                priv->snd_card.name = priv->snd_card.dai_link->name;
+
+        return 0;
+}
+
+/* Decrease the reference count of the device nodes */
+static int rsrc_card_unref(struct snd_soc_card *card)
+{
+        struct snd_soc_dai_link *dai_link;
+        int num_links;
+
+        for (num_links = 0, dai_link = card->dai_link;
+             num_links < card->num_links;
+             num_links++, dai_link++) {
+                of_node_put(dai_link->cpu_of_node);
+                of_node_put(dai_link->codec_of_node);
+        }
+        return 0;
+}
+
+static int rsrc_card_probe(struct platform_device *pdev)
+{
+        struct rsrc_card_priv *priv;
+        struct snd_soc_dai_link *dai_link;
+        struct device_node *np = pdev->dev.of_node;
+        struct device *dev = &pdev->dev;
+        int ret;
+
+        /* Allocate the private data */
+        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        /* Init snd_soc_card */
+        priv->snd_card.owner = THIS_MODULE;
+        priv->snd_card.dev = dev;
+        dai_link = priv->dai_link;
+        priv->snd_card.dai_link = dai_link;
+        priv->snd_card.num_links = RSRC_FB_NUM;
+        priv->snd_card.codec_conf = &priv->codec_conf;
+        priv->snd_card.num_configs = 1;
+
+        ret = rsrc_card_parse_of(np, priv);
+        if (ret < 0) {
+                if (ret != -EPROBE_DEFER)
+                        dev_err(dev, "parse error %d\n", ret);
+                goto err;
+        }
+
+        snd_soc_card_set_drvdata(&priv->snd_card, priv);
+
+        ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card);
+        if (ret >= 0)
+                return ret;
+err:
+        rsrc_card_unref(&priv->snd_card);
+
+        return ret;
+}
+
+static int rsrc_card_remove(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        return rsrc_card_unref(card);
+}
+
+static struct platform_driver rsrc_card = {
+        .driver = {
+                .name = "renesas-src-audio-card",
+                .of_match_table = rsrc_card_of_match,
+        },
+        .probe = rsrc_card_probe,
+        .remove = rsrc_card_remove,
+};
+
+module_platform_driver(rsrc_card);
+
+MODULE_ALIAS("platform:renesas-src-audio-card");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Renesas Sampling Rate Convert Sound Card");
+MODULE_AUTHOR("Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>");
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 81c182b4bad5..3beb32eb412a 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -22,16 +22,20 @@
 struct rsnd_src {
         struct rsnd_src_platform_info *info; /* rcar_snd.h */
         struct rsnd_mod mod;
+        struct rsnd_kctrl_cfg_s sen;  /* sync convert enable */
+        struct rsnd_kctrl_cfg_s sync; /* sync convert */
+        u32 convert_rate; /* sampling rate convert */
         int err;
 };
 
 #define RSND_SRC_NAME_SIZE 16
 
-#define rsnd_src_convert_rate(p) ((p)->info->convert_rate)
+#define rsnd_enable_sync_convert(src) ((src)->sen.val)
+#define rsnd_src_of_node(priv) \
+        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,src")
+
 #define rsnd_mod_to_src(_mod)                           \
         container_of((_mod), struct rsnd_src, mod)
-#define rsnd_src_dma_available(src) \
-        rsnd_dma_available(rsnd_mod_to_dma(&(src)->mod))
 
 #define for_each_rsnd_src(pos, priv, i)                         \
         for ((i) = 0;                                           \
@@ -113,6 +117,17 @@ struct rsnd_src {
 /*
  *              Gen1/Gen2 common functions
  */
+static struct dma_chan *rsnd_src_dma_req(struct rsnd_mod *mod)
+{
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        int is_play = rsnd_io_is_play(io);
+
+        return rsnd_dma_request_channel(rsnd_src_of_node(priv),
+                                        mod,
+                                        is_play ? "rx" : "tx");
+}
+
 int rsnd_src_ssiu_start(struct rsnd_mod *ssi_mod,
                         int use_busif)
 {
@@ -220,6 +235,30 @@ int rsnd_src_ssi_irq_disable(struct rsnd_mod *ssi_mod)
         return 0;
 }
 
+static u32 rsnd_src_convert_rate(struct rsnd_src *src)
+{
+        struct rsnd_mod *mod = &src->mod;
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
+        u32 convert_rate;
+
+        if (!runtime)
+                return 0;
+
+        if (!rsnd_enable_sync_convert(src))
+                return src->convert_rate;
+
+        convert_rate = src->sync.val;
+
+        if (!convert_rate)
+                convert_rate = src->convert_rate;
+
+        if (!convert_rate)
+                convert_rate = runtime->rate;
+
+        return convert_rate;
+}
+
 unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
                                    struct rsnd_dai_stream *io,
                                    struct snd_pcm_runtime *runtime)
@@ -276,7 +315,43 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod)
         return 0;
 }
 
-static int rsnd_src_init(struct rsnd_mod *mod)
+static int rsnd_src_hw_params(struct rsnd_mod *mod,
+                              struct snd_pcm_substream *substream,
+                              struct snd_pcm_hw_params *fe_params)
+{
+        struct rsnd_src *src = rsnd_mod_to_src(mod);
+        struct snd_soc_pcm_runtime *fe = substream->private_data;
+
+        /* default value (mainly for non-DT) */
+        src->convert_rate = src->info->convert_rate;
+
+        /*
+         * SRC assumes that it is used under DPCM if user want to use
+         * sampling rate convert. Then, SRC should be FE.
+         * And then, this function will be called *after* BE settings.
+         * this means, each BE already has fixuped hw_params.
+         * see
+         *      dpcm_fe_dai_hw_params()
+         *      dpcm_be_dai_hw_params()
+         */
+        if (fe->dai_link->dynamic) {
+                int stream = substream->stream;
+                struct snd_soc_dpcm *dpcm;
+                struct snd_pcm_hw_params *be_params;
+
+                list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) {
+                        be_params = &dpcm->hw_params;
+
+                        if (params_rate(fe_params) != params_rate(be_params))
+                                src->convert_rate = params_rate(be_params);
+                }
+        }
+
+        return 0;
+}
+
+static int rsnd_src_init(struct rsnd_mod *mod,
+                         struct rsnd_priv *priv)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -284,6 +359,9 @@ static int rsnd_src_init(struct rsnd_mod *mod)
 
         src->err = 0;
 
+        /* reset sync convert_rate */
+        src->sync.val = 0;
+
         /*
          * Initialize the operation of the SRC internal circuits
          * see rsnd_src_start()
@@ -305,6 +383,11 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
                 dev_warn(dev, "%s[%d] under/over flow err = %d\n",
                          rsnd_mod_name(mod), rsnd_mod_id(mod), src->err);
 
+        src->convert_rate = 0;
+
+        /* reset sync convert_rate */
+        src->sync.val = 0;
+
         return 0;
 }
 
@@ -448,23 +531,12 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod)
         return 0;
 }
 
-static int rsnd_src_probe_gen1(struct rsnd_mod *mod,
-                               struct rsnd_priv *priv)
-{
-        struct device *dev = rsnd_priv_to_dev(priv);
-
-        dev_dbg(dev, "%s[%d] (Gen1) is probed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
-
-        return 0;
-}
-
 static int rsnd_src_init_gen1(struct rsnd_mod *mod,
                               struct rsnd_priv *priv)
 {
         int ret;
 
-        ret = rsnd_src_init(mod);
+        ret = rsnd_src_init(mod, priv);
         if (ret < 0)
                 return ret;
 
@@ -505,11 +577,12 @@ static int rsnd_src_stop_gen1(struct rsnd_mod *mod,
 
 static struct rsnd_mod_ops rsnd_src_gen1_ops = {
         .name   = SRC_NAME,
-        .probe  = rsnd_src_probe_gen1,
+        .dma_req = rsnd_src_dma_req,
         .init   = rsnd_src_init_gen1,
         .quit   = rsnd_src_quit,
         .start  = rsnd_src_start_gen1,
         .stop   = rsnd_src_stop_gen1,
+        .hw_params = rsnd_src_hw_params,
 };
 
 /*
@@ -607,13 +680,17 @@ static irqreturn_t rsnd_src_interrupt_gen2(int irq, void *data)
 
         if (rsnd_src_error_record_gen2(mod)) {
                 struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+                struct rsnd_src *src = rsnd_mod_to_src(mod);
                 struct device *dev = rsnd_priv_to_dev(priv);
 
-                _rsnd_src_stop_gen2(mod);
-                _rsnd_src_start_gen2(mod);
-
                 dev_dbg(dev, "%s[%d] restart\n",
                         rsnd_mod_name(mod), rsnd_mod_id(mod));
+
+                _rsnd_src_stop_gen2(mod);
+                if (src->err < 1024)
+                        _rsnd_src_start_gen2(mod);
+                else
+                        dev_warn(dev, "no more SRC restart\n");
         }
 
         return IRQ_HANDLED;
@@ -627,6 +704,7 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod)
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         u32 convert_rate = rsnd_src_convert_rate(src);
+        u32 cr, route;
         uint ratio;
         int ret;
 
@@ -647,13 +725,21 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod)
         if (ret < 0)
                 return ret;
 
-        rsnd_mod_write(mod, SRC_SRCCR, 0x00011110);
-
+        cr      = 0x00011110;
+        route   = 0x0;
         if (convert_rate) {
-                /* Gen1/Gen2 are not compatible */
-                rsnd_mod_write(mod, SRC_ROUTE_MODE0, 1);
+                route   = 0x1;
+
+                if (rsnd_enable_sync_convert(src)) {
+                        cr |= 0x1;
+                        route |= rsnd_io_is_play(io) ?
+                                (0x1 << 24) : (0x1 << 25);
+                }
         }
 
+        rsnd_mod_write(mod, SRC_SRCCR, cr);
+        rsnd_mod_write(mod, SRC_ROUTE_MODE0, route);
+
         switch (rsnd_mod_id(mod)) {
         case 5:
         case 6:
@@ -708,24 +794,12 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
                                        IRQF_SHARED,
                                        dev_name(dev), mod);
                 if (ret)
-                        goto rsnd_src_probe_gen2_fail;
+                        return ret;
         }
 
         ret = rsnd_dma_init(priv,
                             rsnd_mod_to_dma(mod),
-                            rsnd_info_is_playback(priv, src),
                             src->info->dma_id);
-        if (ret)
-                goto rsnd_src_probe_gen2_fail;
-
-        dev_dbg(dev, "%s[%d] (Gen2) is probed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
-
-        return ret;
-
-rsnd_src_probe_gen2_fail:
-        dev_err(dev, "%s[%d] (Gen2) failed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
 
         return ret;
 }
@@ -733,7 +807,7 @@ rsnd_src_probe_gen2_fail:
 static int rsnd_src_remove_gen2(struct rsnd_mod *mod,
                                 struct rsnd_priv *priv)
 {
-        rsnd_dma_quit(priv, rsnd_mod_to_dma(mod));
+        rsnd_dma_quit(rsnd_mod_to_dma(mod));
 
         return 0;
 }
@@ -743,7 +817,7 @@ static int rsnd_src_init_gen2(struct rsnd_mod *mod,
 {
         int ret;
 
-        ret = rsnd_src_init(mod);
+        ret = rsnd_src_init(mod, priv);
         if (ret < 0)
                 return ret;
 
@@ -778,14 +852,91 @@ static int rsnd_src_stop_gen2(struct rsnd_mod *mod,
         return ret;
 }
 
+static void rsnd_src_reconvert_update(struct rsnd_mod *mod)
+{
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
+        struct rsnd_src *src = rsnd_mod_to_src(mod);
+        u32 convert_rate = rsnd_src_convert_rate(src);
+        u32 fsrate;
+
+        if (!runtime)
+                return;
+
+        if (!convert_rate)
+                convert_rate = runtime->rate;
+
+        fsrate = 0x0400000 / convert_rate * runtime->rate;
+
+        /* update IFS */
+        rsnd_mod_write(mod, SRC_IFSVR, fsrate);
+}
+
+static int rsnd_src_pcm_new(struct rsnd_mod *mod,
+                            struct snd_soc_pcm_runtime *rtd)
+{
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
+        struct rsnd_src *src = rsnd_mod_to_src(mod);
+        int ret;
+
+        /*
+         * enable SRC sync convert if possible
+         */
+
+        /*
+         * Gen1 is not supported
+         */
+        if (rsnd_is_gen1(priv))
+                return 0;
+
+        /*
+         * SRC sync convert needs clock master
+         */
+        if (!rsnd_rdai_is_clk_master(rdai))
+                return 0;
+
+        /*
+         * We can't use SRC sync convert
+         * if it has DVC
+         */
+        if (rsnd_io_to_mod_dvc(io))
+                return 0;
+
+        /*
+         * enable sync convert
+         */
+        ret = rsnd_kctrl_new_s(mod, rtd,
+                               rsnd_io_is_play(io) ?
+                               "SRC Out Rate Switch" :
+                               "SRC In Rate Switch",
+                               rsnd_src_reconvert_update,
+                               &src->sen, 1);
+        if (ret < 0)
+                return ret;
+
+        ret = rsnd_kctrl_new_s(mod, rtd,
+                               rsnd_io_is_play(io) ?
+                               "SRC Out Rate" :
+                               "SRC In Rate",
+                               rsnd_src_reconvert_update,
+                               &src->sync, 192000);
+
+        return ret;
+}
+
 static struct rsnd_mod_ops rsnd_src_gen2_ops = {
         .name   = SRC_NAME,
+        .dma_req = rsnd_src_dma_req,
         .probe  = rsnd_src_probe_gen2,
         .remove = rsnd_src_remove_gen2,
         .init   = rsnd_src_init_gen2,
         .quit   = rsnd_src_quit,
         .start  = rsnd_src_start_gen2,
         .stop   = rsnd_src_stop_gen2,
+        .hw_params = rsnd_src_hw_params,
+        .pcm_new = rsnd_src_pcm_new,
 };
 
 struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *priv, int id)
@@ -810,7 +961,7 @@ static void rsnd_of_parse_src(struct platform_device *pdev,
         if (!of_data)
                 return;
 
-        src_node = of_get_child_by_name(dev->of_node, "rcar_sound,src");
+        src_node = rsnd_src_of_node(priv);
         if (!src_node)
                 return;
 
@@ -850,7 +1001,7 @@ int rsnd_src_probe(struct platform_device *pdev,
         struct rsnd_mod_ops *ops;
         struct clk *clk;
         char name[RSND_SRC_NAME_SIZE];
-        int i, nr;
+        int i, nr, ret;
 
         ops = NULL;
         if (rsnd_is_gen1(priv))
@@ -890,10 +1041,21 @@ int rsnd_src_probe(struct platform_device *pdev,
 
                 src->info = &info->src_info[i];
 
-                rsnd_mod_init(&src->mod, ops, clk, RSND_MOD_SRC, i);
-
-                dev_dbg(dev, "SRC%d probed\n", i);
+                ret = rsnd_mod_init(&src->mod, ops, clk, RSND_MOD_SRC, i);
+                if (ret)
+                        return ret;
         }
 
         return 0;
 }
+
+void rsnd_src_remove(struct platform_device *pdev,
+                     struct rsnd_priv *priv)
+{
+        struct rsnd_src *src;
+        int i;
+
+        for_each_rsnd_src(src, priv, i) {
+                rsnd_mod_quit(&src->mod);
+        }
+}
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 9e7b627c08e2..7bb9c087f3dc 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -80,13 +80,13 @@ struct rsnd_ssi {
 #define rsnd_mod_to_ssi(_mod) container_of((_mod), struct rsnd_ssi, mod)
 #define rsnd_dma_to_ssi(dma)  rsnd_mod_to_ssi(rsnd_dma_to_mod(dma))
 #define rsnd_ssi_pio_available(ssi) ((ssi)->info->irq > 0)
-#define rsnd_ssi_dma_available(ssi) \
-        rsnd_dma_available(rsnd_mod_to_dma(&(ssi)->mod))
 #define rsnd_ssi_clk_from_parent(ssi) ((ssi)->parent)
 #define rsnd_ssi_mode_flags(p) ((p)->info->flags)
 #define rsnd_ssi_dai_id(ssi) ((ssi)->info->dai_id)
+#define rsnd_ssi_of_node(priv) \
+        of_get_child_by_name(rsnd_priv_to_dev(priv)->of_node, "rcar_sound,ssi")
 
-static int rsnd_ssi_use_busif(struct rsnd_mod *mod)
+int rsnd_ssi_use_busif(struct rsnd_mod *mod)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
@@ -416,11 +416,14 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
                 /*
                  * restart SSI
                  */
-                rsnd_ssi_stop(mod, priv);
-                rsnd_ssi_start(mod, priv);
-
                 dev_dbg(dev, "%s[%d] restart\n",
                         rsnd_mod_name(mod), rsnd_mod_id(mod));
+
+                rsnd_ssi_stop(mod, priv);
+                if (ssi->err < 1024)
+                        rsnd_ssi_start(mod, priv);
+                else
+                        dev_warn(dev, "no more SSI restart\n");
         }
 
         rsnd_ssi_record_error(ssi, status);
@@ -442,12 +445,6 @@ static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
                                rsnd_ssi_interrupt,
                                IRQF_SHARED,
                                dev_name(dev), ssi);
-        if (ret)
-                dev_err(dev, "%s[%d] (PIO) request interrupt failed\n",
-                        rsnd_mod_name(mod), rsnd_mod_id(mod));
-        else
-                dev_dbg(dev, "%s[%d] (PIO) is probed\n",
-                        rsnd_mod_name(mod), rsnd_mod_id(mod));
 
         return ret;
 }
@@ -474,23 +471,11 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
                                IRQF_SHARED,
                                dev_name(dev), ssi);
         if (ret)
-                goto rsnd_ssi_dma_probe_fail;
+                return ret;
 
         ret = rsnd_dma_init(
                 priv, rsnd_mod_to_dma(mod),
-                rsnd_info_is_playback(priv, ssi),
                 dma_id);
-        if (ret)
-                goto rsnd_ssi_dma_probe_fail;
-
-        dev_dbg(dev, "%s[%d] (DMA) is probed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
-
-        return ret;
-
-rsnd_ssi_dma_probe_fail:
-        dev_err(dev, "%s[%d] (DMA) is failed\n",
-                rsnd_mod_name(mod), rsnd_mod_id(mod));
 
         return ret;
 }
@@ -502,7 +487,7 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
         struct device *dev = rsnd_priv_to_dev(priv);
         int irq = ssi->info->irq;
 
-        rsnd_dma_quit(priv, rsnd_mod_to_dma(mod));
+        rsnd_dma_quit(rsnd_mod_to_dma(mod));
 
         /* PIO will request IRQ again */
         devm_free_irq(dev, irq, ssi);
@@ -554,14 +539,25 @@ static int rsnd_ssi_dma_stop(struct rsnd_mod *mod,
         return 0;
 }
 
-static char *rsnd_ssi_dma_name(struct rsnd_mod *mod)
+static struct dma_chan *rsnd_ssi_dma_req(struct rsnd_mod *mod)
 {
-        return rsnd_ssi_use_busif(mod) ? "ssiu" : SSI_NAME;
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        int is_play = rsnd_io_is_play(io);
+        char *name;
+
+        if (rsnd_ssi_use_busif(mod))
+                name = is_play ? "rxu" : "txu";
+        else
+                name = is_play ? "rx" : "tx";
+
+        return rsnd_dma_request_channel(rsnd_ssi_of_node(priv),
+                                        mod, name);
 }
 
 static struct rsnd_mod_ops rsnd_ssi_dma_ops = {
         .name   = SSI_NAME,
-        .dma_name = rsnd_ssi_dma_name,
+        .dma_req = rsnd_ssi_dma_req,
         .probe  = rsnd_ssi_dma_probe,
         .remove = rsnd_ssi_dma_remove,
         .init   = rsnd_ssi_init,
@@ -636,7 +632,7 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev,
         if (!of_data)
                 return;
 
-        node = of_get_child_by_name(dev->of_node, "rcar_sound,ssi");
+        node = rsnd_ssi_of_node(priv);
         if (!node)
                 return;
 
@@ -697,7 +693,7 @@ int rsnd_ssi_probe(struct platform_device *pdev,
         struct clk *clk;
         struct rsnd_ssi *ssi;
         char name[RSND_SSI_NAME_SIZE];
-        int i, nr;
+        int i, nr, ret;
 
         rsnd_of_parse_ssi(pdev, of_data, priv);
 
@@ -732,10 +728,23 @@ int rsnd_ssi_probe(struct platform_device *pdev,
                 else if (rsnd_ssi_pio_available(ssi))
                         ops = &rsnd_ssi_pio_ops;
 
-                rsnd_mod_init(&ssi->mod, ops, clk, RSND_MOD_SSI, i);
+                ret = rsnd_mod_init(&ssi->mod, ops, clk, RSND_MOD_SSI, i);
+                if (ret)
+                        return ret;
 
                 rsnd_ssi_parent_clk_setup(priv, ssi);
         }
 
         return 0;
 }
+
+void rsnd_ssi_remove(struct platform_device *pdev,
+                     struct rsnd_priv *priv)
+{
+        struct rsnd_ssi *ssi;
+        int i;
+
+        for_each_rsnd_ssi(ssi, priv, i) {
+                rsnd_mod_quit(&ssi->mod);
+        }
+}
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 07aa54385ae0..12b7ff2426da 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -292,6 +292,9 @@ static const struct file_operations codec_reg_fops = {
 
 static void soc_init_component_debugfs(struct snd_soc_component *component)
 {
+        if (!component->card->debugfs_card_root)
+                return;
+
         if (component->debugfs_prefix) {
                 char *name;
 
@@ -455,6 +458,9 @@ static const struct file_operations platform_list_fops = {
 
 static void soc_init_card_debugfs(struct snd_soc_card *card)
 {
+        if (!snd_soc_debugfs_root)
+                return;
+
         card->debugfs_card_root = debugfs_create_dir(card->name,
                                                      snd_soc_debugfs_root);
         if (!card->debugfs_card_root) {
@@ -476,6 +482,34 @@ static void soc_cleanup_card_debugfs(struct snd_soc_card *card)
         debugfs_remove_recursive(card->debugfs_card_root);
 }
 
+
+static void snd_soc_debugfs_init(void)
+{
+        snd_soc_debugfs_root = debugfs_create_dir("asoc", NULL);
+        if (IS_ERR(snd_soc_debugfs_root) || !snd_soc_debugfs_root) {
+                pr_warn("ASoC: Failed to create debugfs directory\n");
+                snd_soc_debugfs_root = NULL;
+                return;
+        }
+
+        if (!debugfs_create_file("codecs", 0444, snd_soc_debugfs_root, NULL,
+                                 &codec_list_fops))
+                pr_warn("ASoC: Failed to create CODEC list debugfs file\n");
+
+        if (!debugfs_create_file("dais", 0444, snd_soc_debugfs_root, NULL,
+                                 &dai_list_fops))
+                pr_warn("ASoC: Failed to create DAI list debugfs file\n");
+
+        if (!debugfs_create_file("platforms", 0444, snd_soc_debugfs_root, NULL,
+                                 &platform_list_fops))
+                pr_warn("ASoC: Failed to create platform list debugfs file\n");
+}
+
+static void snd_soc_debugfs_exit(void)
+{
+        debugfs_remove_recursive(snd_soc_debugfs_root);
+}
+
 #else
 
 #define soc_init_codec_debugfs NULL
@@ -497,6 +531,15 @@ static inline void soc_init_card_debugfs(struct snd_soc_card *card)
 static inline void soc_cleanup_card_debugfs(struct snd_soc_card *card)
 {
 }
+
+static inline void snd_soc_debugfs_init(void)
+{
+}
+
+static inline void snd_soc_debugfs_exit(void)
+{
+}
+
 #endif
 
 struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card,
@@ -595,15 +638,9 @@ int snd_soc_suspend(struct device *dev)
                         cpu_dai->driver->suspend(cpu_dai);
         }
 
-        /* close any waiting streams and save state */
-        for (i = 0; i < card->num_rtd; i++) {
-                struct snd_soc_dai **codec_dais = card->rtd[i].codec_dais;
+        /* close any waiting streams */
+        for (i = 0; i < card->num_rtd; i++)
                 flush_delayed_work(&card->rtd[i].delayed_work);
-                for (j = 0; j < card->rtd[i].num_codecs; j++) {
-                        codec_dais[j]->codec->dapm.suspend_bias_level =
-                                        codec_dais[j]->codec->dapm.bias_level;
-                }
-        }
 
         for (i = 0; i < card->num_rtd; i++) {
 
@@ -1261,7 +1298,8 @@ static int soc_link_dai_widgets(struct snd_soc_card *card,
         capture_w = cpu_dai->capture_widget;
         if (play_w && capture_w) {
                 ret = snd_soc_dapm_new_pcm(card, dai_link->params,
-                                           capture_w, play_w);
+                                           dai_link->num_params, capture_w,
+                                           play_w);
                 if (ret != 0) {
                         dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
                                 play_w->name, capture_w->name, ret);
@@ -1273,7 +1311,8 @@ static int soc_link_dai_widgets(struct snd_soc_card *card,
         capture_w = codec_dai->capture_widget;
         if (play_w && capture_w) {
                 ret = snd_soc_dapm_new_pcm(card, dai_link->params,
-                                           capture_w, play_w);
+                                           dai_link->num_params, capture_w,
+                                           play_w);
                 if (ret != 0) {
                         dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
                                 play_w->name, capture_w->name, ret);
@@ -1322,21 +1361,17 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
                 }
         }
 
+        if (dai_link->dai_fmt)
+                snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt);
+
         ret = soc_post_component_init(rtd, dai_link->name);
         if (ret)
                 return ret;
 
 #ifdef CONFIG_DEBUG_FS
         /* add DPCM sysfs entries */
-        if (dai_link->dynamic) {
-                ret = soc_dpcm_debugfs_add(rtd);
-                if (ret < 0) {
-                        dev_err(rtd->dev,
-                                "ASoC: failed to add dpcm sysfs entries: %d\n",
-                                ret);
-                        return ret;
-                }
-        }
+        if (dai_link->dynamic)
+                soc_dpcm_debugfs_add(rtd);
 #endif
 
         if (cpu_dai->driver->compress_dai) {
@@ -1426,7 +1461,6 @@ static void soc_remove_aux_dev(struct snd_soc_card *card, int num)
 
         /* unregister the rtd device */
         if (rtd->dev_registered) {
-                device_remove_file(rtd->dev, &dev_attr_codec_reg);
                 device_unregister(rtd->dev);
                 rtd->dev_registered = 0;
         }
@@ -1560,6 +1594,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
                 goto base_error;
         }
 
+        soc_init_card_debugfs(card);
+
         card->dapm.bias_level = SND_SOC_BIAS_OFF;
         card->dapm.dev = card->dev;
         card->dapm.card = card;
@@ -1641,12 +1677,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
                 snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
                                         card->num_of_dapm_routes);
 
-        for (i = 0; i < card->num_links; i++) {
-                if (card->dai_link[i].dai_fmt)
-                        snd_soc_runtime_set_dai_fmt(&card->rtd[i],
-                                card->dai_link[i].dai_fmt);
-        }
-
         snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
                  "%s", card->name);
         snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),
@@ -1702,6 +1732,7 @@ card_probe_error:
         if (card->remove)
                 card->remove(card);
 
+        soc_cleanup_card_debugfs(card);
         snd_card_free(card->snd_card);
 
 base_error:
@@ -2380,8 +2411,6 @@ int snd_soc_register_card(struct snd_soc_card *card)
 
         snd_soc_initialize_card_lists(card);
 
-        soc_init_card_debugfs(card);
-
         card->rtd = devm_kzalloc(card->dev,
                                  sizeof(struct snd_soc_pcm_runtime) *
                                  (card->num_links + card->num_aux_devs),
@@ -2412,7 +2441,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
 
         ret = snd_soc_instantiate_card(card);
         if (ret != 0)
-                soc_cleanup_card_debugfs(card);
+                return ret;
 
         /* deactivate pins to sleep state */
         for (i = 0; i < card->num_rtd; i++) {
@@ -3595,26 +3624,7 @@ EXPORT_SYMBOL_GPL(snd_soc_of_get_dai_link_codecs);
 
 static int __init snd_soc_init(void)
 {
-#ifdef CONFIG_DEBUG_FS
-        snd_soc_debugfs_root = debugfs_create_dir("asoc", NULL);
-        if (IS_ERR(snd_soc_debugfs_root) || !snd_soc_debugfs_root) {
-                pr_warn("ASoC: Failed to create debugfs directory\n");
-                snd_soc_debugfs_root = NULL;
-        }
-
-        if (!debugfs_create_file("codecs", 0444, snd_soc_debugfs_root, NULL,
-                                 &codec_list_fops))
-                pr_warn("ASoC: Failed to create CODEC list debugfs file\n");
-
-        if (!debugfs_create_file("dais", 0444, snd_soc_debugfs_root, NULL,
-                                 &dai_list_fops))
-                pr_warn("ASoC: Failed to create DAI list debugfs file\n");
-
-        if (!debugfs_create_file("platforms", 0444, snd_soc_debugfs_root, NULL,
-                                 &platform_list_fops))
-                pr_warn("ASoC: Failed to create platform list debugfs file\n");
-#endif
-
+        snd_soc_debugfs_init();
         snd_soc_util_init();
 
         return platform_driver_register(&soc_driver);
@@ -3624,9 +3634,9 @@ module_init(snd_soc_init);
 static void __exit snd_soc_exit(void)
 {
         snd_soc_util_exit();
+        snd_soc_debugfs_exit();
 
 #ifdef CONFIG_DEBUG_FS
-        debugfs_remove_recursive(snd_soc_debugfs_root);
 #endif
         platform_driver_unregister(&soc_driver);
 }
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index b6f88202b8c9..defe0f0082b5 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -473,16 +473,6 @@ struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_kcontrol_dapm);
 
-/**
- * snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol
- * @kcontrol: The kcontrol
- */
-struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol)
-{
-        return snd_soc_dapm_to_codec(snd_soc_dapm_kcontrol_dapm(kcontrol));
-}
-EXPORT_SYMBOL_GPL(snd_soc_dapm_kcontrol_codec);
-
 static void dapm_reset(struct snd_soc_card *card)
 {
         struct snd_soc_dapm_widget *w;
@@ -853,6 +843,36 @@ static int dapm_new_pga(struct snd_soc_dapm_widget *w)
         return 0;
 }
 
+/* create new dapm dai link control */
+static int dapm_new_dai_link(struct snd_soc_dapm_widget *w)
+{
+        int i, ret;
+        struct snd_kcontrol *kcontrol;
+        struct snd_soc_dapm_context *dapm = w->dapm;
+        struct snd_card *card = dapm->card->snd_card;
+
+        /* create control for links with > 1 config */
+        if (w->num_params <= 1)
+                return 0;
+
+        /* add kcontrol */
+        for (i = 0; i < w->num_kcontrols; i++) {
+                kcontrol = snd_soc_cnew(&w->kcontrol_news[i], w,
+                                        w->name, NULL);
+                ret = snd_ctl_add(card, kcontrol);
+                if (ret < 0) {
+                        dev_err(dapm->dev,
+                                "ASoC: failed to add widget %s dapm kcontrol %s: %d\n",
+                                w->name, w->kcontrol_news[i].name, ret);
+                        return ret;
+                }
+                kcontrol->private_data = w;
+                w->kcontrols[i] = kcontrol;
+        }
+
+        return 0;
+}
+
 /* We implement power down on suspend by checking the power state of
  * the ALSA card - when we are suspending the ALSA state for the card
  * is set to D3.
@@ -1898,6 +1918,9 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
 {
         struct dentry *d;
 
+        if (!parent)
+                return;
+
         dapm->debugfs_dapm = debugfs_create_dir("dapm", parent);
 
         if (!dapm->debugfs_dapm) {
@@ -2719,6 +2742,9 @@ int snd_soc_dapm_new_widgets(struct snd_soc_card *card)
                 case snd_soc_dapm_out_drv:
                         dapm_new_pga(w);
                         break;
+                case snd_soc_dapm_dai_link:
+                        dapm_new_dai_link(w);
+                        break;
                 default:
                         break;
                 }
@@ -3193,7 +3219,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
 {
         struct snd_soc_dapm_path *source_p, *sink_p;
         struct snd_soc_dai *source, *sink;
-        const struct snd_soc_pcm_stream *config = w->params;
+        const struct snd_soc_pcm_stream *config = w->params + w->params_select;
         struct snd_pcm_substream substream;
         struct snd_pcm_hw_params *params = NULL;
         u64 fmt;
@@ -3285,22 +3311,97 @@ out:
         return ret;
 }
 
+static int snd_soc_dapm_dai_link_get(struct snd_kcontrol *kcontrol,
+                          struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_widget *w = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.integer.value[0] = w->params_select;
+
+        return 0;
+}
+
+static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol,
+                          struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_dapm_widget *w = snd_kcontrol_chip(kcontrol);
+
+        /* Can't change the config when widget is already powered */
+        if (w->power)
+                return -EBUSY;
+
+        if (ucontrol->value.integer.value[0] == w->params_select)
+                return 0;
+
+        if (ucontrol->value.integer.value[0] >= w->num_params)
+                return -EINVAL;
+
+        w->params_select = ucontrol->value.integer.value[0];
+
+        return 0;
+}
+
 int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
                          const struct snd_soc_pcm_stream *params,
+                         unsigned int num_params,
                          struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
         struct snd_soc_dapm_widget template;
         struct snd_soc_dapm_widget *w;
-        size_t len;
         char *link_name;
-        int ret;
-
-        len = strlen(source->name) + strlen(sink->name) + 2;
-        link_name = devm_kzalloc(card->dev, len, GFP_KERNEL);
-        if (!link_name)
+        int ret, count;
+        unsigned long private_value;
+        const char **w_param_text;
+        struct soc_enum w_param_enum[] = {
+                SOC_ENUM_SINGLE(0, 0, 0, NULL),
+        };
+        struct snd_kcontrol_new kcontrol_dai_link[] = {
+                SOC_ENUM_EXT(NULL, w_param_enum[0],
+                             snd_soc_dapm_dai_link_get,
+                             snd_soc_dapm_dai_link_put),
+        };
+        const struct snd_soc_pcm_stream *config = params;
+
+        w_param_text = devm_kcalloc(card->dev, num_params,
+                                        sizeof(char *), GFP_KERNEL);
+        if (!w_param_text)
                 return -ENOMEM;
-        snprintf(link_name, len, "%s-%s", source->name, sink->name);
+
+        link_name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-%s",
+                                   source->name, sink->name);
+        if (!link_name) {
+                ret = -ENOMEM;
+                goto outfree_w_param;
+        }
+
+        for (count = 0 ; count < num_params; count++) {
+                if (!config->stream_name) {
+                        dev_warn(card->dapm.dev,
+                                "ASoC: anonymous config %d for dai link %s\n",
+                                count, link_name);
+                        w_param_text[count] =
+                                devm_kasprintf(card->dev, GFP_KERNEL,
+                                               "Anonymous Configuration %d",
+                                               count);
+                        if (!w_param_text[count]) {
+                                ret = -ENOMEM;
+                                goto outfree_link_name;
+                        }
+                } else {
+                        w_param_text[count] = devm_kmemdup(card->dev,
+                                                config->stream_name,
+                                                strlen(config->stream_name) + 1,
+                                                GFP_KERNEL);
+                        if (!w_param_text[count]) {
+                                ret = -ENOMEM;
+                                goto outfree_link_name;
+                        }
+                }
+                config++;
+        }
+        w_param_enum[0].items = num_params;
+        w_param_enum[0].texts = w_param_text;
 
         memset(&template, 0, sizeof(template));
         template.reg = SND_SOC_NOPM;
@@ -3309,6 +3410,30 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
         template.event = snd_soc_dai_link_event;
         template.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
                 SND_SOC_DAPM_PRE_PMD;
+        template.num_kcontrols = 1;
+        /* duplicate w_param_enum on heap so that memory persists */
+        private_value =
+                (unsigned long) devm_kmemdup(card->dev,
+                        (void *)(kcontrol_dai_link[0].private_value),
+                        sizeof(struct soc_enum), GFP_KERNEL);
+        if (!private_value) {
+                dev_err(card->dev, "ASoC: Failed to create control for %s widget\n",
+                        link_name);
+                ret = -ENOMEM;
+                goto outfree_link_name;
+        }
+        kcontrol_dai_link[0].private_value = private_value;
+        /* duplicate kcontrol_dai_link on heap so that memory persists */
+        template.kcontrol_news =
+                                devm_kmemdup(card->dev, &kcontrol_dai_link[0],
+                                        sizeof(struct snd_kcontrol_new),
+                                        GFP_KERNEL);
+        if (!template.kcontrol_news) {
+                dev_err(card->dev, "ASoC: Failed to create control for %s widget\n",
+                        link_name);
+                ret = -ENOMEM;
+                goto outfree_private_value;
+        }
 
         dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name);
 
@@ -3316,15 +3441,32 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
         if (!w) {
                 dev_err(card->dev, "ASoC: Failed to create %s widget\n",
                         link_name);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto outfree_kcontrol_news;
         }
 
         w->params = params;
+        w->num_params = num_params;
 
         ret = snd_soc_dapm_add_path(&card->dapm, source, w, NULL, NULL);
         if (ret)
-                return ret;
+                goto outfree_w;
         return snd_soc_dapm_add_path(&card->dapm, w, sink, NULL, NULL);
+
+outfree_w:
+        devm_kfree(card->dev, w);
+outfree_kcontrol_news:
+        devm_kfree(card->dev, (void *)template.kcontrol_news);
+outfree_private_value:
+        devm_kfree(card->dev, (void *)private_value);
+outfree_link_name:
+        devm_kfree(card->dev, link_name);
+outfree_w_param:
+        for (count = 0 ; count < num_params; count++)
+                devm_kfree(card->dev, (void *)w_param_text[count]);
+        devm_kfree(card->dev, w_param_text);
+
+        return ret;
 }
 
 int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 6e3781e88f9a..35fe58f4fa86 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1097,8 +1097,9 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,
                         stream ? "<-" : "->", be->dai_link->name);
 
 #ifdef CONFIG_DEBUG_FS
-        dpcm->debugfs_state = debugfs_create_u32(be->dai_link->name, 0644,
-                        fe->debugfs_dpcm_root, &dpcm->state);
+        if (fe->debugfs_dpcm_root)
+                dpcm->debugfs_state = debugfs_create_u32(be->dai_link->name, 0644,
+                                fe->debugfs_dpcm_root, &dpcm->state);
 #endif
         return 1;
 }
@@ -2803,10 +2804,13 @@ static const struct file_operations dpcm_state_fops = {
         .llseek = default_llseek,
 };
 
-int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
+void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
 {
         if (!rtd->dai_link)
-                return 0;
+                return;
+
+        if (!rtd->card->debugfs_card_root)
+                return;
 
         rtd->debugfs_dpcm_root = debugfs_create_dir(rtd->dai_link->name,
                         rtd->card->debugfs_card_root);
@@ -2814,13 +2818,11 @@ int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
                 dev_dbg(rtd->dev,
                          "ASoC: Failed to create dpcm debugfs directory %s\n",
                          rtd->dai_link->name);
-                return -EINVAL;
+                return;
         }
 
         rtd->debugfs_dpcm_state = debugfs_create_file("state", 0444,
                                                 rtd->debugfs_dpcm_root,
                                                 rtd, &dpcm_state_fops);
-
-        return 0;
 }
 #endif
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index 6dcd06a966c7..ba272e21a6fa 100644
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -101,9 +101,6 @@ static const struct snd_kcontrol_new tegra_alc5632_controls[] = {
 
 static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_codec *codec = codec_dai->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);
 
         snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET,
@@ -118,7 +115,7 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
                                                 &tegra_alc5632_hp_jack_gpio);
         }
 
-        snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
+        snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "MICBIAS1");
 
         return 0;
 }
diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c
index 68d8b67e79c1..1470873ecde6 100644
--- a/sound/soc/tegra/tegra_rt5677.c
+++ b/sound/soc/tegra/tegra_rt5677.c
@@ -141,9 +141,6 @@ static const struct snd_kcontrol_new tegra_rt5677_controls[] = {
 
 static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_codec *codec = codec_dai->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(rtd->card);
 
         snd_soc_card_jack_new(rtd->card, "Headphone Jack", SND_JACK_HEADPHONE,
@@ -167,7 +164,7 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
                                 &tegra_rt5677_mic_jack_gpio);
         }
 
-        snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
+        snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "MICBIAS1");
 
         return 0;
 }
@@ -329,7 +326,6 @@ static const struct of_device_id tegra_rt5677_of_match[] = {
 static struct platform_driver tegra_rt5677_driver = {
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
                 .pm = &snd_soc_pm_ops,
                 .of_match_table = tegra_rt5677_of_match,
         },
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 4a95b70f0cf0..21604009bc1a 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -171,7 +171,6 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_codec *codec = codec_dai->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct snd_soc_card *card = rtd->card;
         struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
 
@@ -193,7 +192,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
         wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,
                                 0);
 
-        snd_soc_dapm_force_enable_pin(dapm, "MICBIAS");
+        snd_soc_dapm_force_enable_pin(&card->dapm, "MICBIAS");
 
         return 0;
 }
diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
index 2868b4839bc0..6492f8143ff1 100644
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -46,11 +46,7 @@ static const struct snd_soc_dapm_widget tegra_wm9712_dapm_widgets[] = {
 
 static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_codec *codec = codec_dai->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        return snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
+        return snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias");
 }
 
 static struct snd_soc_dai_link tegra_wm9712_dai = {
diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c
index aa65370db82a..b81a7a4c938b 100644
--- a/sound/soc/ux500/mop500_ab8500.c
+++ b/sound/soc/ux500/mop500_ab8500.c
@@ -362,7 +362,7 @@ struct snd_soc_ops mop500_ab8500_ops[] = {
 
 int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &rtd->card->dapm;
         struct device *dev = rtd->card->dev;
         struct mop500_ab8500_drvdata *drvdata;
         int ret;
@@ -407,23 +407,23 @@ int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd)
                 return ret;
         }
 
-        ret = snd_soc_dapm_disable_pin(&codec->dapm, "Earpiece");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Speaker Left");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Speaker Right");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineOut Left");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineOut Right");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Vibra 1");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Vibra 2");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Mic 1");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Mic 2");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineIn Left");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineIn Right");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 1");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 2");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 3");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 4");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 5");
-        ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 6");
+        ret = snd_soc_dapm_disable_pin(dapm, "Earpiece");
+        ret |= snd_soc_dapm_disable_pin(dapm, "Speaker Left");
+        ret |= snd_soc_dapm_disable_pin(dapm, "Speaker Right");
+        ret |= snd_soc_dapm_disable_pin(dapm, "LineOut Left");
+        ret |= snd_soc_dapm_disable_pin(dapm, "LineOut Right");
+        ret |= snd_soc_dapm_disable_pin(dapm, "Vibra 1");
+        ret |= snd_soc_dapm_disable_pin(dapm, "Vibra 2");
+        ret |= snd_soc_dapm_disable_pin(dapm, "Mic 1");
+        ret |= snd_soc_dapm_disable_pin(dapm, "Mic 2");
+        ret |= snd_soc_dapm_disable_pin(dapm, "LineIn Left");
+        ret |= snd_soc_dapm_disable_pin(dapm, "LineIn Right");
+        ret |= snd_soc_dapm_disable_pin(dapm, "DMic 1");
+        ret |= snd_soc_dapm_disable_pin(dapm, "DMic 2");
+        ret |= snd_soc_dapm_disable_pin(dapm, "DMic 3");
+        ret |= snd_soc_dapm_disable_pin(dapm, "DMic 4");
+        ret |= snd_soc_dapm_disable_pin(dapm, "DMic 5");
+        ret |= snd_soc_dapm_disable_pin(dapm, "DMic 6");
 
         return ret;
 }