273 files changed, 19337 insertions, 4590 deletions

diff --git a/Documentation/devicetree/bindings/mfd/mc13xxx.txt b/Documentation/devicetree/bindings/mfd/mc13xxx.txt
index 1413f39912d3..8aba48821a85 100644
--- a/Documentation/devicetree/bindings/mfd/mc13xxx.txt
+++ b/Documentation/devicetree/bindings/mfd/mc13xxx.txt
@@ -10,6 +10,9 @@ Optional properties:
 - fsl,mc13xxx-uses-touch : Indicate the touchscreen controller is being used
 
 Sub-nodes:
+- codec: Contain the Audio Codec node.
+  - adc-port: Contain PMIC SSI port number used for ADC.
+  - dac-port: Contain PMIC SSI port number used for DAC.
 - leds : Contain the led nodes and initial register values in property
   "led-control". Number of register depends of used IC, for MC13783 is 6,
   for MC13892 is 4, for MC34708 is 1. See datasheet for bits definitions of
diff --git a/Documentation/devicetree/bindings/sound/ak4104.txt b/Documentation/devicetree/bindings/sound/ak4104.txt
index b902ee39cf89..deca5e18f304 100644
--- a/Documentation/devicetree/bindings/sound/ak4104.txt
+++ b/Documentation/devicetree/bindings/sound/ak4104.txt
@@ -8,6 +8,8 @@ Required properties:
 
   - reg : The chip select number on the SPI bus
 
+  - vdd-supply : A regulator node, providing 2.7V - 3.6V
+
 Optional properties:
 
   - reset-gpio : a GPIO spec for the reset pin. If specified, it will be
@@ -19,4 +21,5 @@ spdif: ak4104@0 {
         compatible = "asahi-kasei,ak4104";
         reg = <0>;
         spi-max-frequency = <5000000>;
+        vdd-supply = <&vdd_3v3_reg>;
 };
diff --git a/Documentation/devicetree/bindings/sound/alc5623.txt b/Documentation/devicetree/bindings/sound/alc5623.txt
new file mode 100644
index 000000000000..26c86c98d671
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/alc5623.txt
@@ -0,0 +1,25 @@
+ALC5621/ALC5622/ALC5623 audio Codec
+
+Required properties:
+
+ - compatible:  "realtek,alc5623"
+ - reg:         the I2C address of the device.
+
+Optional properties:
+
+ - add-ctrl:      Default register value for Reg-40h, Additional Control
+                  Register. If absent or has the value of 0, the
+                  register is untouched.
+
+ - jack-det-ctrl: Default register value for Reg-5Ah, Jack Detect
+                  Control Register. If absent or has value 0, the
+                  register is untouched.
+
+Example:
+
+        alc5621: alc5621@1a {
+                compatible = "alc5621";
+                reg = <0x1a>;
+                add-ctrl = <0x3700>;
+                jack-det-ctrl = <0x4810>;
+        };
diff --git a/Documentation/devicetree/bindings/sound/cs42l56.txt b/Documentation/devicetree/bindings/sound/cs42l56.txt
new file mode 100644
index 000000000000..4feb0eb27ea4
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cs42l56.txt
@@ -0,0 +1,63 @@
+CS42L52 audio CODEC
+
+Required properties:
+
+  - compatible : "cirrus,cs42l56"
+
+  - reg : the I2C address of the device for I2C
+
+  - VA-supply, VCP-supply, VLDO-supply : power supplies for the device,
+  as covered in Documentation/devicetree/bindings/regulator/regulator.txt.
+
+Optional properties:
+
+  - cirrus,gpio-nreset : GPIO controller's phandle and the number
+  of the GPIO used to reset the codec.
+
+  - cirrus,chgfreq-divisor : Values used to set the Charge Pump Frequency.
+  Allowable values of 0x00 through 0x0F. These are raw values written to the
+  register, not the actual frequency. The frequency is determined by the following.
+  Frequency = MCLK / 4 * (N+2)
+  N = chgfreq_val
+  MCLK = Where MCLK is the frequency of the mclk signal after the MCLKDIV2 circuit.
+
+  - cirrus,ain1a-ref-cfg, ain1b-ref-cfg : boolean, If present, AIN1A or AIN1B are configured
+  as a pseudo-differential input referenced to AIN1REF/AIN3A.
+
+  - cirrus,ain2a-ref-cfg, ain2b-ref-cfg : boolean, If present, AIN2A or AIN2B are configured
+  as a pseudo-differential input referenced to AIN2REF/AIN3B.
+
+  - cirrus,micbias-lvl: Set the output voltage level on the MICBIAS Pin.
+  0 = 0.5 x VA
+  1 = 0.6 x VA
+  2 = 0.7 x VA
+  3 = 0.8 x VA
+  4 = 0.83 x VA
+  5 = 0.91 x VA
+
+  - cirrus,adaptive-pwr-cfg : Configures how the power to the Headphone and Lineout
+  Amplifiers adapt to the output signal levels.
+  0 = Adapt to Volume Mode. Voltage level determined by the sum of the relevant volume settings.
+  1 = Fixed - Headphone and Line Amp supply = + or - VCP/2.
+  2 = Fixed - Headphone and Line Amp supply = + or - VCP.
+  3 = Adapted to Signal; Voltage level is dynamically determined by the output signal.
+
+  - cirrus,hpf-left-freq, hpf-right-freq : Sets the corner frequency (-3dB point) for the internal High-Pass
+  Filter.
+  0 = 1.8Hz
+  1 = 119Hz
+  2 = 236Hz
+  3 = 464Hz
+
+
+Example:
+
+codec: codec@4b {
+        compatible = "cirrus,cs42l56";
+        reg = <0x4b>;
+        gpio-reset = <&gpio 10 0>;
+        cirrus,chgfreq-divisor = <0x05>;
+        cirrus.ain1_ref_cfg;
+        cirrus,micbias-lvl = <5>;
+        VA-supply = <&reg_audio>;
+};
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 98611a6761c0..0f4e23828190 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -7,10 +7,11 @@ codec/DSP interfaces.
 
 
 Required properties:
-- compatible: Compatible list, contains "fsl,vf610-sai".
+- compatible: Compatible list, contains "fsl,vf610-sai" or "fsl,imx6sx-sai".
 - reg: Offset and length of the register set for the device.
 - clocks: Must contain an entry for each entry in clock-names.
-- clock-names : Must include the "sai" entry.
+- clock-names : Must include the "bus" for register access and "mclk1" "mclk2"
+  "mclk3" for bit clock and frame clock providing.
 - dmas : Generic dma devicetree binding as described in
   Documentation/devicetree/bindings/dma/dma.txt.
 - dma-names : Two dmas have to be defined, "tx" and "rx".
@@ -30,8 +31,10 @@ sai2: sai@40031000 {
               reg = <0x40031000 0x1000>;
               pinctrl-names = "default";
               pinctrl-0 = <&pinctrl_sai2_1>;
-              clocks = <&clks VF610_CLK_SAI2>;
-              clock-names = "sai";
+              clocks = <&clks VF610_CLK_PLATFORM_BUS>,
+                     <&clks VF610_CLK_SAI2>,
+                     <&clks 0>, <&clks 0>;
+              clock-names = "bus", "mclk1", "mclk2", "mclk3";
               dma-names = "tx", "rx";
               dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>,
                    <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>;
diff --git a/Documentation/devicetree/bindings/sound/max98095.txt b/Documentation/devicetree/bindings/sound/max98095.txt
new file mode 100644
index 000000000000..bacbeaac72b5
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/max98095.txt
@@ -0,0 +1,16 @@
+MAX98095 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+- compatible : "maxim,max98095".
+
+- reg : The I2C address of the device.
+
+Example:
+
+max98095: codec@11 {
+        compatible = "maxim,max98095";
+        reg = <0x11>;
+};
diff --git a/Documentation/devicetree/bindings/sound/nokia,rx51.txt b/Documentation/devicetree/bindings/sound/nokia,rx51.txt
new file mode 100644
index 000000000000..72f93d996273
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/nokia,rx51.txt
@@ -0,0 +1,27 @@
+* Nokia N900 audio setup
+
+Required properties:
+- compatible: Should contain "nokia,n900-audio"
+- nokia,cpu-dai: phandle for the McBSP node
+- nokia,audio-codec: phandles for the main TLV320AIC3X node and the
+                     auxiliary TLV320AIC3X node (in this order)
+- nokia,headphone-amplifier: phandle for the TPA6130A2 node
+- tvout-selection-gpios: GPIO for tvout selection
+- jack-detection-gpios: GPIO for jack detection
+- eci-switch-gpios: GPIO for ECI (Enhancement Control Interface) switch
+- speaker-amplifier-gpios: GPIO for speaker amplifier
+
+Example:
+
+sound {
+        compatible = "nokia,n900-audio";
+
+        nokia,cpu-dai = <&mcbsp2>;
+        nokia,audio-codec = <&tlv320aic3x>, <&tlv320aic3x_aux>;
+        nokia,headphone-amplifier = <&tpa6130a2>;
+
+        tvout-selection-gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>; /* 40 */
+        jack-detection-gpios = <&gpio6 17 GPIO_ACTIVE_HIGH>; /* 177 */
+        eci-switch-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* 182 */
+        speaker-amplifier-gpios = <&twl_gpio 7 GPIO_ACTIVE_HIGH>;
+};
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
new file mode 100644
index 000000000000..c26f8ca97023
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
@@ -0,0 +1,28 @@
+NVIDIA Tegra30 HDA controller
+
+Required properties:
+- compatible : "nvidia,tegra30-hda"
+- reg : Should contain the HDA registers location and length.
+- interrupts : The interrupt from the HDA controller.
+- clocks : Must contain an entry for each required entry in clock-names.
+  See ../clocks/clock-bindings.txt for details.
+- clock-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi
+- resets : Must contain an entry for each entry in reset-names.
+  See ../reset/reset.txt for details.
+- reset-names : Must include the following entries: hda, hdacodec_2x, hda2hdmi
+
+Example:
+
+hda@0,70030000 {
+        compatible = "nvidia,tegra124-hda", "nvidia,tegra30-hda";
+        reg = <0x0 0x70030000 0x0 0x10000>;
+        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&tegra_car TEGRA124_CLK_HDA>,
+                 <&tegra_car TEGRA124_CLK_HDA2HDMI>,
+                 <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>;
+        clock-names = "hda", "hda2hdmi", "hdacodec_2x";
+        resets = <&tegra_car 125>, /* hda */
+                 <&tegra_car 128>; /* hda2hdmi */
+                 <&tegra_car 111>, /* hda2codec_2x */
+        reset-names = "hda", "hda2hdmi", "hdacodec_2x";
+};
diff --git a/Documentation/devicetree/bindings/sound/rt5640.txt b/Documentation/devicetree/bindings/sound/rt5640.txt
index 068a1141b06f..bac4d9ac1edc 100644
--- a/Documentation/devicetree/bindings/sound/rt5640.txt
+++ b/Documentation/devicetree/bindings/sound/rt5640.txt
@@ -1,10 +1,10 @@
-RT5640 audio CODEC
+RT5640/RT5639 audio CODEC
 
 This device supports I2C only.
 
 Required properties:
 
-- compatible : "realtek,rt5640".
+- compatible : One of "realtek,rt5640" or "realtek,rt5639".
 
 - reg : The I2C address of the device.
 
@@ -18,7 +18,7 @@ Optional properties:
 
 - realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin.
 
-Pins on the device (for linking into audio routes):
+Pins on the device (for linking into audio routes) for RT5639/RT5640:
 
   * DMIC1
   * DMIC2
@@ -31,13 +31,16 @@ Pins on the device (for linking into audio routes):
   * HPOR
   * LOUTL
   * LOUTR
-  * MONOP
-  * MONON
   * SPOLP
   * SPOLN
   * SPORP
   * SPORN
 
+Additional pins on the device for RT5640:
+
+  * MONOP
+  * MONON
+
 Example:
 
 rt5640 {
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index 131aa2ad7f1a..9b9df146fd1a 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -1,6 +1,6 @@
 Simple-Card:
 
-Simple-Card specifies audio DAI connection of SoC <-> codec.
+Simple-Card specifies audio DAI connections of SoC <-> codec.
 
 Required properties:
 
@@ -10,26 +10,51 @@ Optional properties:
 
 - simple-audio-card,name                : User specified audio sound card name, one string
                                           property.
-- simple-audio-card,format              : CPU/CODEC common audio format.
-                                          "i2s", "right_j", "left_j" , "dsp_a"
-                                          "dsp_b", "ac97", "pdm", "msb", "lsb"
 - simple-audio-card,widgets             : Please refer to widgets.txt.
 - simple-audio-card,routing             : A list of the connections between audio components.
                                           Each entry is a pair of strings, the first being the
                                           connection's sink, the second being the connection's
                                           source.
-- dai-tdm-slot-num                      : Please refer to tdm-slot.txt.
-- dai-tdm-slot-width                    : Please refer to tdm-slot.txt.
+Optional subnodes:
+
+- simple-audio-card,dai-link            : Container for dai-link level
+                                          properties and the CPU and CODEC
+                                          sub-nodes. This container may be
+                                          omitted when the card has only one
+                                          DAI link. See the examples and the
+                                          section bellow.
+
+Dai-link subnode properties and subnodes:
+
+If dai-link subnode is omitted and the subnode properties are directly
+under "sound"-node the subnode property and subnode names have to be
+prefixed with "simple-audio-card,"-prefix.
 
-Required subnodes:
+Required dai-link subnodes:
 
-- simple-audio-card,dai-link            : container for the CPU and CODEC sub-nodes
-                                          This container may be omitted when the
-                                          card has only one DAI link.
-                                          See the examples.
+- cpu                                   : CPU   sub-node
+- codec                                 : CODEC sub-node
 
-- simple-audio-card,cpu                 : CPU   sub-node
-- simple-audio-card,codec               : CODEC sub-node
+Optional dai-link 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.
+
+For backward compatibility the frame-master and bitclock-master
+properties can be used as booleans in codec subnode to indicate if the
+codec is the dai-link frame or bit clock master. In this case there
+should be no dai-link node, the same properties should not be present
+at sound-node level, and the bitclock-inversion and frame-inversion
+properties should also be placed in the codec node if needed.
 
 Required CPU/CODEC subnodes properties:
 
@@ -37,29 +62,21 @@ Required CPU/CODEC subnodes properties:
 
 Optional CPU/CODEC subnodes properties:
 
-- format                                : CPU/CODEC specific audio format if needed.
-                                          see simple-audio-card,format
-- frame-master                          : bool property. add this if subnode is frame master
-- bitclock-master                       : bool property. add this if subnode is bitclock master
-- bitclock-inversion                    : bool property. add this if subnode has clock inversion
-- frame-inversion                       : bool property. add this if subnode has frame inversion
+- dai-tdm-slot-num                      : Please refer to tdm-slot.txt.
+- dai-tdm-slot-width                    : Please refer to tdm-slot.txt.
 - 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)
 
-Note:
- * For 'format', 'frame-master', 'bitclock-master', 'bitclock-inversion' and
-   'frame-inversion', the simple card will use the settings of CODEC for both
-   CPU and CODEC sides as we need to keep the settings identical for both ends
-   of the link.
-
 Example 1 - single DAI link:
 
 sound {
         compatible = "simple-audio-card";
         simple-audio-card,name = "VF610-Tower-Sound-Card";
         simple-audio-card,format = "left_j";
+        simple-audio-card,bitclock-master = <&dailink0_master>;
+        simple-audio-card,frame-master = <&dailink0_master>;
         simple-audio-card,widgets =
                 "Microphone", "Microphone Jack",
                 "Headphone", "Headphone Jack",
@@ -69,17 +86,12 @@ sound {
                 "Headphone Jack", "HP_OUT",
                 "External Speaker", "LINE_OUT";
 
-        dai-tdm-slot-num = <2>;
-        dai-tdm-slot-width = <8>;
-
         simple-audio-card,cpu {
                 sound-dai = <&sh_fsi2 0>;
         };
 
-        simple-audio-card,codec {
+        dailink0_master: simple-audio-card,codec {
                 sound-dai = <&ak4648>;
-                bitclock-master;
-                frame-master;
                 clocks = <&osc>;
         };
 };
@@ -105,31 +117,31 @@ Example 2 - many DAI links:
 sound {
         compatible = "simple-audio-card";
         simple-audio-card,name = "Cubox Audio";
-        simple-audio-card,format = "i2s";
 
         simple-audio-card,dai-link@0 {          /* I2S - HDMI */
-                simple-audio-card,cpu {
+                format = "i2s";
+                cpu {
                         sound-dai = <&audio1 0>;
                 };
-                simple-audio-card,codec {
+                codec {
                         sound-dai = <&tda998x 0>;
                 };
         };
 
         simple-audio-card,dai-link@1 {          /* S/PDIF - HDMI */
-                simple-audio-card,cpu {
+                cpu {
                         sound-dai = <&audio1 1>;
                 };
-                simple-audio-card,codec {
+                codec {
                         sound-dai = <&tda998x 1>;
                 };
         };
 
         simple-audio-card,dai-link@2 {          /* S/PDIF - S/PDIF */
-                simple-audio-card,cpu {
+                cpu {
                         sound-dai = <&audio1 1>;
                 };
-                simple-audio-card,codec {
+                codec {
                         sound-dai = <&spdif_codec>;
                 };
         };
diff --git a/Documentation/devicetree/bindings/sound/snow.txt b/Documentation/devicetree/bindings/sound/snow.txt
new file mode 100644
index 000000000000..678b191c37b8
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/snow.txt
@@ -0,0 +1,17 @@
+Audio Binding for Snow boards
+
+Required properties:
+- compatible : Can be one of the following,
+                        "google,snow-audio-max98090" or
+                        "google,snow-audio-max98095"
+- samsung,i2s-controller: The phandle of the Samsung I2S controller
+- samsung,audio-codec: The phandle of the audio codec
+
+Example:
+
+sound {
+                compatible = "google,snow-audio-max98095";
+
+                samsung,i2s-controller = <&i2s0>;
+                samsung,audio-codec = <&max98095>;
+};
diff --git a/Documentation/devicetree/bindings/sound/st,sta350.txt b/Documentation/devicetree/bindings/sound/st,sta350.txt
new file mode 100644
index 000000000000..b7e71bf5caf4
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/st,sta350.txt
@@ -0,0 +1,131 @@
+STA350 audio CODEC
+
+The driver for this device only supports I2C.
+
+Required properties:
+
+  - compatible: "st,sta350"
+  - reg: the I2C address of the device for I2C
+  - reset-gpios: a GPIO spec for the reset pin. If specified, it will be
+                 deasserted before communication to the codec starts.
+
+  - power-down-gpios: a GPIO spec for the power down pin. If specified,
+                      it will be deasserted before communication to the codec
+                      starts.
+
+  - vdd-dig-supply: regulator spec, providing 3.3V
+  - vdd-pll-supply: regulator spec, providing 3.3V
+  - vcc-supply: regulator spec, providing 5V - 26V
+
+Optional properties:
+
+  -  st,output-conf: number, Selects the output configuration:
+        0: 2-channel (full-bridge) power, 2-channel data-out
+        1: 2 (half-bridge). 1 (full-bridge) on-board power
+        2: 2 Channel (Full-Bridge) Power, 1 Channel FFX
+        3: 1 Channel Mono-Parallel
+        If parameter is missing, mode 0 will be enabled.
+        This property has to be specified as '/bits/ 8' value.
+
+  -  st,ch1-output-mapping: Channel 1 output mapping
+  -  st,ch2-output-mapping: Channel 2 output mapping
+  -  st,ch3-output-mapping: Channel 3 output mapping
+        0: Channel 1
+        1: Channel 2
+        2: Channel 3
+        If parameter is missing, channel 1 is choosen.
+        This properties have to be specified as '/bits/ 8' values.
+
+  -  st,thermal-warning-recover:
+        If present, thermal warning recovery is enabled.
+
+  -  st,thermal-warning-adjustment:
+        If present, thermal warning adjustment is enabled.
+
+  -  st,fault-detect-recovery:
+        If present, then fault recovery will be enabled.
+
+  -  st,ffx-power-output-mode: string
+        The FFX power output mode selects how the FFX output timing is
+        configured. Must be one of these values:
+          -  "drop-compensation"
+          -  "tapered-compensation"
+          -  "full-power-mode"
+          -  "variable-drop-compensation" (default)
+
+  -  st,drop-compensation-ns: number
+        Only required for "st,ffx-power-output-mode" ==
+        "variable-drop-compensation".
+        Specifies the drop compensation in nanoseconds.
+        The value must be in the range of 0..300, and only
+        multiples of 20 are allowed. Default is 140ns.
+
+  -  st,overcurrent-warning-adjustment:
+        If present, overcurrent warning adjustment is enabled.
+
+  -  st,max-power-use-mpcc:
+        If present, then MPCC bits are used for MPC coefficients,
+        otherwise standard MPC coefficients are used.
+
+  -  st,max-power-corr:
+        If present, power bridge correction for THD reduction near maximum
+        power output is enabled.
+
+  -  st,am-reduction-mode:
+        If present, FFX mode runs in AM reduction mode, otherwise normal
+        FFX mode is used.
+
+  -  st,odd-pwm-speed-mode:
+        If present, PWM speed mode run on odd speed mode (341.3 kHz) on all
+        channels. If not present, normal PWM spped mode (384 kHz) will be used.
+
+  -  st,distortion-compensation:
+        If present, distortion compensation variable uses DCC coefficient.
+        If not present, preset DC coefficient is used.
+
+  -  st,invalid-input-detect-mute:
+        If present, automatic invalid input detect mute is enabled.
+
+  -  st,activate-mute-output:
+        If present, a mute output will be activated in ase the volume will
+        reach a value lower than -76 dBFS.
+
+  -  st,bridge-immediate-off:
+        If present, the bridge will be switched off immediately after the
+        power-down-gpio goes low. Otherwise, the bridge will wait for 13
+        million clock cycles to pass before shutting down.
+
+  -  st,noise-shape-dc-cut:
+        If present, the noise-shaping technique on the DC cutoff filter are
+        enabled.
+
+  -  st,powerdown-master-volume:
+        If present, the power-down pin and I2C power-down functions will
+        act on the master volume. Otherwise, the functions will act on the
+        mute commands.
+
+  -  st,powerdown-delay-divider:
+        If present, the bridge power-down time will be divided by the provided
+        value. If not specified, a divider of 1 will be used. Allowed values
+        are 1, 2, 4, 8, 16, 32, 64 and 128.
+        This property has to be specified as '/bits/ 8' value.
+
+Example:
+
+codec: sta350@38 {
+        compatible = "st,sta350";
+        reg = <0x1c>;
+        reset-gpios = <&gpio1 19 0>;
+        power-down-gpios = <&gpio1 16 0>;
+        st,output-conf = /bits/ 8  <0x3>;       // set output to 2-channel
+                                                // (full-bridge) power,
+                                                // 2-channel data-out
+        st,ch1-output-mapping = /bits/ 8 <0>;   // set channel 1 output ch 1
+        st,ch2-output-mapping = /bits/ 8 <0>;   // set channel 2 output ch 1
+        st,ch3-output-mapping = /bits/ 8 <0>;   // set channel 3 output ch 1
+        st,max-power-correction;                // enables power bridge
+                                                // correction for THD reduction
+                                                // near maximum power output
+        st,invalid-input-detect-mute;           // mute if no valid digital
+                                                // audio signal is provided.
+};
diff --git a/MAINTAINERS b/MAINTAINERS
index 6846c7c622e3..8779dae65f63 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8256,6 +8256,7 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:      http://www.alsa-project.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 T:      git git://git.alsa-project.org/alsa-kernel.git
+Q:      http://patchwork.kernel.org/project/alsa-devel/list/
 S:      Maintained
 F:      Documentation/sound/
 F:      include/sound/
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 618e5b537eaf..10b326bdf831 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -673,7 +673,7 @@
                         renesas,clock-indices = <
                                 R8A7790_CLK_TMU1 R8A7790_CLK_TMU3 R8A7790_CLK_TMU2
                                 R8A7790_CLK_CMT0 R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1
-                                R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_RT R8A7790_CLK_VSP1_SY
+                                R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_R R8A7790_CLK_VSP1_S
                         >;
                         clock-output-names =
                                 "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 46181708e59c..aa1cba94196c 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -688,7 +688,7 @@
                         renesas,clock-indices = <
                                 R8A7791_CLK_TMU1 R8A7791_CLK_TMU3 R8A7791_CLK_TMU2
                                 R8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1
-                                R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_SY
+                                R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_S
                         >;
                         clock-output-names =
                                 "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 4caffc912a81..c12a1c50e9d2 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -21,8 +21,8 @@ obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o
 obj-$(CONFIG_ARCH_R7S72100)     += setup-r7s72100.o
 
 # Clock objects
-ifndef CONFIG_COMMON_CLK
 obj-y                           += clock.o
+ifndef CONFIG_COMMON_CLK
 obj-$(CONFIG_ARCH_SH7372)       += clock-sh7372.o
 obj-$(CONFIG_ARCH_SH73A0)       += clock-sh73a0.o
 obj-$(CONFIG_ARCH_R8A73A4)      += clock-r8a73a4.o
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index b4122f8cb8d9..f444be2f241e 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -345,24 +345,39 @@ static struct rsnd_ssi_platform_info rsnd_ssi[] = {
         RSND_SSI_UNUSED, /* SSI 0 */
         RSND_SSI_UNUSED, /* SSI 1 */
         RSND_SSI_UNUSED, /* SSI 2 */
-        RSND_SSI_SET(1, HPBDMA_SLAVE_HPBIF3_TX, gic_iid(0x85), RSND_SSI_PLAY),
-        RSND_SSI_SET(2, HPBDMA_SLAVE_HPBIF4_RX, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE),
-        RSND_SSI_SET(0, HPBDMA_SLAVE_HPBIF5_TX, gic_iid(0x86), RSND_SSI_PLAY),
-        RSND_SSI_SET(0, HPBDMA_SLAVE_HPBIF6_RX, gic_iid(0x86), 0),
-        RSND_SSI_SET(3, HPBDMA_SLAVE_HPBIF7_TX, gic_iid(0x86), RSND_SSI_PLAY),
-        RSND_SSI_SET(4, HPBDMA_SLAVE_HPBIF8_RX, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE),
+        RSND_SSI(HPBDMA_SLAVE_HPBIF3_TX, gic_iid(0x85), 0),
+        RSND_SSI(HPBDMA_SLAVE_HPBIF4_RX, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE),
+        RSND_SSI(HPBDMA_SLAVE_HPBIF5_TX, gic_iid(0x86), 0),
+        RSND_SSI(HPBDMA_SLAVE_HPBIF6_RX, gic_iid(0x86), 0),
+        RSND_SSI(HPBDMA_SLAVE_HPBIF7_TX, gic_iid(0x86), 0),
+        RSND_SSI(HPBDMA_SLAVE_HPBIF8_RX, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE),
 };
 
-static struct rsnd_scu_platform_info rsnd_scu[9] = {
-        { .flags = 0, }, /* SRU 0 */
-        { .flags = 0, }, /* SRU 1 */
-        { .flags = 0, }, /* SRU 2 */
-        { .flags = RSND_SCU_USE_HPBIF, },
-        { .flags = RSND_SCU_USE_HPBIF, },
-        { .flags = RSND_SCU_USE_HPBIF, },
-        { .flags = RSND_SCU_USE_HPBIF, },
-        { .flags = RSND_SCU_USE_HPBIF, },
-        { .flags = RSND_SCU_USE_HPBIF, },
+static struct rsnd_src_platform_info rsnd_src[9] = {
+        RSND_SRC_UNUSED, /* SRU 0 */
+        RSND_SRC_UNUSED, /* SRU 1 */
+        RSND_SRC_UNUSED, /* SRU 2 */
+        RSND_SRC(0, 0),
+        RSND_SRC(0, 0),
+        RSND_SRC(0, 0),
+        RSND_SRC(0, 0),
+        RSND_SRC(0, 0),
+        RSND_SRC(0, 0),
+};
+
+static struct rsnd_dai_platform_info rsnd_dai[] = {
+        {
+                .playback = { .ssi = &rsnd_ssi[5], .src = &rsnd_src[5] },
+                .capture  = { .ssi = &rsnd_ssi[6], .src = &rsnd_src[6] },
+        }, {
+                .playback = { .ssi = &rsnd_ssi[3], .src = &rsnd_src[3] },
+        }, {
+                .capture  = { .ssi = &rsnd_ssi[4], .src = &rsnd_src[4] },
+        }, {
+                .playback = { .ssi = &rsnd_ssi[7], .src = &rsnd_src[7] },
+        }, {
+                .capture  = { .ssi = &rsnd_ssi[8], .src = &rsnd_src[8] },
+        },
 };
 
 enum {
@@ -437,8 +452,10 @@ static struct rcar_snd_info rsnd_info = {
         .flags          = RSND_GEN1,
         .ssi_info       = rsnd_ssi,
         .ssi_info_nr    = ARRAY_SIZE(rsnd_ssi),
-        .scu_info       = rsnd_scu,
-        .scu_info_nr    = ARRAY_SIZE(rsnd_scu),
+        .src_info       = rsnd_src,
+        .src_info_nr    = ARRAY_SIZE(rsnd_src),
+        .dai_info       = rsnd_dai,
+        .dai_info_nr    = ARRAY_SIZE(rsnd_dai),
         .start          = rsnd_start,
         .stop           = rsnd_stop,
 };
@@ -591,6 +608,7 @@ static void __init bockw_init(void)
 {
         void __iomem *base;
         struct clk *clk;
+        struct platform_device *pdev;
         int i;
 
         r8a7778_clock_init();
@@ -673,9 +691,6 @@ static void __init bockw_init(void)
         }
 
         /* for Audio */
-        clk = clk_get(NULL, "audio_clk_b");
-        clk_set_rate(clk, 24576000);
-        clk_put(clk);
         rsnd_codec_power(5, 1); /* enable ak4642 */
 
         platform_device_register_simple(
@@ -684,11 +699,15 @@ static void __init bockw_init(void)
         platform_device_register_simple(
                 "ak4554-adc-dac", 1, NULL, 0);
 
-        platform_device_register_resndata(
+        pdev = platform_device_register_resndata(
                 &platform_bus, "rcar_sound", -1,
                 rsnd_resources, ARRAY_SIZE(rsnd_resources),
                 &rsnd_info, sizeof(rsnd_info));
 
+        clk = clk_get(&pdev->dev, "clk_b");
+        clk_set_rate(clk, 24576000);
+        clk_put(clk);
+
         for (i = 0; i < ARRAY_SIZE(rsnd_card_info); i++) {
                 struct platform_device_info cardinfo = {
                         .parent         = &platform_bus,
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index a3fd30242bd8..941f8b394e84 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -19,12 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/clk.h>
-#include <linux/clkdev.h>
 #include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/rcar-du.h>
+#include <mach/clock.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/rcar-gen2.h>
@@ -82,49 +81,50 @@ static void __init koelsch_add_du_device(void)
         platform_device_register_full(&info);
 }
 
-static void __init koelsch_add_standard_devices(void)
-{
-        /*
-         * This is a really crude hack to provide clkdev support to the CMT and
-         * DU devices until they get moved to DT.
-         */
-        static const struct clk_name {
-                const char *clk;
-                const char *con_id;
-                const char *dev_id;
-        } clk_names[] = {
-                { "cmt0", NULL, "sh_cmt.0" },
-                { "scifa0", NULL, "sh-sci.0" },
-                { "scifa1", NULL, "sh-sci.1" },
-                { "scifb0", NULL, "sh-sci.2" },
-                { "scifb1", NULL, "sh-sci.3" },
-                { "scifb2", NULL, "sh-sci.4" },
-                { "scifa2", NULL, "sh-sci.5" },
-                { "scif0", NULL, "sh-sci.6" },
-                { "scif1", NULL, "sh-sci.7" },
-                { "scif2", NULL, "sh-sci.8" },
-                { "scif3", NULL, "sh-sci.9" },
-                { "scif4", NULL, "sh-sci.10" },
-                { "scif5", NULL, "sh-sci.11" },
-                { "scifa3", NULL, "sh-sci.12" },
-                { "scifa4", NULL, "sh-sci.13" },
-                { "scifa5", NULL, "sh-sci.14" },
-                { "du0", "du.0", "rcar-du-r8a7791" },
-                { "du1", "du.1", "rcar-du-r8a7791" },
-                { "lvds0", "lvds.0", "rcar-du-r8a7791" },
-        };
-        struct clk *clk;
-        unsigned int i;
+/*
+ * This is a really crude hack to provide clkdev support to platform
+ * devices until they get moved to DT.
+ */
+static const struct clk_name clk_names[] __initconst = {
+        { "cmt0", NULL, "sh_cmt.0" },
+        { "scifa0", NULL, "sh-sci.0" },
+        { "scifa1", NULL, "sh-sci.1" },
+        { "scifb0", NULL, "sh-sci.2" },
+        { "scifb1", NULL, "sh-sci.3" },
+        { "scifb2", NULL, "sh-sci.4" },
+        { "scifa2", NULL, "sh-sci.5" },
+        { "scif0", NULL, "sh-sci.6" },
+        { "scif1", NULL, "sh-sci.7" },
+        { "scif2", NULL, "sh-sci.8" },
+        { "scif3", NULL, "sh-sci.9" },
+        { "scif4", NULL, "sh-sci.10" },
+        { "scif5", NULL, "sh-sci.11" },
+        { "scifa3", NULL, "sh-sci.12" },
+        { "scifa4", NULL, "sh-sci.13" },
+        { "scifa5", NULL, "sh-sci.14" },
+        { "du0", "du.0", "rcar-du-r8a7791" },
+        { "du1", "du.1", "rcar-du-r8a7791" },
+        { "lvds0", "lvds.0", "rcar-du-r8a7791" },
+};
 
-        for (i = 0; i < ARRAY_SIZE(clk_names); ++i) {
-                clk = clk_get(NULL, clk_names[i].clk);
-                if (!IS_ERR(clk)) {
-                        clk_register_clkdev(clk, clk_names[i].con_id,
-                                            clk_names[i].dev_id);
-                        clk_put(clk);
-                }
-        }
+/*
+ * This is a really crude hack to work around core platform clock issues
+ */
+static const struct clk_name clk_enables[] __initconst = {
+        { "ether", NULL, "ee700000.ethernet" },
+        { "i2c2", NULL, "e6530000.i2c" },
+        { "msiof0", NULL, "e6e20000.spi" },
+        { "qspi_mod", NULL, "e6b10000.spi" },
+        { "sdhi0", NULL, "ee100000.sd" },
+        { "sdhi1", NULL, "ee140000.sd" },
+        { "sdhi2", NULL, "ee160000.sd" },
+        { "thermal", NULL, "e61f0000.thermal" },
+};
 
+static void __init koelsch_add_standard_devices(void)
+{
+        shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
+        shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
         r8a7791_add_dt_devices();
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
index 5a034ff405d0..a12a9d3b4b6e 100644
--- a/arch/arm/mach-shmobile/board-koelsch.c
+++ b/arch/arm/mach-shmobile/board-koelsch.c
@@ -216,7 +216,7 @@ static const struct spi_board_info spi_info[] __initconst = {
         {
                 .modalias       = "m25p80",
                 .platform_data  = &spi_flash_data,
-                .mode           = SPI_MODE_0,
+                .mode           = SPI_MODE_0 | SPI_TX_QUAD | SPI_RX_QUAD,
                 .max_speed_hz   = 30000000,
                 .bus_num        = 0,
                 .chip_select    = 0,
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 440aac36d693..1eb48cffb4c5 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -18,12 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/clk.h>
-#include <linux/clkdev.h>
 #include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/rcar-du.h>
+#include <mach/clock.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/rcar-gen2.h>
@@ -86,46 +85,46 @@ static void __init lager_add_du_device(void)
         platform_device_register_full(&info);
 }
 
-static void __init lager_add_standard_devices(void)
-{
-        /*
-         * This is a really crude hack to provide clkdev support to platform
-         * devices until they get moved to DT.
-         */
-        static const struct clk_name {
-                const char *clk;
-                const char *con_id;
-                const char *dev_id;
-        } clk_names[] = {
-                { "cmt0", NULL, "sh_cmt.0" },
-                { "scifa0", NULL, "sh-sci.0" },
-                { "scifa1", NULL, "sh-sci.1" },
-                { "scifb0", NULL, "sh-sci.2" },
-                { "scifb1", NULL, "sh-sci.3" },
-                { "scifb2", NULL, "sh-sci.4" },
-                { "scifa2", NULL, "sh-sci.5" },
-                { "scif0", NULL, "sh-sci.6" },
-                { "scif1", NULL, "sh-sci.7" },
-                { "hscif0", NULL, "sh-sci.8" },
-                { "hscif1", NULL, "sh-sci.9" },
-                { "du0", "du.0", "rcar-du-r8a7790" },
-                { "du1", "du.1", "rcar-du-r8a7790" },
-                { "du2", "du.2", "rcar-du-r8a7790" },
-                { "lvds0", "lvds.0", "rcar-du-r8a7790" },
-                { "lvds1", "lvds.1", "rcar-du-r8a7790" },
-        };
-        struct clk *clk;
-        unsigned int i;
+/*
+ * This is a really crude hack to provide clkdev support to platform
+ * devices until they get moved to DT.
+ */
+static const struct clk_name clk_names[] __initconst = {
+        { "cmt0", NULL, "sh_cmt.0" },
+        { "scifa0", NULL, "sh-sci.0" },
+        { "scifa1", NULL, "sh-sci.1" },
+        { "scifb0", NULL, "sh-sci.2" },
+        { "scifb1", NULL, "sh-sci.3" },
+        { "scifb2", NULL, "sh-sci.4" },
+        { "scifa2", NULL, "sh-sci.5" },
+        { "scif0", NULL, "sh-sci.6" },
+        { "scif1", NULL, "sh-sci.7" },
+        { "hscif0", NULL, "sh-sci.8" },
+        { "hscif1", NULL, "sh-sci.9" },
+        { "du0", "du.0", "rcar-du-r8a7790" },
+        { "du1", "du.1", "rcar-du-r8a7790" },
+        { "du2", "du.2", "rcar-du-r8a7790" },
+        { "lvds0", "lvds.0", "rcar-du-r8a7790" },
+        { "lvds1", "lvds.1", "rcar-du-r8a7790" },
+};
 
-        for (i = 0; i < ARRAY_SIZE(clk_names); ++i) {
-                clk = clk_get(NULL, clk_names[i].clk);
-                if (!IS_ERR(clk)) {
-                        clk_register_clkdev(clk, clk_names[i].con_id,
-                                            clk_names[i].dev_id);
-                        clk_put(clk);
-                }
-        }
+/*
+ * This is a really crude hack to work around core platform clock issues
+ */
+static const struct clk_name clk_enables[] __initconst = {
+        { "ether", NULL, "ee700000.ethernet" },
+        { "msiof1", NULL, "e6e10000.spi" },
+        { "mmcif1", NULL, "ee220000.mmc" },
+        { "qspi_mod", NULL, "e6b10000.spi" },
+        { "sdhi0", NULL, "ee100000.sd" },
+        { "sdhi2", NULL, "ee140000.sd" },
+        { "thermal", NULL, "e61f0000.thermal" },
+};
 
+static void __init lager_add_standard_devices(void)
+{
+        shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
+        shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
         r8a7790_add_dt_devices();
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 18c7e0311aa6..f8b1e05463cc 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -325,12 +325,12 @@ static const struct rspi_plat_data qspi_pdata __initconst = {
 
 static const struct spi_board_info spi_info[] __initconst = {
         {
-                .modalias               = "m25p80",
-                .platform_data          = &spi_flash_data,
-                .mode                   = SPI_MODE_0,
-                .max_speed_hz           = 30000000,
-                .bus_num                = 0,
-                .chip_select            = 0,
+                .modalias       = "m25p80",
+                .platform_data  = &spi_flash_data,
+                .mode           = SPI_MODE_0 | SPI_TX_QUAD | SPI_RX_QUAD,
+                .max_speed_hz   = 30000000,
+                .bus_num        = 0,
+                .chip_select    = 0,
         },
 };
 
@@ -567,20 +567,27 @@ static struct resource rsnd_resources[] __initdata = {
 };
 
 static struct rsnd_ssi_platform_info rsnd_ssi[] = {
-        RSND_SSI_SET(0, 0, gic_spi(370), RSND_SSI_PLAY),
-        RSND_SSI_SET(0, 0, gic_spi(371), RSND_SSI_CLK_PIN_SHARE),
+        RSND_SSI(0, gic_spi(370), 0),
+        RSND_SSI(0, gic_spi(371), RSND_SSI_CLK_PIN_SHARE),
 };
 
-static struct rsnd_scu_platform_info rsnd_scu[2] = {
+static struct rsnd_src_platform_info rsnd_src[2] = {
         /* no member at this point */
 };
 
+static struct rsnd_dai_platform_info rsnd_dai = {
+        .playback = { .ssi = &rsnd_ssi[0], },
+        .capture  = { .ssi = &rsnd_ssi[1], },
+};
+
 static struct rcar_snd_info rsnd_info = {
         .flags          = RSND_GEN2,
         .ssi_info       = rsnd_ssi,
         .ssi_info_nr    = ARRAY_SIZE(rsnd_ssi),
-        .scu_info       = rsnd_scu,
-        .scu_info_nr    = ARRAY_SIZE(rsnd_scu),
+        .src_info       = rsnd_src,
+        .src_info_nr    = ARRAY_SIZE(rsnd_src),
+        .dai_info       = &rsnd_dai,
+        .dai_info_nr    = 1,
 };
 
 static struct asoc_simple_card_info rsnd_card_info = {
diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 9989b1b06ffd..6609beb9b9b4 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -175,10 +175,6 @@ static struct clk mstp_clks[MSTP_NR] = {
 
 static struct clk_lookup lookups[] = {
         /* main */
-        CLKDEV_CON_ID("audio_clk_a",    &audio_clk_a),
-        CLKDEV_CON_ID("audio_clk_b",    &audio_clk_b),
-        CLKDEV_CON_ID("audio_clk_c",    &audio_clk_c),
-        CLKDEV_CON_ID("audio_clk_internal",     &s1_clk),
         CLKDEV_CON_ID("shyway_clk",     &s_clk),
         CLKDEV_CON_ID("peripheral_clk", &p_clk),
 
@@ -234,15 +230,15 @@ static struct clk_lookup lookups[] = {
         CLKDEV_ICK_ID("ssi.6", "rcar_sound", &mstp_clks[MSTP309]),
         CLKDEV_ICK_ID("ssi.7", "rcar_sound", &mstp_clks[MSTP308]),
         CLKDEV_ICK_ID("ssi.8", "rcar_sound", &mstp_clks[MSTP307]),
-        CLKDEV_ICK_ID("scu.0", "rcar_sound", &mstp_clks[MSTP531]),
-        CLKDEV_ICK_ID("scu.1", "rcar_sound", &mstp_clks[MSTP530]),
-        CLKDEV_ICK_ID("scu.2", "rcar_sound", &mstp_clks[MSTP529]),
-        CLKDEV_ICK_ID("scu.3", "rcar_sound", &mstp_clks[MSTP528]),
-        CLKDEV_ICK_ID("scu.4", "rcar_sound", &mstp_clks[MSTP527]),
-        CLKDEV_ICK_ID("scu.5", "rcar_sound", &mstp_clks[MSTP526]),
-        CLKDEV_ICK_ID("scu.6", "rcar_sound", &mstp_clks[MSTP525]),
-        CLKDEV_ICK_ID("scu.7", "rcar_sound", &mstp_clks[MSTP524]),
-        CLKDEV_ICK_ID("scu.8", "rcar_sound", &mstp_clks[MSTP523]),
+        CLKDEV_ICK_ID("src.0", "rcar_sound", &mstp_clks[MSTP531]),
+        CLKDEV_ICK_ID("src.1", "rcar_sound", &mstp_clks[MSTP530]),
+        CLKDEV_ICK_ID("src.2", "rcar_sound", &mstp_clks[MSTP529]),
+        CLKDEV_ICK_ID("src.3", "rcar_sound", &mstp_clks[MSTP528]),
+        CLKDEV_ICK_ID("src.4", "rcar_sound", &mstp_clks[MSTP527]),
+        CLKDEV_ICK_ID("src.5", "rcar_sound", &mstp_clks[MSTP526]),
+        CLKDEV_ICK_ID("src.6", "rcar_sound", &mstp_clks[MSTP525]),
+        CLKDEV_ICK_ID("src.7", "rcar_sound", &mstp_clks[MSTP524]),
+        CLKDEV_ICK_ID("src.8", "rcar_sound", &mstp_clks[MSTP523]),
 };
 
 void __init r8a7778_clock_init(void)
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 3f93503f5b96..a936ae7de083 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -249,10 +249,10 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP1007] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 7, MSTPSR10, 0), /* SSI8 */
         [MSTP1006] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 6, MSTPSR10, 0), /* SSI9 */
         [MSTP1005] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR10, 5, MSTPSR10, 0), /* SSI ALL */
-        [MSTP931] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 31, MSTPSR9, 0), /* I2C0 */
-        [MSTP930] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 30, MSTPSR9, 0), /* I2C1 */
-        [MSTP929] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 29, MSTPSR9, 0), /* I2C2 */
-        [MSTP928] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 28, MSTPSR9, 0), /* I2C3 */
+        [MSTP931] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 31, MSTPSR9, 0), /* I2C0 */
+        [MSTP930] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 30, MSTPSR9, 0), /* I2C1 */
+        [MSTP929] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 29, MSTPSR9, 0), /* I2C2 */
+        [MSTP928] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 28, MSTPSR9, 0), /* I2C3 */
         [MSTP917] = SH_CLK_MSTP32_STS(&qspi_clk, SMSTPCR9, 17, MSTPSR9, 0), /* QSPI */
         [MSTP815] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 15, MSTPSR8, 0), /* SATA0 */
         [MSTP814] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 14, MSTPSR8, 0), /* SATA1 */
@@ -294,10 +294,6 @@ static struct clk mstp_clks[MSTP_NR] = {
 static struct clk_lookup lookups[] = {
 
         /* main clocks */
-        CLKDEV_CON_ID("audio_clk_a",    &audio_clk_a),
-        CLKDEV_CON_ID("audio_clk_b",    &audio_clk_b),
-        CLKDEV_CON_ID("audio_clk_c",    &audio_clk_c),
-        CLKDEV_CON_ID("audio_clk_internal",     &m2_clk),
         CLKDEV_CON_ID("extal",          &extal_clk),
         CLKDEV_CON_ID("extal_div2",     &extal_div2_clk),
         CLKDEV_CON_ID("main",           &main_clk),
@@ -381,16 +377,16 @@ static struct clk_lookup lookups[] = {
         CLKDEV_ICK_ID("clk_b", "rcar_sound", &audio_clk_b),
         CLKDEV_ICK_ID("clk_c", "rcar_sound", &audio_clk_c),
         CLKDEV_ICK_ID("clk_i", "rcar_sound", &m2_clk),
-        CLKDEV_ICK_ID("scu.0", "rcar_sound", &mstp_clks[MSTP1031]),
-        CLKDEV_ICK_ID("scu.1", "rcar_sound", &mstp_clks[MSTP1030]),
-        CLKDEV_ICK_ID("scu.2", "rcar_sound", &mstp_clks[MSTP1029]),
-        CLKDEV_ICK_ID("scu.3", "rcar_sound", &mstp_clks[MSTP1028]),
-        CLKDEV_ICK_ID("scu.4", "rcar_sound", &mstp_clks[MSTP1027]),
-        CLKDEV_ICK_ID("scu.5", "rcar_sound", &mstp_clks[MSTP1026]),
-        CLKDEV_ICK_ID("scu.6", "rcar_sound", &mstp_clks[MSTP1025]),
-        CLKDEV_ICK_ID("scu.7", "rcar_sound", &mstp_clks[MSTP1024]),
-        CLKDEV_ICK_ID("scu.8", "rcar_sound", &mstp_clks[MSTP1023]),
-        CLKDEV_ICK_ID("scu.9", "rcar_sound", &mstp_clks[MSTP1022]),
+        CLKDEV_ICK_ID("src.0", "rcar_sound", &mstp_clks[MSTP1031]),
+        CLKDEV_ICK_ID("src.1", "rcar_sound", &mstp_clks[MSTP1030]),
+        CLKDEV_ICK_ID("src.2", "rcar_sound", &mstp_clks[MSTP1029]),
+        CLKDEV_ICK_ID("src.3", "rcar_sound", &mstp_clks[MSTP1028]),
+        CLKDEV_ICK_ID("src.4", "rcar_sound", &mstp_clks[MSTP1027]),
+        CLKDEV_ICK_ID("src.5", "rcar_sound", &mstp_clks[MSTP1026]),
+        CLKDEV_ICK_ID("src.6", "rcar_sound", &mstp_clks[MSTP1025]),
+        CLKDEV_ICK_ID("src.7", "rcar_sound", &mstp_clks[MSTP1024]),
+        CLKDEV_ICK_ID("src.8", "rcar_sound", &mstp_clks[MSTP1023]),
+        CLKDEV_ICK_ID("src.9", "rcar_sound", &mstp_clks[MSTP1022]),
         CLKDEV_ICK_ID("ssi.0", "rcar_sound", &mstp_clks[MSTP1015]),
         CLKDEV_ICK_ID("ssi.1", "rcar_sound", &mstp_clks[MSTP1014]),
         CLKDEV_ICK_ID("ssi.2", "rcar_sound", &mstp_clks[MSTP1013]),
diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c
index 701383fe3267..3b26c7eee873 100644
--- a/arch/arm/mach-shmobile/clock-r8a7791.c
+++ b/arch/arm/mach-shmobile/clock-r8a7791.c
@@ -25,6 +25,7 @@
 #include <linux/clkdev.h>
 #include <mach/clock.h>
 #include <mach/common.h>
+#include <mach/rcar-gen2.h>
 
 /*
  *   MD         EXTAL           PLL0    PLL1    PLL3
@@ -43,8 +44,6 @@
  *      see "p1 / 2" on R8A7791_CLOCK_ROOT() below
  */
 
-#define MD(nr)  (1 << nr)
-
 #define CPG_BASE 0xe6150000
 #define CPG_LEN 0x1000
 
@@ -68,7 +67,6 @@
 #define MSTPSR9         IOMEM(0xe61509a4)
 #define MSTPSR11        IOMEM(0xe61509ac)
 
-#define MODEMR          0xE6160060
 #define SDCKCR          0xE6150074
 #define SD1CKCR         0xE6150078
 #define SD2CKCR         0xE615026c
@@ -190,12 +188,12 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP1108] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR11, 8, MSTPSR11, 0), /* SCIFA5 */
         [MSTP1107] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR11, 7, MSTPSR11, 0), /* SCIFA4 */
         [MSTP1106] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR11, 6, MSTPSR11, 0), /* SCIFA3 */
-        [MSTP931] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 31, MSTPSR9, 0), /* I2C0 */
-        [MSTP930] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 30, MSTPSR9, 0), /* I2C1 */
-        [MSTP929] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 29, MSTPSR9, 0), /* I2C2 */
-        [MSTP928] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 28, MSTPSR9, 0), /* I2C3 */
-        [MSTP927] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 27, MSTPSR9, 0), /* I2C4 */
-        [MSTP925] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR9, 25, MSTPSR9, 0), /* I2C5 */
+        [MSTP931] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 31, MSTPSR9, 0), /* I2C0 */
+        [MSTP930] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 30, MSTPSR9, 0), /* I2C1 */
+        [MSTP929] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 29, MSTPSR9, 0), /* I2C2 */
+        [MSTP928] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 28, MSTPSR9, 0), /* I2C3 */
+        [MSTP927] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 27, MSTPSR9, 0), /* I2C4 */
+        [MSTP925] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 25, MSTPSR9, 0), /* I2C5 */
         [MSTP917] = SH_CLK_MSTP32_STS(&qspi_clk, SMSTPCR9, 17, MSTPSR9, 0), /* QSPI */
         [MSTP815] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 15, MSTPSR8, 0), /* SATA0 */
         [MSTP814] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 14, MSTPSR8, 0), /* SATA1 */
@@ -295,14 +293,9 @@ static struct clk_lookup lookups[] = {
 
 void __init r8a7791_clock_init(void)
 {
-        void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
-        u32 mode;
+        u32 mode = rcar_gen2_read_mode_pins();
         int k, ret = 0;
 
-        BUG_ON(!modemr);
-        mode = ioread32(modemr);
-        iounmap(modemr);
-
         switch (mode & (MD(14) | MD(13))) {
         case 0:
                 R8A7791_CLOCK_ROOT(15, &extal_clk, 172, 208, 106, 88);
diff --git a/arch/arm/mach-shmobile/clock.c b/arch/arm/mach-shmobile/clock.c
index ad7df629d995..e7232a0373b9 100644
--- a/arch/arm/mach-shmobile/clock.c
+++ b/arch/arm/mach-shmobile/clock.c
@@ -21,6 +21,32 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
+
+#ifdef CONFIG_COMMON_CLK
+#include <linux/clk.h>
+#include <linux/clkdev.h>
+#include <mach/clock.h>
+
+void __init shmobile_clk_workaround(const struct clk_name *clks,
+                                    int nr_clks, bool enable)
+{
+        const struct clk_name *clkn;
+        struct clk *clk;
+        unsigned int i;
+
+        for (i = 0; i < nr_clks; ++i) {
+                clkn = clks + i;
+                clk = clk_get(NULL, clkn->clk);
+                if (!IS_ERR(clk)) {
+                        clk_register_clkdev(clk, clkn->con_id, clkn->dev_id);
+                        if (enable)
+                                clk_prepare_enable(clk);
+                        clk_put(clk);
+                }
+        }
+}
+
+#else /* CONFIG_COMMON_CLK */
 #include <linux/sh_clk.h>
 #include <linux/export.h>
 #include <mach/clock.h>
@@ -58,3 +84,5 @@ void __clk_put(struct clk *clk)
 {
 }
 EXPORT_SYMBOL(__clk_put);
+
+#endif /* CONFIG_COMMON_CLK */
diff --git a/arch/arm/mach-shmobile/include/mach/clock.h b/arch/arm/mach-shmobile/include/mach/clock.h
index 03e56074928c..9a93cf924b9c 100644
--- a/arch/arm/mach-shmobile/include/mach/clock.h
+++ b/arch/arm/mach-shmobile/include/mach/clock.h
@@ -1,6 +1,21 @@
 #ifndef CLOCK_H
 #define CLOCK_H
 
+#ifdef CONFIG_COMMON_CLK
+/* temporary clock configuration helper for platform devices */
+
+struct clk_name {
+        const char *clk;
+        const char *con_id;
+        const char *dev_id;
+};
+
+void shmobile_clk_workaround(const struct clk_name *clks, int nr_clks,
+                             bool enable);
+
+#else /* CONFIG_COMMON_CLK */
+/* legacy clock implementation */
+
 unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk);
 extern struct sh_clk_ops shmobile_fixed_ratio_clk_ops;
 
@@ -36,4 +51,5 @@ do {			\
         (p)->div = d;   \
 } while (0)
 
+#endif /* CONFIG_COMMON_CLK */
 #endif
diff --git a/arch/mips/include/asm/mach-jz4740/dma.h b/arch/mips/include/asm/mach-jz4740/dma.h
index 509cd5828044..14ecc5313d2d 100644
--- a/arch/mips/include/asm/mach-jz4740/dma.h
+++ b/arch/mips/include/asm/mach-jz4740/dma.h
@@ -22,8 +22,6 @@ enum jz4740_dma_request_type {
         JZ4740_DMA_TYPE_UART_RECEIVE    = 21,
         JZ4740_DMA_TYPE_SPI_TRANSMIT    = 22,
         JZ4740_DMA_TYPE_SPI_RECEIVE     = 23,
-        JZ4740_DMA_TYPE_AIC_TRANSMIT    = 24,
-        JZ4740_DMA_TYPE_AIC_RECEIVE     = 25,
         JZ4740_DMA_TYPE_MMC_TRANSMIT    = 26,
         JZ4740_DMA_TYPE_MMC_RECEIVE     = 27,
         JZ4740_DMA_TYPE_TCU             = 28,
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index c01900e5d078..088e92a79ae6 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -425,6 +425,15 @@ static struct platform_device qi_lb60_audio_device = {
         .id = -1,
 };
 
+static struct gpiod_lookup_table qi_lb60_audio_gpio_table = {
+        .dev_id = "qi-lb60-audio",
+        .table = {
+                GPIO_LOOKUP("Bank B", 29, "snd", 0),
+                GPIO_LOOKUP("Bank D", 4, "amp", 0),
+                { },
+        },
+};
+
 static struct platform_device *jz_platform_devices[] __initdata = {
         &jz4740_udc_device,
         &jz4740_udc_xceiv_device,
@@ -461,6 +470,8 @@ static int __init qi_lb60_init_platform_devices(void)
         jz4740_adc_device.dev.platform_data = &qi_lb60_battery_pdata;
         jz4740_mmc_device.dev.platform_data = &qi_lb60_mmc_pdata;
 
+        gpiod_add_lookup_table(&qi_lb60_audio_gpio_table);
+
         jz4740_serial_device_register();
 
         spi_register_board_info(qi_lb60_spi_board_info,
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 06e64b6fcb89..0c6c21c5b1a8 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -673,9 +673,13 @@ int mc13xxx_common_init(struct device *dev)
         if (mc13xxx->flags & MC13XXX_USE_ADC)
                 mc13xxx_add_subdevice(mc13xxx, "%s-adc");
 
-        if (mc13xxx->flags & MC13XXX_USE_CODEC)
-                mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
-                                        pdata->codec, sizeof(*pdata->codec));
+        if (mc13xxx->flags & MC13XXX_USE_CODEC) {
+                if (pdata)
+                        mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
+                                pdata->codec, sizeof(*pdata->codec));
+                else
+                        mc13xxx_add_subdevice(mc13xxx, "%s-codec");
+        }
 
         if (mc13xxx->flags & MC13XXX_USE_RTC)
                 mc13xxx_add_subdevice(mc13xxx, "%s-rtc");
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index 6548a5fbcf4a..9a7c4c5a35d1 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -33,8 +33,8 @@
 #define R8A7790_CLK_TMU0                25
 #define R8A7790_CLK_VSP1_DU1            27
 #define R8A7790_CLK_VSP1_DU0            28
-#define R8A7790_CLK_VSP1_RT             30
-#define R8A7790_CLK_VSP1_SY             31
+#define R8A7790_CLK_VSP1_R              30
+#define R8A7790_CLK_VSP1_S              31
 
 /* MSTP2 */
 #define R8A7790_CLK_SCIFA2              2
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index 30f82f286e29..f069bc6627cb 100644
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -32,7 +32,7 @@
 #define R8A7791_CLK_TMU0                25
 #define R8A7791_CLK_VSP1_DU1            27
 #define R8A7791_CLK_VSP1_DU0            28
-#define R8A7791_CLK_VSP1_SY             31
+#define R8A7791_CLK_VSP1_S              31
 
 /* MSTP2 */
 #define R8A7791_CLK_SCIFA2              2
diff --git a/include/sound/atmel-ac97c.h b/include/sound/atmel-ac97c.h
index e6aabdb45865..00e6c289a936 100644
--- a/include/sound/atmel-ac97c.h
+++ b/include/sound/atmel-ac97c.h
@@ -23,7 +23,6 @@
  * @reset_pin: GPIO pin wired to the reset input on the external AC97 codec,
  *             optional to use, set to -ENODEV if not in use. AC97 layer will
  *             try to do a software reset of the external codec anyway.
- * @flags: Flags for which directions should be enabled.
  *
  * If the user do not want to use a DMA channel for playback or capture, i.e.
  * only one feature is required on the board. The slave for playback or capture
@@ -33,7 +32,6 @@
 struct ac97c_platform_data {
         struct dw_dma_slave     rx_dws;
         struct dw_dma_slave     tx_dws;
-        unsigned int            flags;
         int                     reset_pin;
 };
 
diff --git a/include/sound/core.h b/include/sound/core.h
index d3f5f818e0b9..eedda2cdfe57 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -282,13 +282,6 @@ int snd_card_new(struct device *parent, int idx, const char *xid,
                  struct module *module, int extra_size,
                  struct snd_card **card_ret);
 
-static inline int __deprecated
-snd_card_create(int idx, const char *id, struct module *module, int extra_size,
-                struct snd_card **ret)
-{
-        return snd_card_new(NULL, idx, id, module, extra_size, ret);
-}
-
 int snd_card_disconnect(struct snd_card *card);
 int snd_card_free(struct snd_card *card);
 int snd_card_free_when_closed(struct snd_card *card);
diff --git a/include/sound/cs42l56.h b/include/sound/cs42l56.h
new file mode 100644
index 000000000000..2467c8ff132c
--- /dev/null
+++ b/include/sound/cs42l56.h
@@ -0,0 +1,48 @@
+/*
+ * linux/sound/cs42l56.h -- Platform data for CS42L56
+ *
+ * Copyright (c) 2014 Cirrus Logic Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __CS42L56_H
+#define __CS42L56_H
+
+struct cs42l56_platform_data {
+
+        /* GPIO for Reset */
+        unsigned int gpio_nreset;
+
+        /* MICBIAS Level. Check datasheet Pg48 */
+        unsigned int micbias_lvl;
+
+        /* Analog Input 1A Reference 0=Single 1=Pseudo-Differential */
+        unsigned int ain1a_ref_cfg;
+
+        /* Analog Input 2A Reference 0=Single 1=Pseudo-Differential */
+        unsigned int ain2a_ref_cfg;
+
+        /* Analog Input 1B Reference 0=Single 1=Pseudo-Differential */
+        unsigned int ain1b_ref_cfg;
+
+        /* Analog Input 2B Reference 0=Single 1=Pseudo-Differential */
+        unsigned int ain2b_ref_cfg;
+
+        /* Charge Pump Freq. Check datasheet Pg62 */
+        unsigned int chgfreq;
+
+        /* HighPass Filter Right Channel Corner Frequency */
+        unsigned int hpfb_freq;
+
+        /* HighPass Filter Left Channel Corner Frequency */
+        unsigned int hpfa_freq;
+
+        /* Adaptive Power Control for LO/HP */
+        unsigned int adaptive_pwr;
+
+};
+
+#endif /* __CS42L56_H */
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h
index 34a3c02a4576..f4a706f82cb7 100644
--- a/include/sound/rcar_snd.h
+++ b/include/sound/rcar_snd.h
@@ -34,47 +34,39 @@
  * B : SSI direction
  */
 #define RSND_SSI_CLK_PIN_SHARE          (1 << 31)
-#define RSND_SSI_PLAY                   (1 << 24)
 
 #define RSND_SSI(_dma_id, _pio_irq, _flags)             \
 { .dma_id = _dma_id, .pio_irq = _pio_irq, .flags = _flags }
-#define RSND_SSI_SET(_dai_id, _dma_id, _pio_irq, _flags)        \
-{ .dai_id = _dai_id, .dma_id = _dma_id, .pio_irq = _pio_irq, .flags = _flags }
 #define RSND_SSI_UNUSED \
-{ .dai_id = -1, .dma_id = -1, .pio_irq = -1, .flags = 0 }
+{ .dma_id = -1, .pio_irq = -1, .flags = 0 }
 
 struct rsnd_ssi_platform_info {
-        int dai_id;     /* will be removed */
         int dma_id;
         int pio_irq;
         u32 flags;
 };
 
-/*
- * flags
- */
-#define RSND_SCU_USE_HPBIF              (1 << 31) /* it needs RSND_SSI_DEPENDENT */
-
 #define RSND_SRC(rate, _dma_id)                                         \
-{ .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, }
-#define RSND_SRC_SET(rate, _dma_id)             \
-        { .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, }
+{ .convert_rate = rate, .dma_id = _dma_id, }
 #define RSND_SRC_UNUSED                         \
-        { .flags = 0, .convert_rate = 0, .dma_id = 0, }
-
-#define rsnd_scu_platform_info  rsnd_src_platform_info
-#define src_info                scu_info
-#define src_info_nr             scu_info_nr
+{ .convert_rate = 0, .dma_id = -1, }
 
 struct rsnd_src_platform_info {
-        u32 flags;
         u32 convert_rate; /* sampling rate convert */
         int dma_id; /* for Gen2 SCU */
 };
 
+/*
+ * flags
+ */
+struct rsnd_dvc_platform_info {
+        u32 flags;
+};
+
 struct rsnd_dai_path_info {
         struct rsnd_ssi_platform_info *ssi;
         struct rsnd_src_platform_info *src;
+        struct rsnd_dvc_platform_info *dvc;
 };
 
 struct rsnd_dai_platform_info {
@@ -99,6 +91,8 @@ struct rcar_snd_info {
         int ssi_info_nr;
         struct rsnd_src_platform_info *src_info;
         int src_info_nr;
+        struct rsnd_dvc_platform_info *dvc_info;
+        int dvc_info_nr;
         struct rsnd_dai_platform_info *dai_info;
         int dai_info_nr;
         int (*start)(int id);
diff --git a/include/sound/rt5640.h b/include/sound/rt5640.h
index 27cc75ed67f8..59d26dd81e45 100644
--- a/include/sound/rt5640.h
+++ b/include/sound/rt5640.h
@@ -16,6 +16,10 @@ struct rt5640_platform_data {
         bool in1_diff;
         bool in2_diff;
 
+        bool dmic_en;
+        bool dmic1_data_pin; /* 0 = IN1P; 1 = GPIO3 */
+        bool dmic2_data_pin; /* 0 = IN1N; 1 = GPIO4 */
+
         int ldo1_en; /* GPIO for LDO1_EN */
 };
 
diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h
new file mode 100644
index 000000000000..1de744c242f6
--- /dev/null
+++ b/include/sound/rt5645.h
@@ -0,0 +1,25 @@
+/*
+ * linux/sound/rt5645.h -- Platform data for RT5645
+ *
+ * Copyright 2013 Realtek Microelectronics
+ *
+ * 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 __LINUX_SND_RT5645_H
+#define __LINUX_SND_RT5645_H
+
+struct rt5645_platform_data {
+        /* IN2 can optionally be differential */
+        bool in2_diff;
+
+        bool dmic_en;
+        unsigned int dmic1_data_pin;
+        /* 0 = IN2N; 1 = GPIO5; 2 = GPIO11 */
+        unsigned int dmic2_data_pin;
+        /* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */
+};
+
+#endif
diff --git a/include/sound/rt5651.h b/include/sound/rt5651.h
new file mode 100644
index 000000000000..d35de758dfb5
--- /dev/null
+++ b/include/sound/rt5651.h
@@ -0,0 +1,21 @@
+/*
+ * linux/sound/rt286.h -- Platform data for RT286
+ *
+ * Copyright 2013 Realtek Microelectronics
+ *
+ * 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 __LINUX_SND_RT5651_H
+#define __LINUX_SND_RT5651_H
+
+struct rt5651_platform_data {
+        /* IN2 can optionally be differential */
+        bool in2_diff;
+
+        bool dmic_en;
+};
+
+#endif
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index fad76769f153..688f2ba8009f 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -252,7 +252,6 @@ struct snd_soc_dai {
         unsigned int symmetric_rates:1;
         unsigned int symmetric_channels:1;
         unsigned int symmetric_samplebits:1;
-        struct snd_pcm_runtime *runtime;
         unsigned int active;
         unsigned char probed:1;
 
@@ -277,7 +276,6 @@ struct snd_soc_dai {
         struct snd_soc_card *card;
 
         struct list_head list;
-        struct list_head card_list;
 };
 
 static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai,
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index ef78f562f4a8..6b59471cdf44 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -107,10 +107,6 @@ struct device;
 {       .id = snd_soc_dapm_mux, .name = wname, \
         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
         .kcontrol_news = wcontrols, .num_kcontrols = 1}
-#define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \
-        SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols)
-#define SND_SOC_DAPM_VALUE_MUX(wname, wreg, wshift, winvert, wcontrols) \
-        SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols)
 
 /* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */
 #define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\
@@ -166,10 +162,6 @@ struct device;
         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
         .kcontrol_news = wcontrols, .num_kcontrols = 1, \
         .event = wevent, .event_flags = wflags}
-#define SND_SOC_DAPM_VIRT_MUX_E(wname, wreg, wshift, winvert, wcontrols, \
-        wevent, wflags) \
-        SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, wevent, \
-                wflags)
 
 /* additional sequencing control within an event type */
 #define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, \
@@ -256,9 +248,8 @@ struct device;
 /* generic widgets */
 #define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_val) \
 {       .id = wid, .name = wname, .kcontrol_news = NULL, .num_kcontrols = 0, \
-        .reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \
-        .on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \
-        .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}
+        .reg = wreg, .shift = wshift, .mask = wmask, \
+        .on_val = won_val, .off_val = woff_val, }
 #define SND_SOC_DAPM_SUPPLY(wname, wreg, wshift, winvert, wevent, wflags) \
 {       .id = snd_soc_dapm_supply, .name = wname, \
         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
@@ -305,16 +296,12 @@ struct device;
         .get = snd_soc_dapm_get_enum_double, \
         .put = snd_soc_dapm_put_enum_double, \
         .private_value = (unsigned long)&xenum }
-#define SOC_DAPM_ENUM_VIRT(xname, xenum) \
-        SOC_DAPM_ENUM(xname, xenum)
 #define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_info_enum_double, \
         .get = xget, \
         .put = xput, \
         .private_value = (unsigned long)&xenum }
-#define SOC_DAPM_VALUE_ENUM(xname, xenum) \
-        SOC_DAPM_ENUM(xname, xenum)
 #define SOC_DAPM_PIN_SWITCH(xname) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \
         .info = snd_soc_dapm_info_pin_switch, \
@@ -362,8 +349,6 @@ struct regulator;
 struct snd_soc_dapm_widget_list;
 struct snd_soc_dapm_update;
 
-int dapm_reg_event(struct snd_soc_dapm_widget *w,
-                   struct snd_kcontrol *kcontrol, int event);
 int dapm_regulator_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *kcontrol, int event);
 int dapm_clock_event(struct snd_soc_dapm_widget *w,
@@ -606,6 +591,7 @@ struct snd_soc_dapm_context {
                              enum snd_soc_dapm_type, int);
 
         struct device *dev; /* from parent - for debug */
+        struct snd_soc_component *component; /* parent component */
         struct snd_soc_codec *codec; /* parent codec */
         struct snd_soc_platform *platform; /* parent platform */
         struct snd_soc_card *card; /* parent card */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 0b83168d8ff4..dcdcc95efd1d 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -196,8 +196,6 @@
         .info = snd_soc_info_enum_double, \
         .get = snd_soc_get_enum_double, .put = snd_soc_put_enum_double, \
         .private_value = (unsigned long)&xenum }
-#define SOC_VALUE_ENUM(xname, xenum) \
-        SOC_ENUM(xname, xenum)
 #define SOC_SINGLE_EXT(xname, xreg, xshift, xmax, xinvert,\
          xhandler_get, xhandler_put) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -266,6 +264,13 @@
                 {.base = xbase, .num_regs = xregs,            \
                  .mask = xmask }) }
 
+#define SND_SOC_BYTES_EXT(xname, xcount, xhandler_get, xhandler_put) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = snd_soc_bytes_info_ext, \
+        .get = xhandler_get, .put = xhandler_put, \
+        .private_value = (unsigned long)&(struct soc_bytes_ext) \
+                {.max = xcount} }
+
 #define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \
                 xmin, xmax, xinvert) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
@@ -377,6 +382,8 @@ int snd_soc_resume(struct device *dev);
 int snd_soc_poweroff(struct device *dev);
 int snd_soc_register_platform(struct device *dev,
                 const struct snd_soc_platform_driver *platform_drv);
+int devm_snd_soc_register_platform(struct device *dev,
+                const struct snd_soc_platform_driver *platform_drv);
 void snd_soc_unregister_platform(struct device *dev);
 int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
                 const struct snd_soc_platform_driver *platform_drv);
@@ -393,14 +400,6 @@ int devm_snd_soc_register_component(struct device *dev,
                          const struct snd_soc_component_driver *cmpnt_drv,
                          struct snd_soc_dai_driver *dai_drv, int num_dai);
 void snd_soc_unregister_component(struct device *dev);
-int snd_soc_codec_volatile_register(struct snd_soc_codec *codec,
-                                    unsigned int reg);
-int snd_soc_codec_readable_register(struct snd_soc_codec *codec,
-                                    unsigned int reg);
-int snd_soc_codec_writable_register(struct snd_soc_codec *codec,
-                                    unsigned int reg);
-int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
-                               struct regmap *regmap);
 int snd_soc_cache_sync(struct snd_soc_codec *codec);
 int snd_soc_cache_init(struct snd_soc_codec *codec);
 int snd_soc_cache_exit(struct snd_soc_codec *codec);
@@ -469,12 +468,12 @@ static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
 #endif
 
 /* codec register bit access */
-int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
+int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg,
                                 unsigned int mask, unsigned int value);
 int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
-                               unsigned short reg, unsigned int mask,
+                               unsigned int reg, unsigned int mask,
                                unsigned int value);
-int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,
+int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg,
                                 unsigned int mask, unsigned int value);
 
 int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,
@@ -540,6 +539,8 @@ int snd_soc_bytes_get(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol);
 int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol);
+int snd_soc_bytes_info_ext(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_info *ucontrol);
 int snd_soc_info_xr_sx(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
 int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol,
@@ -668,6 +669,7 @@ struct snd_soc_component {
         unsigned int active;
 
         unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
+        unsigned int registered_as_component:1;
 
         struct list_head list;
 
@@ -677,6 +679,14 @@ struct snd_soc_component {
         const struct snd_soc_component_driver *driver;
 
         struct list_head dai_list;
+
+        int (*read)(struct snd_soc_component *, unsigned int, unsigned int *);
+        int (*write)(struct snd_soc_component *, unsigned int, unsigned int);
+
+        struct regmap *regmap;
+        int val_bytes;
+
+        struct mutex io_mutex;
 };
 
 /* SoC Audio Codec device */
@@ -691,10 +701,6 @@ struct snd_soc_codec {
         struct snd_soc_card *card;
         struct list_head list;
         struct list_head card_list;
-        int num_dai;
-        int (*volatile_register)(struct snd_soc_codec *, unsigned int);
-        int (*readable_register)(struct snd_soc_codec *, unsigned int);
-        int (*writable_register)(struct snd_soc_codec *, unsigned int);
 
         /* runtime */
         struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */
@@ -704,18 +710,14 @@ struct snd_soc_codec {
         unsigned int ac97_registered:1; /* Codec has been AC97 registered */
         unsigned int ac97_created:1; /* Codec has been created by SoC */
         unsigned int cache_init:1; /* codec cache has been initialized */
-        unsigned int using_regmap:1; /* using regmap access */
         u32 cache_only;  /* Suppress writes to hardware */
         u32 cache_sync; /* Cache needs to be synced to hardware */
 
         /* codec IO */
         void *control_data; /* codec control (i2c/3wire) data */
         hw_write_t hw_write;
-        unsigned int (*read)(struct snd_soc_codec *, unsigned int);
-        int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
         void *reg_cache;
         struct mutex cache_rw_mutex;
-        int val_bytes;
 
         /* component */
         struct snd_soc_component component;
@@ -754,13 +756,9 @@ struct snd_soc_codec_driver {
                 unsigned int freq_in, unsigned int freq_out);
 
         /* codec IO */
+        struct regmap *(*get_regmap)(struct device *);
         unsigned int (*read)(struct snd_soc_codec *, unsigned int);
         int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
-        int (*display_register)(struct snd_soc_codec *, char *,
-                                size_t, unsigned int);
-        int (*volatile_register)(struct snd_soc_codec *, unsigned int);
-        int (*readable_register)(struct snd_soc_codec *, unsigned int);
-        int (*writable_register)(struct snd_soc_codec *, unsigned int);
         unsigned int reg_cache_size;
         short reg_cache_step;
         short reg_word_size;
@@ -791,6 +789,7 @@ struct snd_soc_platform_driver {
         int (*remove)(struct snd_soc_platform *);
         int (*suspend)(struct snd_soc_dai *dai);
         int (*resume)(struct snd_soc_dai *dai);
+        struct snd_soc_component_driver component_driver;
 
         /* pcm creation and destruction */
         int (*pcm_new)(struct snd_soc_pcm_runtime *);
@@ -835,7 +834,6 @@ struct snd_soc_platform {
         int id;
         struct device *dev;
         const struct snd_soc_platform_driver *driver;
-        struct mutex mutex;
 
         unsigned int suspended:1; /* platform is suspended */
         unsigned int probed:1;
@@ -844,6 +842,8 @@ struct snd_soc_platform {
         struct list_head list;
         struct list_head card_list;
 
+        struct snd_soc_component component;
+
         struct snd_soc_dapm_context dapm;
 
 #ifdef CONFIG_DEBUG_FS
@@ -931,7 +931,12 @@ struct snd_soc_dai_link {
 };
 
 struct snd_soc_codec_conf {
+        /*
+         * specify device either by device name, or by
+         * DT/OF node, but not both.
+         */
         const char *dev_name;
+        const struct device_node *of_node;
 
         /*
          * optional map of kcontrol, widget and path name prefixes that are
@@ -942,7 +947,13 @@ struct snd_soc_codec_conf {
 
 struct snd_soc_aux_dev {
         const char *name;               /* Codec name */
-        const char *codec_name;         /* for multi-codec */
+
+        /*
+         * specify multi-codec either by device name, or by
+         * DT/OF node, but not both.
+         */
+        const char *codec_name;
+        const struct device_node *codec_of_node;
 
         /* codec/machine specific init - e.g. add machine controls */
         int (*init)(struct snd_soc_dapm_context *dapm);
@@ -957,7 +968,6 @@ struct snd_soc_card {
         struct snd_card *snd_card;
         struct module *owner;
 
-        struct list_head list;
         struct mutex mutex;
         struct mutex dapm_mutex;
 
@@ -1020,7 +1030,6 @@ struct snd_soc_card {
         /* lists of probed devices belonging to this card */
         struct list_head codec_dev_list;
         struct list_head platform_dev_list;
-        struct list_head dai_dev_list;
 
         struct list_head widgets;
         struct list_head paths;
@@ -1090,6 +1099,10 @@ struct soc_bytes {
         u32 mask;
 };
 
+struct soc_bytes_ext {
+        int max;
+};
+
 /* multi register control */
 struct soc_mreg_control {
         long min, max;
@@ -1120,10 +1133,39 @@ static inline struct snd_soc_codec *snd_soc_component_to_codec(
         return container_of(component, struct snd_soc_codec, component);
 }
 
+/**
+ * snd_soc_component_to_platform() - Casts a component to the platform it is embedded in
+ * @component: The component to cast to a platform
+ *
+ * This function must only be used on components that are known to be platforms.
+ * Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_platform *snd_soc_component_to_platform(
+        struct snd_soc_component *component)
+{
+        return container_of(component, struct snd_soc_platform, component);
+}
+
 /* codec IO */
 unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
-unsigned int snd_soc_write(struct snd_soc_codec *codec,
-                           unsigned int reg, unsigned int val);
+int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
+        unsigned int val);
+
+/* component IO */
+int snd_soc_component_read(struct snd_soc_component *component,
+        unsigned int reg, unsigned int *val);
+int snd_soc_component_write(struct snd_soc_component *component,
+        unsigned int reg, unsigned int val);
+int snd_soc_component_update_bits(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int val);
+int snd_soc_component_update_bits_async(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int val);
+void snd_soc_component_async_complete(struct snd_soc_component *component);
+int snd_soc_component_test_bits(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int value);
+
+int snd_soc_component_init_io(struct snd_soc_component *component,
+        struct regmap *regmap);
 
 /* device driver data */
 
@@ -1173,7 +1215,6 @@ static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)
 
 static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
 {
-        INIT_LIST_HEAD(&card->dai_dev_list);
         INIT_LIST_HEAD(&card->codec_dev_list);
         INIT_LIST_HEAD(&card->platform_dev_list);
         INIT_LIST_HEAD(&card->widgets);
@@ -1228,6 +1269,50 @@ static inline bool snd_soc_codec_is_active(struct snd_soc_codec *codec)
         return snd_soc_component_is_active(&codec->component);
 }
 
+/**
+ * snd_soc_kcontrol_component() - Returns the component that registered the
+ *  control
+ * @kcontrol: The control for which to get the component
+ *
+ * Note: This function will work correctly if the control has been registered
+ * for a component. Either with snd_soc_add_codec_controls() or
+ * snd_soc_add_platform_controls() or via  table based setup for either a
+ * CODEC, a platform or component driver. Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_component *snd_soc_kcontrol_component(
+        struct snd_kcontrol *kcontrol)
+{
+        return snd_kcontrol_chip(kcontrol);
+}
+
+/**
+ * snd_soc_kcontrol_codec() - Returns the CODEC that registered the control
+ * @kcontrol: The control for which to get the CODEC
+ *
+ * Note: This function will only work correctly if the control has been
+ * registered with snd_soc_add_codec_controls() or via table based setup of
+ * snd_soc_codec_driver. Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_codec *snd_soc_kcontrol_codec(
+        struct snd_kcontrol *kcontrol)
+{
+        return snd_soc_component_to_codec(snd_soc_kcontrol_component(kcontrol));
+}
+
+/**
+ * snd_soc_kcontrol_platform() - Returns the platform that registerd the control
+ * @kcontrol: The control for which to get the platform
+ *
+ * Note: This function will only work correctly if the control has been
+ * registered with snd_soc_add_platform_controls() or via table based setup of
+ * a snd_soc_platform_driver. Otherwise the behavior is undefined.
+ */
+static inline struct snd_soc_platform *snd_soc_kcontrol_platform(
+        struct snd_kcontrol *kcontrol)
+{
+        return snd_soc_component_to_platform(snd_soc_kcontrol_component(kcontrol));
+}
+
 int snd_soc_util_init(void);
 void snd_soc_util_exit(void);
 
@@ -1241,7 +1326,9 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np,
 int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
                                    const char *propname);
 unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
-                                     const char *prefix);
+                                     const char *prefix,
+                                     struct device_node **bitclkmaster,
+                                     struct device_node **framemaster);
 int snd_soc_of_get_dai_name(struct device_node *of_node,
                             const char **dai_name);
 
diff --git a/include/sound/sta350.h b/include/sound/sta350.h
new file mode 100644
index 000000000000..42edceb096a0
--- /dev/null
+++ b/include/sound/sta350.h
@@ -0,0 +1,57 @@
+/*
+ * Platform data for ST STA350 ASoC codec driver.
+ *
+ * Copyright: 2014 Raumfeld GmbH
+ * Author: Sven Brandau <info@brandau.biz>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#ifndef __LINUX_SND__STA350_H
+#define __LINUX_SND__STA350_H
+
+#define STA350_OCFG_2CH         0
+#define STA350_OCFG_2_1CH       1
+#define STA350_OCFG_1CH         3
+
+#define STA350_OM_CH1           0
+#define STA350_OM_CH2           1
+#define STA350_OM_CH3           2
+
+#define STA350_THERMAL_ADJUSTMENT_ENABLE        1
+#define STA350_THERMAL_RECOVERY_ENABLE          2
+#define STA350_FAULT_DETECT_RECOVERY_BYPASS     1
+
+#define STA350_FFX_PM_DROP_COMP                 0
+#define STA350_FFX_PM_TAPERED_COMP              1
+#define STA350_FFX_PM_FULL_POWER                2
+#define STA350_FFX_PM_VARIABLE_DROP_COMP        3
+
+
+struct sta350_platform_data {
+        u8 output_conf;
+        u8 ch1_output_mapping;
+        u8 ch2_output_mapping;
+        u8 ch3_output_mapping;
+        u8 ffx_power_output_mode;
+        u8 drop_compensation_ns;
+        u8 powerdown_delay_divider;
+        unsigned int thermal_warning_recovery:1;
+        unsigned int thermal_warning_adjustment:1;
+        unsigned int fault_detect_recovery:1;
+        unsigned int oc_warning_adjustment:1;
+        unsigned int max_power_use_mpcc:1;
+        unsigned int max_power_correction:1;
+        unsigned int am_reduction_mode:1;
+        unsigned int odd_pwm_speed_mode:1;
+        unsigned int distortion_compensation:1;
+        unsigned int invalid_input_detect_mute:1;
+        unsigned int activate_mute_output:1;
+        unsigned int bridge_immediate_off:1;
+        unsigned int noise_shape_dc_cut:1;
+        unsigned int powerdown_master_vol:1;
+};
+
+#endif /* __LINUX_SND__STA350_H */
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index 03996b2bb04f..c75c795a377b 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -11,102 +11,10 @@
 
 struct snd_soc_jack;
 struct snd_soc_codec;
-struct snd_soc_platform;
 struct snd_soc_card;
 struct snd_soc_dapm_widget;
 struct snd_soc_dapm_path;
 
-/*
- * Log register events
- */
-DECLARE_EVENT_CLASS(snd_soc_reg,
-
-        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(codec, reg, val),
-
-        TP_STRUCT__entry(
-                __string(       name,           codec->name     )
-                __field(        int,            id              )
-                __field(        unsigned int,   reg             )
-                __field(        unsigned int,   val             )
-        ),
-
-        TP_fast_assign(
-                __assign_str(name, codec->name);
-                __entry->id = codec->id;
-                __entry->reg = reg;
-                __entry->val = val;
-        ),
-
-        TP_printk("codec=%s.%d reg=%x val=%x", __get_str(name),
-                  (int)__entry->id, (unsigned int)__entry->reg,
-                  (unsigned int)__entry->val)
-);
-
-DEFINE_EVENT(snd_soc_reg, snd_soc_reg_write,
-
-        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(codec, reg, val)
-
-);
-
-DEFINE_EVENT(snd_soc_reg, snd_soc_reg_read,
-
-        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(codec, reg, val)
-
-);
-
-DECLARE_EVENT_CLASS(snd_soc_preg,
-
-        TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(platform, reg, val),
-
-        TP_STRUCT__entry(
-                __string(       name,           platform->name  )
-                __field(        int,            id              )
-                __field(        unsigned int,   reg             )
-                __field(        unsigned int,   val             )
-        ),
-
-        TP_fast_assign(
-                __assign_str(name, platform->name);
-                __entry->id = platform->id;
-                __entry->reg = reg;
-                __entry->val = val;
-        ),
-
-        TP_printk("platform=%s.%d reg=%x val=%x", __get_str(name),
-                  (int)__entry->id, (unsigned int)__entry->reg,
-                  (unsigned int)__entry->val)
-);
-
-DEFINE_EVENT(snd_soc_preg, snd_soc_preg_write,
-
-        TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(platform, reg, val)
-
-);
-
-DEFINE_EVENT(snd_soc_preg, snd_soc_preg_read,
-
-        TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
-                 unsigned int val),
-
-        TP_ARGS(platform, reg, val)
-
-);
-
 DECLARE_EVENT_CLASS(snd_soc_card,
 
         TP_PROTO(struct snd_soc_card *card, int val),
diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
index f01bffb702bc..401107b85d30 100644
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
@@ -241,7 +241,7 @@ static struct snd_kcontrol_new inputgain_control = {
 static int onyx_snd_capture_source_info(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = { "Line-In", "Microphone" };
+        static const char * const texts[] = { "Line-In", "Microphone" };
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c
index e6c727b317fb..83be8e3f095e 100644
--- a/sound/arm/pxa2xx-pcm.c
+++ b/sound/arm/pxa2xx-pcm.c
@@ -14,6 +14,8 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 
+#include <mach/dma.h>
+
 #include <sound/core.h>
 #include <sound/pxa2xx-lib.h>
 #include <sound/dmaengine_pcm.h>
diff --git a/sound/arm/pxa2xx-pcm.h b/sound/arm/pxa2xx-pcm.h
index 2a8fc08d52a1..00330985beec 100644
--- a/sound/arm/pxa2xx-pcm.h
+++ b/sound/arm/pxa2xx-pcm.h
@@ -9,12 +9,11 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <mach/dma.h>
 
 struct pxa2xx_runtime_data {
         int dma_ch;
         struct snd_dmaengine_dai_dma_data *params;
-        pxa_dma_desc *dma_desc_array;
+        struct pxa_dma_desc *dma_desc_array;
         dma_addr_t dma_desc_array_phys;
 };
 
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 05ec049c9faf..a04d23174dc2 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -1198,6 +1198,7 @@ static int atmel_ac97c_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver atmel_ac97c_driver = {
+        .probe          = atmel_ac97c_probe,
         .remove         = atmel_ac97c_remove,
         .driver         = {
                 .name   = "atmel_ac97c",
@@ -1205,19 +1206,7 @@ static struct platform_driver atmel_ac97c_driver = {
                 .pm     = ATMEL_AC97C_PM_OPS,
         },
 };
-
-static int __init atmel_ac97c_init(void)
-{
-        return platform_driver_probe(&atmel_ac97c_driver,
-                        atmel_ac97c_probe);
-}
-module_init(atmel_ac97c_init);
-
-static void __exit atmel_ac97c_exit(void)
-{
-        platform_driver_unregister(&atmel_ac97c_driver);
-}
-module_exit(atmel_ac97c_exit);
+module_platform_driver(atmel_ac97c_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Driver for Atmel AC97 controller");
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index ce83def9f43b..9acc77eae487 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -345,7 +345,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
                         snd_pcm_debug_name(substream, name, sizeof(name));
                         xrun_log_show(substream);
                         pcm_err(substream->pcm,
-                                "BUG: %s, pos = %ld, buffer size = %ld, period size = %ld\n",
+                                "XRUN: %s, pos = %ld, buffer size = %ld, period size = %ld\n",
                                 name, pos, runtime->buffer_size,
                                 runtime->period_size);
                 }
diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index 3e05c55a2880..a1fd77af6059 100644
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -362,13 +362,13 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev)
                 if (! port->name[0]) {
                         if (info->name[0]) {
                                 if (ports > 1)
-                                        snprintf(port->name, sizeof(port->name), "%s-%d", info->name, p);
+                                        snprintf(port->name, sizeof(port->name), "%s-%u", info->name, p);
                                 else
                                         snprintf(port->name, sizeof(port->name), "%s", info->name);
                         } else {
                                 /* last resort */
                                 if (ports > 1)
-                                        sprintf(port->name, "MIDI %d-%d-%d", card->number, device, p);
+                                        sprintf(port->name, "MIDI %d-%d-%u", card->number, device, p);
                                 else
                                         sprintf(port->name, "MIDI %d-%d", card->number, device);
                         }
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index 25e4609f8339..3bbc3ec5be82 100644
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -567,7 +567,6 @@ static int mpu401_out(int dev, unsigned char midi_byte)
 static int mpu401_command(int dev, mpu_command_rec * cmd)
 {
         int i, timeout, ok;
-        int ret = 0;
         unsigned long   flags;
         struct mpu_config *devc;
 
@@ -644,7 +643,6 @@ retry:
                         }
                 }
         }
-        ret = 0;
         cmd->data[0] = 0;
 
         if (cmd->nr_returns)
@@ -666,7 +664,7 @@ retry:
                 }
         }
         spin_unlock_irqrestore(&devc->lock,flags);
-        return ret;
+        return 0;
 }
 
 static int mpu_cmd(int dev, int cmd, int data)
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index db18ccabadd6..529f5f4f4c9c 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -34,8 +35,6 @@
 #include <sound/opl3.h>
 #include <sound/initval.h>
 
-#include <asm/io.h>
-
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
 #include <media/tea575x.h>
 #endif
@@ -80,7 +79,10 @@ MODULE_PARM_DESC(radio_nr, "Radio device numbers");
  *  Direct registers
  */
 
-#define FM801_REG(chip, reg)    (chip->port + FM801_##reg)
+#define fm801_writew(chip,reg,value)    outw((value), chip->port + FM801_##reg)
+#define fm801_readw(chip,reg)           inw(chip->port + FM801_##reg)
+
+#define fm801_writel(chip,reg,value)    outl((value), chip->port + FM801_##reg)
 
 #define FM801_PCM_VOL           0x00    /* PCM Output Volume */
 #define FM801_FM_VOL            0x02    /* FM Output Volume */
@@ -156,21 +158,27 @@ MODULE_PARM_DESC(radio_nr, "Radio device numbers");
 #define FM801_GPIO_GS3          (1<<15)
 #define FM801_GPIO_GS(x)        (1<<(12+(x)))
         
-/*
-
+/**
+ * struct fm801 - describes FM801 chip
+ * @port:               I/O port number
+ * @multichannel:       multichannel support
+ * @secondary:          secondary codec
+ * @secondary_addr:     address of the secondary codec
+ * @tea575x_tuner:      tuner access method & flags
+ * @ply_ctrl:           playback control
+ * @cap_ctrl:           capture control
  */
-
 struct fm801 {
         int irq;
 
-        unsigned long port;     /* I/O port number */
-        unsigned int multichannel: 1,   /* multichannel support */
-                     secondary: 1;      /* secondary codec */
-        unsigned char secondary_addr;   /* address of the secondary codec */
-        unsigned int tea575x_tuner;     /* tuner access method & flags */
+        unsigned long port;
+        unsigned int multichannel: 1,
+                     secondary: 1;
+        unsigned char secondary_addr;
+        unsigned int tea575x_tuner;
 
-        unsigned short ply_ctrl; /* playback control */
-        unsigned short cap_ctrl; /* capture control */
+        unsigned short ply_ctrl;
+        unsigned short cap_ctrl;
 
         unsigned long ply_buffer;
         unsigned int ply_buf;
@@ -222,6 +230,30 @@ MODULE_DEVICE_TABLE(pci, snd_fm801_ids);
  *  common I/O routines
  */
 
+static bool fm801_ac97_is_ready(struct fm801 *chip, unsigned int iterations)
+{
+        unsigned int idx;
+
+        for (idx = 0; idx < iterations; idx++) {
+                if (!(fm801_readw(chip, AC97_CMD) & FM801_AC97_BUSY))
+                        return true;
+                udelay(10);
+        }
+        return false;
+}
+
+static bool fm801_ac97_is_valid(struct fm801 *chip, unsigned int iterations)
+{
+        unsigned int idx;
+
+        for (idx = 0; idx < iterations; idx++) {
+                if (fm801_readw(chip, AC97_CMD) & FM801_AC97_VALID)
+                        return true;
+                udelay(10);
+        }
+        return false;
+}
+
 static int snd_fm801_update_bits(struct fm801 *chip, unsigned short reg,
                                  unsigned short mask, unsigned short value)
 {
@@ -244,73 +276,54 @@ static void snd_fm801_codec_write(struct snd_ac97 *ac97,
                                   unsigned short val)
 {
         struct fm801 *chip = ac97->private_data;
-        int idx;
 
         /*
          *  Wait until the codec interface is not ready..
          */
-        for (idx = 0; idx < 100; idx++) {
-                if (!(inw(FM801_REG(chip, AC97_CMD)) & FM801_AC97_BUSY))
-                        goto ok1;
-                udelay(10);
+        if (!fm801_ac97_is_ready(chip, 100)) {
+                dev_err(chip->card->dev, "AC'97 interface is busy (1)\n");
+                return;
         }
-        dev_err(chip->card->dev, "AC'97 interface is busy (1)\n");
-        return;
 
- ok1:
         /* write data and address */
-        outw(val, FM801_REG(chip, AC97_DATA));
-        outw(reg | (ac97->addr << FM801_AC97_ADDR_SHIFT), FM801_REG(chip, AC97_CMD));
+        fm801_writew(chip, AC97_DATA, val);
+        fm801_writew(chip, AC97_CMD, reg | (ac97->addr << FM801_AC97_ADDR_SHIFT));
         /*
          *  Wait until the write command is not completed..
-         */
-        for (idx = 0; idx < 1000; idx++) {
-                if (!(inw(FM801_REG(chip, AC97_CMD)) & FM801_AC97_BUSY))
-                        return;
-                udelay(10);
-        }
-        dev_err(chip->card->dev, "AC'97 interface #%d is busy (2)\n", ac97->num);
+         */
+        if (!fm801_ac97_is_ready(chip, 1000))
+                dev_err(chip->card->dev, "AC'97 interface #%d is busy (2)\n",
+                ac97->num);
 }
 
 static unsigned short snd_fm801_codec_read(struct snd_ac97 *ac97, unsigned short reg)
 {
         struct fm801 *chip = ac97->private_data;
-        int idx;
 
         /*
          *  Wait until the codec interface is not ready..
          */
-        for (idx = 0; idx < 100; idx++) {
-                if (!(inw(FM801_REG(chip, AC97_CMD)) & FM801_AC97_BUSY))
-                        goto ok1;
-                udelay(10);
+        if (!fm801_ac97_is_ready(chip, 100)) {
+                dev_err(chip->card->dev, "AC'97 interface is busy (1)\n");
+                return 0;
         }
-        dev_err(chip->card->dev, "AC'97 interface is busy (1)\n");
-        return 0;
 
- ok1:
         /* read command */
-        outw(reg | (ac97->addr << FM801_AC97_ADDR_SHIFT) | FM801_AC97_READ,
-             FM801_REG(chip, AC97_CMD));
-        for (idx = 0; idx < 100; idx++) {
-                if (!(inw(FM801_REG(chip, AC97_CMD)) & FM801_AC97_BUSY))
-                        goto ok2;
-                udelay(10);
+        fm801_writew(chip, AC97_CMD,
+                     reg | (ac97->addr << FM801_AC97_ADDR_SHIFT) | FM801_AC97_READ);
+        if (!fm801_ac97_is_ready(chip, 100)) {
+                dev_err(chip->card->dev, "AC'97 interface #%d is busy (2)\n",
+                        ac97->num);
+                return 0;
         }
-        dev_err(chip->card->dev, "AC'97 interface #%d is busy (2)\n", ac97->num);
-        return 0;
 
- ok2:
-        for (idx = 0; idx < 1000; idx++) {
-                if (inw(FM801_REG(chip, AC97_CMD)) & FM801_AC97_VALID)
-                        goto ok3;
-                udelay(10);
+        if (!fm801_ac97_is_valid(chip, 1000)) {
+                dev_err(chip->card->dev,
+                        "AC'97 interface #%d is not valid (2)\n", ac97->num);
+                return 0;
         }
-        dev_err(chip->card->dev, "AC'97 interface #%d is not valid (2)\n", ac97->num);
-        return 0;
 
- ok3:
-        return inw(FM801_REG(chip, AC97_DATA));
+        return fm801_readw(chip, AC97_DATA);
 }
 
 static unsigned int rates[] = {
@@ -384,7 +397,7 @@ static int snd_fm801_playback_trigger(struct snd_pcm_substream *substream,
                 snd_BUG();
                 return -EINVAL;
         }
-        outw(chip->ply_ctrl, FM801_REG(chip, PLY_CTRL));
+        fm801_writew(chip, PLY_CTRL, chip->ply_ctrl);
         spin_unlock(&chip->reg_lock);
         return 0;
 }
@@ -419,7 +432,7 @@ static int snd_fm801_capture_trigger(struct snd_pcm_substream *substream,
                 snd_BUG();
                 return -EINVAL;
         }
-        outw(chip->cap_ctrl, FM801_REG(chip, CAP_CTRL));
+        fm801_writew(chip, CAP_CTRL, chip->cap_ctrl);
         spin_unlock(&chip->reg_lock);
         return 0;
 }
@@ -457,12 +470,13 @@ static int snd_fm801_playback_prepare(struct snd_pcm_substream *substream)
         }
         chip->ply_ctrl |= snd_fm801_rate_bits(runtime->rate) << FM801_RATE_SHIFT;
         chip->ply_buf = 0;
-        outw(chip->ply_ctrl, FM801_REG(chip, PLY_CTRL));
-        outw(chip->ply_count - 1, FM801_REG(chip, PLY_COUNT));
+        fm801_writew(chip, PLY_CTRL, chip->ply_ctrl);
+        fm801_writew(chip, PLY_COUNT, chip->ply_count - 1);
         chip->ply_buffer = runtime->dma_addr;
         chip->ply_pos = 0;
-        outl(chip->ply_buffer, FM801_REG(chip, PLY_BUF1));
-        outl(chip->ply_buffer + (chip->ply_count % chip->ply_size), FM801_REG(chip, PLY_BUF2));
+        fm801_writel(chip, PLY_BUF1, chip->ply_buffer);
+        fm801_writel(chip, PLY_BUF2,
+                     chip->ply_buffer + (chip->ply_count % chip->ply_size));
         spin_unlock_irq(&chip->reg_lock);
         return 0;
 }
@@ -483,12 +497,13 @@ static int snd_fm801_capture_prepare(struct snd_pcm_substream *substream)
                 chip->cap_ctrl |= FM801_STEREO;
         chip->cap_ctrl |= snd_fm801_rate_bits(runtime->rate) << FM801_RATE_SHIFT;
         chip->cap_buf = 0;
-        outw(chip->cap_ctrl, FM801_REG(chip, CAP_CTRL));
-        outw(chip->cap_count - 1, FM801_REG(chip, CAP_COUNT));
+        fm801_writew(chip, CAP_CTRL, chip->cap_ctrl);
+        fm801_writew(chip, CAP_COUNT, chip->cap_count - 1);
         chip->cap_buffer = runtime->dma_addr;
         chip->cap_pos = 0;
-        outl(chip->cap_buffer, FM801_REG(chip, CAP_BUF1));
-        outl(chip->cap_buffer + (chip->cap_count % chip->cap_size), FM801_REG(chip, CAP_BUF2));
+        fm801_writel(chip, CAP_BUF1, chip->cap_buffer);
+        fm801_writel(chip, CAP_BUF2,
+                     chip->cap_buffer + (chip->cap_count % chip->cap_size));
         spin_unlock_irq(&chip->reg_lock);
         return 0;
 }
@@ -501,8 +516,8 @@ static snd_pcm_uframes_t snd_fm801_playback_pointer(struct snd_pcm_substream *su
         if (!(chip->ply_ctrl & FM801_START))
                 return 0;
         spin_lock(&chip->reg_lock);
-        ptr = chip->ply_pos + (chip->ply_count - 1) - inw(FM801_REG(chip, PLY_COUNT));
-        if (inw(FM801_REG(chip, IRQ_STATUS)) & FM801_IRQ_PLAYBACK) {
+        ptr = chip->ply_pos + (chip->ply_count - 1) - fm801_readw(chip, PLY_COUNT);
+        if (fm801_readw(chip, IRQ_STATUS) & FM801_IRQ_PLAYBACK) {
                 ptr += chip->ply_count;
                 ptr %= chip->ply_size;
         }
@@ -518,8 +533,8 @@ static snd_pcm_uframes_t snd_fm801_capture_pointer(struct snd_pcm_substream *sub
         if (!(chip->cap_ctrl & FM801_START))
                 return 0;
         spin_lock(&chip->reg_lock);
-        ptr = chip->cap_pos + (chip->cap_count - 1) - inw(FM801_REG(chip, CAP_COUNT));
-        if (inw(FM801_REG(chip, IRQ_STATUS)) & FM801_IRQ_CAPTURE) {
+        ptr = chip->cap_pos + (chip->cap_count - 1) - fm801_readw(chip, CAP_COUNT);
+        if (fm801_readw(chip, IRQ_STATUS) & FM801_IRQ_CAPTURE) {
                 ptr += chip->cap_count;
                 ptr %= chip->cap_size;
         }
@@ -533,12 +548,12 @@ static irqreturn_t snd_fm801_interrupt(int irq, void *dev_id)
         unsigned short status;
         unsigned int tmp;
 
-        status = inw(FM801_REG(chip, IRQ_STATUS));
+        status = fm801_readw(chip, IRQ_STATUS);
         status &= FM801_IRQ_PLAYBACK|FM801_IRQ_CAPTURE|FM801_IRQ_MPU|FM801_IRQ_VOLUME;
         if (! status)
                 return IRQ_NONE;
         /* ack first */
-        outw(status, FM801_REG(chip, IRQ_STATUS));
+        fm801_writew(chip, IRQ_STATUS, status);
         if (chip->pcm && (status & FM801_IRQ_PLAYBACK) && chip->playback_substream) {
                 spin_lock(&chip->reg_lock);
                 chip->ply_buf++;
@@ -546,10 +561,10 @@ static irqreturn_t snd_fm801_interrupt(int irq, void *dev_id)
                 chip->ply_pos %= chip->ply_size;
                 tmp = chip->ply_pos + chip->ply_count;
                 tmp %= chip->ply_size;
-                outl(chip->ply_buffer + tmp,
-                                (chip->ply_buf & 1) ?
-                                        FM801_REG(chip, PLY_BUF1) :
-                                        FM801_REG(chip, PLY_BUF2));
+                if (chip->ply_buf & 1)
+                        fm801_writel(chip, PLY_BUF1, chip->ply_buffer + tmp);
+                else
+                        fm801_writel(chip, PLY_BUF2, chip->ply_buffer + tmp);
                 spin_unlock(&chip->reg_lock);
                 snd_pcm_period_elapsed(chip->playback_substream);
         }
@@ -560,10 +575,10 @@ static irqreturn_t snd_fm801_interrupt(int irq, void *dev_id)
                 chip->cap_pos %= chip->cap_size;
                 tmp = chip->cap_pos + chip->cap_count;
                 tmp %= chip->cap_size;
-                outl(chip->cap_buffer + tmp,
-                                (chip->cap_buf & 1) ?
-                                        FM801_REG(chip, CAP_BUF1) :
-                                        FM801_REG(chip, CAP_BUF2));
+                if (chip->cap_buf & 1)
+                        fm801_writel(chip, CAP_BUF1, chip->cap_buffer + tmp);
+                else
+                        fm801_writel(chip, CAP_BUF2, chip->cap_buffer + tmp);
                 spin_unlock(&chip->reg_lock);
                 snd_pcm_period_elapsed(chip->capture_substream);
         }
@@ -747,7 +762,7 @@ static struct snd_fm801_tea575x_gpio snd_fm801_tea575x_gpios[] = {
 static void snd_fm801_tea575x_set_pins(struct snd_tea575x *tea, u8 pins)
 {
         struct fm801 *chip = tea->private_data;
-        unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL));
+        unsigned short reg = fm801_readw(chip, GPIO_CTRL);
         struct snd_fm801_tea575x_gpio gpio = *get_tea575x_gpio(chip);
 
         reg &= ~(FM801_GPIO_GP(gpio.data) |
@@ -759,13 +774,13 @@ static void snd_fm801_tea575x_set_pins(struct snd_tea575x *tea, u8 pins)
         /* WRITE_ENABLE is inverted */
         reg |= (pins & TEA575X_WREN) ? 0 : FM801_GPIO_GP(gpio.wren);
 
-        outw(reg, FM801_REG(chip, GPIO_CTRL));
+        fm801_writew(chip, GPIO_CTRL, reg);
 }
 
 static u8 snd_fm801_tea575x_get_pins(struct snd_tea575x *tea)
 {
         struct fm801 *chip = tea->private_data;
-        unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL));
+        unsigned short reg = fm801_readw(chip, GPIO_CTRL);
         struct snd_fm801_tea575x_gpio gpio = *get_tea575x_gpio(chip);
         u8 ret;
 
@@ -780,7 +795,7 @@ static u8 snd_fm801_tea575x_get_pins(struct snd_tea575x *tea)
 static void snd_fm801_tea575x_set_direction(struct snd_tea575x *tea, bool output)
 {
         struct fm801 *chip = tea->private_data;
-        unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL));
+        unsigned short reg = fm801_readw(chip, GPIO_CTRL);
         struct snd_fm801_tea575x_gpio gpio = *get_tea575x_gpio(chip);
 
         /* use GPIO lines and set write enable bit */
@@ -811,7 +826,7 @@ static void snd_fm801_tea575x_set_direction(struct snd_tea575x *tea, bool output
                          FM801_GPIO_GP(gpio.clk));
         }
 
-        outw(reg, FM801_REG(chip, GPIO_CTRL));
+        fm801_writew(chip, GPIO_CTRL, reg);
 }
 
 static struct snd_tea575x_ops snd_fm801_tea_ops = {
@@ -962,7 +977,7 @@ static int snd_fm801_get_mux(struct snd_kcontrol *kcontrol,
         struct fm801 *chip = snd_kcontrol_chip(kcontrol);
         unsigned short val;
  
-        val = inw(FM801_REG(chip, REC_SRC)) & 7;
+        val = fm801_readw(chip, REC_SRC) & 7;
         if (val > 4)
                 val = 4;
         ucontrol->value.enumerated.item[0] = val;
@@ -1073,12 +1088,12 @@ static int wait_for_codec(struct fm801 *chip, unsigned int codec_id,
 {
         unsigned long timeout = jiffies + waits;
 
-        outw(FM801_AC97_READ | (codec_id << FM801_AC97_ADDR_SHIFT) | reg,
-             FM801_REG(chip, AC97_CMD));
+        fm801_writew(chip, AC97_CMD,
+                     reg | (codec_id << FM801_AC97_ADDR_SHIFT) | FM801_AC97_READ);
         udelay(5);
         do {
-                if ((inw(FM801_REG(chip, AC97_CMD)) & (FM801_AC97_VALID|FM801_AC97_BUSY))
-                    == FM801_AC97_VALID)
+                if ((fm801_readw(chip, AC97_CMD) &
+                     (FM801_AC97_VALID | FM801_AC97_BUSY)) == FM801_AC97_VALID)
                         return 0;
                 schedule_timeout_uninterruptible(1);
         } while (time_after(timeout, jiffies));
@@ -1093,10 +1108,10 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)
                 goto __ac97_ok;
 
         /* codec cold reset + AC'97 warm reset */
-        outw((1<<5) | (1<<6), FM801_REG(chip, CODEC_CTRL));
-        inw(FM801_REG(chip, CODEC_CTRL)); /* flush posting data */
+        fm801_writew(chip, CODEC_CTRL, (1 << 5) | (1 << 6));
+        fm801_readw(chip, CODEC_CTRL); /* flush posting data */
         udelay(100);
-        outw(0, FM801_REG(chip, CODEC_CTRL));
+        fm801_writew(chip, CODEC_CTRL, 0);
 
         if (wait_for_codec(chip, 0, AC97_RESET, msecs_to_jiffies(750)) < 0)
                 if (!resume) {
@@ -1117,7 +1132,7 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)
                         for (i = 3; i > 0; i--) {
                                 if (!wait_for_codec(chip, i, AC97_VENDOR_ID1,
                                                      msecs_to_jiffies(50))) {
-                                        cmdw = inw(FM801_REG(chip, AC97_DATA));
+                                        cmdw = fm801_readw(chip, AC97_DATA);
                                         if (cmdw != 0xffff && cmdw != 0) {
                                                 chip->secondary = 1;
                                                 chip->secondary_addr = i;
@@ -1135,23 +1150,24 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)
       __ac97_ok:
 
         /* init volume */
-        outw(0x0808, FM801_REG(chip, PCM_VOL));
-        outw(0x9f1f, FM801_REG(chip, FM_VOL));
-        outw(0x8808, FM801_REG(chip, I2S_VOL));
+        fm801_writew(chip, PCM_VOL, 0x0808);
+        fm801_writew(chip, FM_VOL, 0x9f1f);
+        fm801_writew(chip, I2S_VOL, 0x8808);
 
         /* I2S control - I2S mode */
-        outw(0x0003, FM801_REG(chip, I2S_MODE));
+        fm801_writew(chip, I2S_MODE, 0x0003);
 
         /* interrupt setup */
-        cmdw = inw(FM801_REG(chip, IRQ_MASK));
+        cmdw = fm801_readw(chip, IRQ_MASK);
         if (chip->irq < 0)
                 cmdw |= 0x00c3;         /* mask everything, no PCM nor MPU */
         else
                 cmdw &= ~0x0083;        /* unmask MPU, PLAYBACK & CAPTURE */
-        outw(cmdw, FM801_REG(chip, IRQ_MASK));
+        fm801_writew(chip, IRQ_MASK, cmdw);
 
         /* interrupt clear */
-        outw(FM801_IRQ_PLAYBACK|FM801_IRQ_CAPTURE|FM801_IRQ_MPU, FM801_REG(chip, IRQ_STATUS));
+        fm801_writew(chip, IRQ_STATUS,
+                     FM801_IRQ_PLAYBACK | FM801_IRQ_CAPTURE | FM801_IRQ_MPU);
 
         return 0;
 }
@@ -1165,9 +1181,9 @@ static int snd_fm801_free(struct fm801 *chip)
                 goto __end_hw;
 
         /* interrupt setup - mask everything */
-        cmdw = inw(FM801_REG(chip, IRQ_MASK));
+        cmdw = fm801_readw(chip, IRQ_MASK);
         cmdw |= 0x00c3;
-        outw(cmdw, FM801_REG(chip, IRQ_MASK));
+        fm801_writew(chip, IRQ_MASK, cmdw);
 
       __end_hw:
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
@@ -1339,15 +1355,15 @@ static int snd_card_fm801_probe(struct pci_dev *pci,
                 return err;
         }
         if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_FM801,
-                                       FM801_REG(chip, MPU401_DATA),
+                                       chip->port + FM801_MPU401_DATA,
                                        MPU401_INFO_INTEGRATED |
                                        MPU401_INFO_IRQ_HOOK,
                                        -1, &chip->rmidi)) < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_opl3_create(card, FM801_REG(chip, OPL3_BANK0),
-                                   FM801_REG(chip, OPL3_BANK1),
+        if ((err = snd_opl3_create(card, chip->port + FM801_OPL3_BANK0,
+                                   chip->port + FM801_OPL3_BANK1,
                                    OPL3_HW_OPL3_FM801, 1, &opl3)) < 0) {
                 snd_card_free(card);
                 return err;
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index ac17c3fc9388..ebf4c2fb99df 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -20,6 +20,21 @@ config SND_HDA_INTEL
           To compile this driver as a module, choose M here: the module
           will be called snd-hda-intel.
 
+config SND_HDA_TEGRA
+        tristate "NVIDIA Tegra HD Audio"
+        depends on ARCH_TEGRA
+        select SND_HDA
+        help
+          Say Y here to support the HDA controller present in NVIDIA
+          Tegra SoCs
+
+          This options enables support for the HD Audio controller
+          present in some NVIDIA Tegra SoCs, used to communicate audio
+          to the HDMI output.
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-hda-tegra.
+
 if SND_HDA
 
 config SND_HDA_DSP_LOADER
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index d0d0c19ddfc2..194f30935e77 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -1,5 +1,6 @@
 snd-hda-intel-objs := hda_intel.o
 snd-hda-controller-objs := hda_controller.o
+snd-hda-tegra-objs := hda_tegra.o
 # for haswell power well
 snd-hda-intel-$(CONFIG_SND_HDA_I915) += hda_i915.o
 
@@ -47,3 +48,4 @@ obj-$(CONFIG_SND_HDA_CODEC_HDMI) += snd-hda-codec-hdmi.o
 # otherwise the codec patches won't be hooked before the PCI probe
 # when built in kernel
 obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o
+obj-$(CONFIG_SND_HDA_TEGRA) += snd-hda-tegra.o
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index 90d2fda6c8f9..3cf913772e9b 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -839,6 +839,44 @@ void snd_hda_apply_fixup(struct hda_codec *codec, int action)
 }
 EXPORT_SYMBOL_GPL(snd_hda_apply_fixup);
 
+static bool pin_config_match(struct hda_codec *codec,
+                             const struct hda_pintbl *pins)
+{
+        for (; pins->nid; pins++) {
+                u32 def_conf = snd_hda_codec_get_pincfg(codec, pins->nid);
+                u32 mask = 0xffffff00;
+                if ((pins->val & mask) != (def_conf & mask))
+                        return false;
+        }
+        return true;
+}
+
+void snd_hda_pick_pin_fixup(struct hda_codec *codec,
+                            const struct snd_hda_pin_quirk *pin_quirk,
+                            const struct hda_fixup *fixlist)
+{
+        const struct snd_hda_pin_quirk *pq;
+
+        if (codec->fixup_forced)
+                return;
+
+        for (pq = pin_quirk; pq->subvendor; pq++) {
+                if ((codec->subsystem_id & 0xffff0000) != (pq->subvendor << 16))
+                        continue;
+                if (codec->vendor_id != pq->codec)
+                        continue;
+                if (pin_config_match(codec, pq->pins)) {
+                        codec->fixup_id = pq->value;
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+                        codec->fixup_name = pq->name;
+#endif
+                        codec->fixup_list = fixlist;
+                        return;
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(snd_hda_pick_pin_fixup);
+
 void snd_hda_pick_fixup(struct hda_codec *codec,
                         const struct hda_model_fixup *models,
                         const struct snd_pci_quirk *quirk,
@@ -852,15 +890,17 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
         if (codec->modelname && !strcmp(codec->modelname, "nofixup")) {
                 codec->fixup_list = NULL;
                 codec->fixup_id = -1;
+                codec->fixup_forced = 1;
                 return;
         }
 
         if (codec->modelname && models) {
                 while (models->name) {
                         if (!strcmp(codec->modelname, models->name)) {
-                                id = models->id;
-                                name = models->name;
-                                break;
+                                codec->fixup_id = models->id;
+                                codec->fixup_name = models->name;
+                                codec->fixup_forced = 1;
+                                return;
                         }
                         models++;
                 }
@@ -889,6 +929,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
                 }
         }
 
+        codec->fixup_forced = 0;
         codec->fixup_id = id;
         if (id >= 0) {
                 codec->fixup_list = fixlist;
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index a4233136cb93..5825aa17d8e3 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -402,6 +402,7 @@ struct hda_codec {
 
         /* fix-up list */
         int fixup_id;
+        unsigned int fixup_forced:1; /* fixup explicitly set by user */
         const struct hda_fixup *fixup_list;
         const char *fixup_name;
 
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 16133881e967..589e47c5aeb3 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -3722,7 +3722,7 @@ static void parse_digital(struct hda_codec *codec)
                 } else {
                         spec->multiout.slave_dig_outs = spec->slave_dig_outs;
                         if (nums >= ARRAY_SIZE(spec->slave_dig_outs) - 1)
-                        break;
+                                break;
                         spec->slave_dig_outs[nums - 1] = dig_nid;
                 }
                 nums++;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 2c54629d62d1..ab0fd6d4961b 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1730,7 +1730,7 @@ static void azx_remove(struct pci_dev *pci)
 }
 
 /* PCI IDs */
-static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
+static const struct pci_device_id azx_ids[] = {
         /* CPT */
         { PCI_DEVICE(0x8086, 0x1c20),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index e51d15529215..ebd1fa6f015c 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -407,6 +407,16 @@ struct hda_fixup {
         } v;
 };
 
+struct snd_hda_pin_quirk {
+        unsigned int codec;             /* Codec vendor/device ID */
+        unsigned short subvendor;       /* PCI subvendor ID */
+        const struct hda_pintbl *pins;  /* list of matching pins */
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+        const char *name;
+#endif
+        int value;                      /* quirk value */
+};
+
 /* fixup types */
 enum {
         HDA_FIXUP_INVALID,
@@ -434,6 +444,10 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
                         const struct hda_model_fixup *models,
                         const struct snd_pci_quirk *quirk,
                         const struct hda_fixup *fixlist);
+void snd_hda_pick_pin_fixup(struct hda_codec *codec,
+                            const struct snd_hda_pin_quirk *pin_quirk,
+                            const struct hda_fixup *fixlist);
+
 
 /*
  * unsolicited event handler
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
new file mode 100644
index 000000000000..a366ba9293a8
--- /dev/null
+++ b/sound/pci/hda/hda_tegra.c
@@ -0,0 +1,588 @@
+/*
+ *
+ * Implementation of primary ALSA driver code base for NVIDIA Tegra HDA.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/clocksource.h>
+#include <linux/completion.h>
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/mutex.h>
+#include <linux/of_device.h>
+#include <linux/reboot.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+
+#include <sound/core.h>
+#include <sound/initval.h>
+
+#include "hda_codec.h"
+#include "hda_controller.h"
+#include "hda_priv.h"
+
+/* Defines for Nvidia Tegra HDA support */
+#define HDA_BAR0           0x8000
+
+#define HDA_CFG_CMD        0x1004
+#define HDA_CFG_BAR0       0x1010
+
+#define HDA_ENABLE_IO_SPACE       (1 << 0)
+#define HDA_ENABLE_MEM_SPACE      (1 << 1)
+#define HDA_ENABLE_BUS_MASTER     (1 << 2)
+#define HDA_ENABLE_SERR           (1 << 8)
+#define HDA_DISABLE_INTR          (1 << 10)
+#define HDA_BAR0_INIT_PROGRAM     0xFFFFFFFF
+#define HDA_BAR0_FINAL_PROGRAM    (1 << 14)
+
+/* IPFS */
+#define HDA_IPFS_CONFIG           0x180
+#define HDA_IPFS_EN_FPCI          0x1
+
+#define HDA_IPFS_FPCI_BAR0        0x80
+#define HDA_FPCI_BAR0_START       0x40
+
+#define HDA_IPFS_INTR_MASK        0x188
+#define HDA_IPFS_EN_INTR          (1 << 16)
+
+/* max number of SDs */
+#define NUM_CAPTURE_SD 1
+#define NUM_PLAYBACK_SD 1
+
+struct hda_tegra {
+        struct azx chip;
+        struct device *dev;
+        struct clk *hda_clk;
+        struct clk *hda2codec_2x_clk;
+        struct clk *hda2hdmi_clk;
+        void __iomem *regs;
+};
+
+#ifdef CONFIG_PM
+static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
+module_param(power_save, bint, 0644);
+MODULE_PARM_DESC(power_save,
+                 "Automatic power-saving timeout (in seconds, 0 = disable).");
+#else
+static int power_save = 0;
+#endif
+
+/*
+ * DMA page allocation ops.
+ */
+static int dma_alloc_pages(struct azx *chip, int type, size_t size,
+                           struct snd_dma_buffer *buf)
+{
+        return snd_dma_alloc_pages(type, chip->card->dev, size, buf);
+}
+
+static void dma_free_pages(struct azx *chip, struct snd_dma_buffer *buf)
+{
+        snd_dma_free_pages(buf);
+}
+
+static int substream_alloc_pages(struct azx *chip,
+                                 struct snd_pcm_substream *substream,
+                                 size_t size)
+{
+        struct azx_dev *azx_dev = get_azx_dev(substream);
+
+        azx_dev->bufsize = 0;
+        azx_dev->period_bytes = 0;
+        azx_dev->format_val = 0;
+        return snd_pcm_lib_malloc_pages(substream, size);
+}
+
+static int substream_free_pages(struct azx *chip,
+                                struct snd_pcm_substream *substream)
+{
+        return snd_pcm_lib_free_pages(substream);
+}
+
+/*
+ * Register access ops. Tegra HDA register access is DWORD only.
+ */
+static void hda_tegra_writel(u32 value, u32 *addr)
+{
+        writel(value, addr);
+}
+
+static u32 hda_tegra_readl(u32 *addr)
+{
+        return readl(addr);
+}
+
+static void hda_tegra_writew(u16 value, u16 *addr)
+{
+        unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
+        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        u32 v;
+
+        v = readl(dword_addr);
+        v &= ~(0xffff << shift);
+        v |= value << shift;
+        writel(v, dword_addr);
+}
+
+static u16 hda_tegra_readw(u16 *addr)
+{
+        unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
+        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        u32 v;
+
+        v = readl(dword_addr);
+        return (v >> shift) & 0xffff;
+}
+
+static void hda_tegra_writeb(u8 value, u8 *addr)
+{
+        unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
+        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        u32 v;
+
+        v = readl(dword_addr);
+        v &= ~(0xff << shift);
+        v |= value << shift;
+        writel(v, dword_addr);
+}
+
+static u8 hda_tegra_readb(u8 *addr)
+{
+        unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;
+        void *dword_addr = (void *)((unsigned long)(addr) & ~0x3);
+        u32 v;
+
+        v = readl(dword_addr);
+        return (v >> shift) & 0xff;
+}
+
+static const struct hda_controller_ops hda_tegra_ops = {
+        .reg_writel = hda_tegra_writel,
+        .reg_readl = hda_tegra_readl,
+        .reg_writew = hda_tegra_writew,
+        .reg_readw = hda_tegra_readw,
+        .reg_writeb = hda_tegra_writeb,
+        .reg_readb = hda_tegra_readb,
+        .dma_alloc_pages = dma_alloc_pages,
+        .dma_free_pages = dma_free_pages,
+        .substream_alloc_pages = substream_alloc_pages,
+        .substream_free_pages = substream_free_pages,
+};
+
+static void hda_tegra_init(struct hda_tegra *hda)
+{
+        u32 v;
+
+        /* Enable PCI access */
+        v = readl(hda->regs + HDA_IPFS_CONFIG);
+        v |= HDA_IPFS_EN_FPCI;
+        writel(v, hda->regs + HDA_IPFS_CONFIG);
+
+        /* Enable MEM/IO space and bus master */
+        v = readl(hda->regs + HDA_CFG_CMD);
+        v &= ~HDA_DISABLE_INTR;
+        v |= HDA_ENABLE_MEM_SPACE | HDA_ENABLE_IO_SPACE |
+                HDA_ENABLE_BUS_MASTER | HDA_ENABLE_SERR;
+        writel(v, hda->regs + HDA_CFG_CMD);
+
+        writel(HDA_BAR0_INIT_PROGRAM, hda->regs + HDA_CFG_BAR0);
+        writel(HDA_BAR0_FINAL_PROGRAM, hda->regs + HDA_CFG_BAR0);
+        writel(HDA_FPCI_BAR0_START, hda->regs + HDA_IPFS_FPCI_BAR0);
+
+        v = readl(hda->regs + HDA_IPFS_INTR_MASK);
+        v |= HDA_IPFS_EN_INTR;
+        writel(v, hda->regs + HDA_IPFS_INTR_MASK);
+}
+
+static int hda_tegra_enable_clocks(struct hda_tegra *data)
+{
+        int rc;
+
+        rc = clk_prepare_enable(data->hda_clk);
+        if (rc)
+                return rc;
+        rc = clk_prepare_enable(data->hda2codec_2x_clk);
+        if (rc)
+                goto disable_hda;
+        rc = clk_prepare_enable(data->hda2hdmi_clk);
+        if (rc)
+                goto disable_codec_2x;
+
+        return 0;
+
+disable_codec_2x:
+        clk_disable_unprepare(data->hda2codec_2x_clk);
+disable_hda:
+        clk_disable_unprepare(data->hda_clk);
+        return rc;
+}
+
+static void hda_tegra_disable_clocks(struct hda_tegra *data)
+{
+        clk_disable_unprepare(data->hda2hdmi_clk);
+        clk_disable_unprepare(data->hda2codec_2x_clk);
+        clk_disable_unprepare(data->hda_clk);
+}
+
+#ifdef CONFIG_PM_SLEEP
+/*
+ * power management
+ */
+static int hda_tegra_suspend(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
+        struct azx *chip = card->private_data;
+        struct azx_pcm *p;
+        struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+        list_for_each_entry(p, &chip->pcm_list, list)
+                snd_pcm_suspend_all(p->pcm);
+        if (chip->initialized)
+                snd_hda_suspend(chip->bus);
+
+        azx_stop_chip(chip);
+        azx_enter_link_reset(chip);
+        hda_tegra_disable_clocks(hda);
+
+        return 0;
+}
+
+static int hda_tegra_resume(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
+        struct azx *chip = card->private_data;
+        struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);
+        int status;
+
+        hda_tegra_enable_clocks(hda);
+
+        /* Read STATESTS before controller reset */
+        status = azx_readw(chip, STATESTS);
+
+        hda_tegra_init(hda);
+
+        azx_init_chip(chip, 1);
+
+        snd_hda_resume(chip->bus);
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+
+        return 0;
+}
+#endif /* CONFIG_PM_SLEEP */
+
+static const struct dev_pm_ops hda_tegra_pm = {
+        SET_SYSTEM_SLEEP_PM_OPS(hda_tegra_suspend, hda_tegra_resume)
+};
+
+/*
+ * reboot notifier for hang-up problem at power-down
+ */
+static int hda_tegra_halt(struct notifier_block *nb, unsigned long event,
+                          void *buf)
+{
+        struct azx *chip = container_of(nb, struct azx, reboot_notifier);
+        snd_hda_bus_reboot_notify(chip->bus);
+        azx_stop_chip(chip);
+        return NOTIFY_OK;
+}
+
+static void hda_tegra_notifier_register(struct azx *chip)
+{
+        chip->reboot_notifier.notifier_call = hda_tegra_halt;
+        register_reboot_notifier(&chip->reboot_notifier);
+}
+
+static void hda_tegra_notifier_unregister(struct azx *chip)
+{
+        if (chip->reboot_notifier.notifier_call)
+                unregister_reboot_notifier(&chip->reboot_notifier);
+}
+
+/*
+ * destructor
+ */
+static int hda_tegra_dev_free(struct snd_device *device)
+{
+        int i;
+        struct azx *chip = device->device_data;
+
+        hda_tegra_notifier_unregister(chip);
+
+        if (chip->initialized) {
+                for (i = 0; i < chip->num_streams; i++)
+                        azx_stream_stop(chip, &chip->azx_dev[i]);
+                azx_stop_chip(chip);
+        }
+
+        azx_free_stream_pages(chip);
+
+        return 0;
+}
+
+static int hda_tegra_init_chip(struct azx *chip, struct platform_device *pdev)
+{
+        struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip);
+        struct device *dev = hda->dev;
+        struct resource *res;
+        int err;
+
+        hda->hda_clk = devm_clk_get(dev, "hda");
+        if (IS_ERR(hda->hda_clk))
+                return PTR_ERR(hda->hda_clk);
+        hda->hda2codec_2x_clk = devm_clk_get(dev, "hda2codec_2x");
+        if (IS_ERR(hda->hda2codec_2x_clk))
+                return PTR_ERR(hda->hda2codec_2x_clk);
+        hda->hda2hdmi_clk = devm_clk_get(dev, "hda2hdmi");
+        if (IS_ERR(hda->hda2hdmi_clk))
+                return PTR_ERR(hda->hda2hdmi_clk);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        hda->regs = devm_ioremap_resource(dev, res);
+        if (IS_ERR(chip->remap_addr))
+                return PTR_ERR(chip->remap_addr);
+
+        chip->remap_addr = hda->regs + HDA_BAR0;
+        chip->addr = res->start + HDA_BAR0;
+
+        err = hda_tegra_enable_clocks(hda);
+        if (err)
+                return err;
+
+        hda_tegra_init(hda);
+
+        return 0;
+}
+
+/*
+ * The codecs were powered up in snd_hda_codec_new().
+ * Now all initialization done, so turn them down if possible
+ */
+static void power_down_all_codecs(struct azx *chip)
+{
+        struct hda_codec *codec;
+        list_for_each_entry(codec, &chip->bus->codec_list, list)
+                snd_hda_power_down(codec);
+}
+
+static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
+{
+        struct snd_card *card = chip->card;
+        int err;
+        unsigned short gcap;
+        int irq_id = platform_get_irq(pdev, 0);
+
+        err = hda_tegra_init_chip(chip, pdev);
+        if (err)
+                return err;
+
+        err = devm_request_irq(chip->card->dev, irq_id, azx_interrupt,
+                             IRQF_SHARED, KBUILD_MODNAME, chip);
+        if (err) {
+                dev_err(chip->card->dev,
+                        "unable to request IRQ %d, disabling device\n",
+                        irq_id);
+                return err;
+        }
+        chip->irq = irq_id;
+
+        synchronize_irq(chip->irq);
+
+        gcap = azx_readw(chip, GCAP);
+        dev_dbg(card->dev, "chipset global capabilities = 0x%x\n", gcap);
+
+        /* read number of streams from GCAP register instead of using
+         * hardcoded value
+         */
+        chip->capture_streams = (gcap >> 8) & 0x0f;
+        chip->playback_streams = (gcap >> 12) & 0x0f;
+        if (!chip->playback_streams && !chip->capture_streams) {
+                /* gcap didn't give any info, switching to old method */
+                chip->playback_streams = NUM_PLAYBACK_SD;
+                chip->capture_streams = NUM_CAPTURE_SD;
+        }
+        chip->capture_index_offset = 0;
+        chip->playback_index_offset = chip->capture_streams;
+        chip->num_streams = chip->playback_streams + chip->capture_streams;
+        chip->azx_dev = devm_kcalloc(card->dev, chip->num_streams,
+                                     sizeof(*chip->azx_dev), GFP_KERNEL);
+        if (!chip->azx_dev)
+                return -ENOMEM;
+
+        err = azx_alloc_stream_pages(chip);
+        if (err < 0)
+                return err;
+
+        /* initialize streams */
+        azx_init_stream(chip);
+
+        /* initialize chip */
+        azx_init_chip(chip, 1);
+
+        /* codec detection */
+        if (!chip->codec_mask) {
+                dev_err(card->dev, "no codecs found!\n");
+                return -ENODEV;
+        }
+
+        strcpy(card->driver, "tegra-hda");
+        strcpy(card->shortname, "tegra-hda");
+        snprintf(card->longname, sizeof(card->longname),
+                 "%s at 0x%lx irq %i",
+                 card->shortname, chip->addr, chip->irq);
+
+        return 0;
+}
+
+/*
+ * constructor
+ */
+static int hda_tegra_create(struct snd_card *card,
+                            unsigned int driver_caps,
+                            const struct hda_controller_ops *hda_ops,
+                            struct hda_tegra *hda)
+{
+        static struct snd_device_ops ops = {
+                .dev_free = hda_tegra_dev_free,
+        };
+        struct azx *chip;
+        int err;
+
+        chip = &hda->chip;
+
+        spin_lock_init(&chip->reg_lock);
+        mutex_init(&chip->open_mutex);
+        chip->card = card;
+        chip->ops = hda_ops;
+        chip->irq = -1;
+        chip->driver_caps = driver_caps;
+        chip->driver_type = driver_caps & 0xff;
+        chip->dev_index = 0;
+        INIT_LIST_HEAD(&chip->pcm_list);
+        INIT_LIST_HEAD(&chip->list);
+
+        chip->position_fix[0] = POS_FIX_AUTO;
+        chip->position_fix[1] = POS_FIX_AUTO;
+        chip->codec_probe_mask = -1;
+
+        chip->single_cmd = false;
+        chip->snoop = true;
+
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+        if (err < 0) {
+                dev_err(card->dev, "Error creating device\n");
+                return err;
+        }
+
+        return 0;
+}
+
+static const struct of_device_id hda_tegra_match[] = {
+        { .compatible = "nvidia,tegra30-hda" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, hda_tegra_match);
+
+static int hda_tegra_probe(struct platform_device *pdev)
+{
+        struct snd_card *card;
+        struct azx *chip;
+        struct hda_tegra *hda;
+        int err;
+        const unsigned int driver_flags = AZX_DCAPS_RIRB_DELAY;
+
+        hda = devm_kzalloc(&pdev->dev, sizeof(*hda), GFP_KERNEL);
+        if (!hda)
+                return -ENOMEM;
+        hda->dev = &pdev->dev;
+        chip = &hda->chip;
+
+        err = snd_card_new(&pdev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
+                           THIS_MODULE, 0, &card);
+        if (err < 0) {
+                dev_err(&pdev->dev, "Error creating card!\n");
+                return err;
+        }
+
+        err = hda_tegra_create(card, driver_flags, &hda_tegra_ops, hda);
+        if (err < 0)
+                goto out_free;
+        card->private_data = chip;
+
+        dev_set_drvdata(&pdev->dev, card);
+
+        err = hda_tegra_first_init(chip, pdev);
+        if (err < 0)
+                goto out_free;
+
+        /* create codec instances */
+        err = azx_codec_create(chip, NULL, 0, &power_save);
+        if (err < 0)
+                goto out_free;
+
+        err = azx_codec_configure(chip);
+        if (err < 0)
+                goto out_free;
+
+        /* create PCM streams */
+        err = snd_hda_build_pcms(chip->bus);
+        if (err < 0)
+                goto out_free;
+
+        /* create mixer controls */
+        err = azx_mixer_create(chip);
+        if (err < 0)
+                goto out_free;
+
+        err = snd_card_register(chip->card);
+        if (err < 0)
+                goto out_free;
+
+        chip->running = 1;
+        power_down_all_codecs(chip);
+        hda_tegra_notifier_register(chip);
+
+        return 0;
+
+out_free:
+        snd_card_free(card);
+        return err;
+}
+
+static int hda_tegra_remove(struct platform_device *pdev)
+{
+        return snd_card_free(dev_get_drvdata(&pdev->dev));
+}
+
+static struct platform_driver tegra_platform_hda = {
+        .driver = {
+                .name = "tegra-hda",
+                .pm = &hda_tegra_pm,
+                .of_match_table = hda_tegra_match,
+        },
+        .probe = hda_tegra_probe,
+        .remove = hda_tegra_remove,
+};
+module_platform_driver(tegra_platform_hda);
+
+MODULE_DESCRIPTION("Tegra HDA bus driver");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index b4218a19df22..be0a9ee0b804 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1127,10 +1127,6 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
                                             AMP_OUT_UNMUTE);
 
         eld = &per_pin->sink_eld;
-        if (!eld->monitor_present) {
-                hdmi_set_channel_count(codec, per_pin->cvt_nid, channels);
-                return;
-        }
 
         if (!non_pcm && per_pin->chmap_set)
                 ca = hdmi_manual_channel_allocation(channels, per_pin->chmap);
@@ -3324,6 +3320,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
 { .id = 0x10de001a, .name = "GPU 1a HDMI/DP",   .patch = patch_nvhdmi },
 { .id = 0x10de001b, .name = "GPU 1b HDMI/DP",   .patch = patch_nvhdmi },
 { .id = 0x10de001c, .name = "GPU 1c HDMI/DP",   .patch = patch_nvhdmi },
+{ .id = 0x10de0028, .name = "Tegra12x HDMI",    .patch = patch_nvhdmi },
 { .id = 0x10de0040, .name = "GPU 40 HDMI/DP",   .patch = patch_nvhdmi },
 { .id = 0x10de0041, .name = "GPU 41 HDMI/DP",   .patch = patch_nvhdmi },
 { .id = 0x10de0042, .name = "GPU 42 HDMI/DP",   .patch = patch_nvhdmi },
@@ -3380,6 +3377,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0019");
 MODULE_ALIAS("snd-hda-codec-id:10de001a");
 MODULE_ALIAS("snd-hda-codec-id:10de001b");
 MODULE_ALIAS("snd-hda-codec-id:10de001c");
+MODULE_ALIAS("snd-hda-codec-id:10de0028");
 MODULE_ALIAS("snd-hda-codec-id:10de0040");
 MODULE_ALIAS("snd-hda-codec-id:10de0041");
 MODULE_ALIAS("snd-hda-codec-id:10de0042");
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 49e884fb3e5d..08bb06969a57 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -951,7 +951,9 @@ static struct alc_codec_rename_pci_table rename_pci_tbl[] = {
         { 0x10ec0280, 0x1028, 0, "ALC3220" },
         { 0x10ec0282, 0x1028, 0, "ALC3221" },
         { 0x10ec0283, 0x1028, 0, "ALC3223" },
+        { 0x10ec0288, 0x1028, 0, "ALC3263" },
         { 0x10ec0292, 0x1028, 0, "ALC3226" },
+        { 0x10ec0293, 0x1028, 0, "ALC3235" },
         { 0x10ec0255, 0x1028, 0, "ALC3234" },
         { 0x10ec0668, 0x1028, 0, "ALC3661" },
         { } /* terminator */
@@ -3522,6 +3524,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
                 /* Direct Drive HP Amp control */
                 alc_write_coefex_idx(codec, 0x57, 0x03, 0x8aa6);
                 break;
+        case 0x10ec0233:
         case 0x10ec0283:
                 alc_write_coef_idx(codec, 0x1b, 0x0c0b);
                 alc_write_coef_idx(codec, 0x45, 0xc429);
@@ -3538,6 +3541,25 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
                 alc_write_coef_idx(codec, 0x18, 0x7308);
                 alc_write_coef_idx(codec, 0x6b, 0xc429);
                 break;
+        case 0x10ec0293:
+                /* SET Line1 JD to 0 */
+                val = alc_read_coef_idx(codec, 0x10);
+                alc_write_coef_idx(codec, 0x10, (val & ~(7<<8)) | 6<<8);
+                /* SET charge pump by verb */
+                val = alc_read_coefex_idx(codec, 0x57, 0x05);
+                alc_write_coefex_idx(codec, 0x57, 0x05, (val & ~(1<<15|1<<13)) | 0x0);
+                /* SET EN_OSW to 1 */
+                val = alc_read_coefex_idx(codec, 0x57, 0x03);
+                alc_write_coefex_idx(codec, 0x57, 0x03, (val & ~(1<<10)) | (1<<10) );
+                /* Combo JD gating with LINE1-VREFO */
+                val = alc_read_coef_idx(codec, 0x1a);
+                alc_write_coef_idx(codec, 0x1a, (val & ~(1<<3)) | (1<<3));
+                /* Set to TRS type */
+                alc_write_coef_idx(codec, 0x45, 0xc429);
+                /* Combo Jack auto detect */
+                val = alc_read_coef_idx(codec, 0x4a);
+                alc_write_coef_idx(codec, 0x4a, (val & 0xfff0) | 0x000e);
+                break;
         case 0x10ec0668:
                 alc_write_coef_idx(codec, 0x15, 0x0d40);
                 alc_write_coef_idx(codec, 0xb7, 0x802b);
@@ -3561,6 +3583,7 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
                 alc_write_coef_idx(codec, 0x06, 0x6100);
                 snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);
                 break;
+        case 0x10ec0233:
         case 0x10ec0283:
                 alc_write_coef_idx(codec, 0x45, 0xc429);
                 snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
@@ -3576,6 +3599,21 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
                 alc_write_coef_idx(codec, 0x19, 0xa208);
                 alc_write_coef_idx(codec, 0x2e, 0xacf0);
                 break;
+        case 0x10ec0293:
+                /* Set to TRS mode */
+                alc_write_coef_idx(codec, 0x45, 0xc429);
+                snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
+                /* SET charge pump by verb */
+                val = alc_read_coefex_idx(codec, 0x57, 0x05);
+                alc_write_coefex_idx(codec, 0x57, 0x05, (val & ~(1<<15|1<<13)) | (1<<15|1<<13));
+                /* SET EN_OSW to 0 */
+                val = alc_read_coefex_idx(codec, 0x57, 0x03);
+                alc_write_coefex_idx(codec, 0x57, 0x03, (val & ~(1<<10)) | 0x0);
+                /* Combo JD gating without LINE1-VREFO */
+                val = alc_read_coef_idx(codec, 0x1a);
+                alc_write_coef_idx(codec, 0x1a, (val & ~(1<<3)) | 0x0);
+                snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);
+                break;
         case 0x10ec0668:
                 alc_write_coef_idx(codec, 0x11, 0x0001);
                 snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
@@ -3591,6 +3629,8 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
 
 static void alc_headset_mode_default(struct hda_codec *codec)
 {
+        int val;
+
         switch (codec->vendor_id) {
         case 0x10ec0255:
                 alc_write_coef_idx(codec, 0x45, 0xc089);
@@ -3598,6 +3638,7 @@ static void alc_headset_mode_default(struct hda_codec *codec)
                 alc_write_coefex_idx(codec, 0x57, 0x03, 0x8ea6);
                 alc_write_coef_idx(codec, 0x49, 0x0049);
                 break;
+        case 0x10ec0233:
         case 0x10ec0283:
                 alc_write_coef_idx(codec, 0x06, 0x2100);
                 alc_write_coef_idx(codec, 0x32, 0x4ea3);
@@ -3608,6 +3649,16 @@ static void alc_headset_mode_default(struct hda_codec *codec)
                 alc_write_coef_idx(codec, 0x6b, 0xc429);
                 alc_write_coef_idx(codec, 0x18, 0x7308);
                 break;
+        case 0x10ec0293:
+                /* Combo Jack auto detect */
+                val = alc_read_coef_idx(codec, 0x4a);
+                alc_write_coef_idx(codec, 0x4a, (val & 0xfff0) | 0x000e);
+                /* Set to TRS type */
+                alc_write_coef_idx(codec, 0x45, 0xC429);
+                /* Combo JD gating without LINE1-VREFO */
+                val = alc_read_coef_idx(codec, 0x1a);
+                alc_write_coef_idx(codec, 0x1a, (val & ~(1<<3)) | 0x0);
+                break;
         case 0x10ec0668:
                 alc_write_coef_idx(codec, 0x11, 0x0041);
                 alc_write_coef_idx(codec, 0x15, 0x0d40);
@@ -3620,6 +3671,8 @@ static void alc_headset_mode_default(struct hda_codec *codec)
 /* Iphone type */
 static void alc_headset_mode_ctia(struct hda_codec *codec)
 {
+        int val;
+
         switch (codec->vendor_id) {
         case 0x10ec0255:
                 /* Set to CTIA type */
@@ -3627,6 +3680,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
                 alc_write_coef_idx(codec, 0x1b, 0x0c2b);
                 alc_write_coefex_idx(codec, 0x57, 0x03, 0x8ea6);
                 break;
+        case 0x10ec0233:
         case 0x10ec0283:
                 alc_write_coef_idx(codec, 0x45, 0xd429);
                 alc_write_coef_idx(codec, 0x1b, 0x0c2b);
@@ -3637,6 +3691,13 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
                 alc_write_coef_idx(codec, 0x76, 0x0008);
                 alc_write_coef_idx(codec, 0x18, 0x7388);
                 break;
+        case 0x10ec0293:
+                /* Set to ctia type */
+                alc_write_coef_idx(codec, 0x45, 0xd429);
+                /* SET Line1 JD to 1 */
+                val = alc_read_coef_idx(codec, 0x10);
+                alc_write_coef_idx(codec, 0x10, (val & ~(7<<8)) | 7<<8);
+                break;
         case 0x10ec0668:
                 alc_write_coef_idx(codec, 0x11, 0x0001);
                 alc_write_coef_idx(codec, 0x15, 0x0d60);
@@ -3649,6 +3710,8 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
 /* Nokia type */
 static void alc_headset_mode_omtp(struct hda_codec *codec)
 {
+        int val;
+
         switch (codec->vendor_id) {
         case 0x10ec0255:
                 /* Set to OMTP Type */
@@ -3656,6 +3719,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
                 alc_write_coef_idx(codec, 0x1b, 0x0c2b);
                 alc_write_coefex_idx(codec, 0x57, 0x03, 0x8ea6);
                 break;
+        case 0x10ec0233:
         case 0x10ec0283:
                 alc_write_coef_idx(codec, 0x45, 0xe429);
                 alc_write_coef_idx(codec, 0x1b, 0x0c2b);
@@ -3666,6 +3730,13 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
                 alc_write_coef_idx(codec, 0x76, 0x0008);
                 alc_write_coef_idx(codec, 0x18, 0x7388);
                 break;
+        case 0x10ec0293:
+                /* Set to omtp type */
+                alc_write_coef_idx(codec, 0x45, 0xe429);
+                /* SET Line1 JD to 1 */
+                val = alc_read_coef_idx(codec, 0x10);
+                alc_write_coef_idx(codec, 0x10, (val & ~(7<<8)) | 7<<8);
+                break;
         case 0x10ec0668:
                 alc_write_coef_idx(codec, 0x11, 0x0001);
                 alc_write_coef_idx(codec, 0x15, 0x0d50);
@@ -3691,6 +3762,7 @@ static void alc_determine_headset_type(struct hda_codec *codec)
                 val = alc_read_coef_idx(codec, 0x46);
                 is_ctia = (val & 0x0070) == 0x0070;
                 break;
+        case 0x10ec0233:
         case 0x10ec0283:
                 alc_write_coef_idx(codec, 0x45, 0xd029);
                 msleep(300);
@@ -3703,6 +3775,16 @@ static void alc_determine_headset_type(struct hda_codec *codec)
                 val = alc_read_coef_idx(codec, 0x6c);
                 is_ctia = (val & 0x001c) == 0x001c;
                 break;
+        case 0x10ec0293:
+                /* Combo Jack auto detect */
+                val = alc_read_coef_idx(codec, 0x4a);
+                alc_write_coef_idx(codec, 0x4a, (val & 0xfff0) | 0x0008);
+                /* Set to ctia type */
+                alc_write_coef_idx(codec, 0x45, 0xD429);
+                msleep(300);
+                val = alc_read_coef_idx(codec, 0x46);
+                is_ctia = (val & 0x0070) == 0x0070;
+                break;
         case 0x10ec0668:
                 alc_write_coef_idx(codec, 0x11, 0x0001);
                 alc_write_coef_idx(codec, 0xb7, 0x802b);
@@ -3894,6 +3976,39 @@ static void alc_fixup_no_shutup(struct hda_codec *codec,
         }
 }
 
+static void alc_fixup_disable_aamix(struct hda_codec *codec,
+                                    const struct hda_fixup *fix, int action)
+{
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                struct alc_spec *spec = codec->spec;
+                /* Disable AA-loopback as it causes white noise */
+                spec->gen.mixer_nid = 0;
+        }
+}
+
+static unsigned int alc_power_filter_xps13(struct hda_codec *codec,
+                                hda_nid_t nid,
+                                unsigned int power_state)
+{
+        struct alc_spec *spec = codec->spec;
+
+        /* Avoid pop noises when headphones are plugged in */
+        if (spec->gen.hp_jack_present)
+                if (nid == codec->afg || nid == 0x02)
+                        return AC_PWRST_D0;
+        return power_state;
+}
+
+static void alc_fixup_dell_xps13(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        if (action == HDA_FIXUP_ACT_PROBE) {
+                struct alc_spec *spec = codec->spec;
+                spec->shutup = alc_no_shutup;
+                codec->power_filter = alc_power_filter_xps13;
+        }
+}
+
 static void alc_fixup_headset_mode_alc668(struct hda_codec *codec,
                                 const struct hda_fixup *fix, int action)
 {
@@ -4110,6 +4225,7 @@ enum {
         ALC269_FIXUP_ASUS_G73JW,
         ALC269_FIXUP_LENOVO_EAPD,
         ALC275_FIXUP_SONY_HWEQ,
+        ALC275_FIXUP_SONY_DISABLE_AAMIX,
         ALC271_FIXUP_DMIC,
         ALC269_FIXUP_PCM_44K,
         ALC269_FIXUP_STEREO_DMIC,
@@ -4159,6 +4275,8 @@ enum {
         ALC255_FIXUP_DELL2_MIC_NO_PRESENCE,
         ALC255_FIXUP_HEADSET_MODE,
         ALC255_FIXUP_HEADSET_MODE_NO_HP_MIC,
+        ALC293_FIXUP_DELL1_MIC_NO_PRESENCE,
+        ALC292_FIXUP_TPT440_DOCK,
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -4213,6 +4331,12 @@ static const struct hda_fixup alc269_fixups[] = {
                 .chained = true,
                 .chain_id = ALC275_FIXUP_SONY_VAIO_GPIO2
         },
+        [ALC275_FIXUP_SONY_DISABLE_AAMIX] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_disable_aamix,
+                .chained = true,
+                .chain_id = ALC269_FIXUP_SONY_VAIO
+        },
         [ALC271_FIXUP_DMIC] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc271_fixup_dmic,
@@ -4552,6 +4676,26 @@ static const struct hda_fixup alc269_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc_fixup_headset_mode_alc255_no_hp_mic,
         },
+        [ALC293_FIXUP_DELL1_MIC_NO_PRESENCE] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x18, 0x01a1913d }, /* use as headphone mic, without its own jack detect */
+                        { 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_HEADSET_MODE
+        },
+        [ALC292_FIXUP_TPT440_DOCK] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x16, 0x21211010 }, /* dock headphone */
+                        { 0x19, 0x21a11010 }, /* dock mic */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST
+        },
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -4604,11 +4748,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x061f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x0629, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x062c, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
-        SND_PCI_QUIRK(0x1028, 0x062e, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
-        SND_PCI_QUIRK(0x1028, 0x0632, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x0638, "Dell Inspiron 5439", ALC290_FIXUP_MONO_SPEAKERS_HSJACK),
         SND_PCI_QUIRK(0x1028, 0x063e, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x063f, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x064a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x064b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x0640, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x064d, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x0651, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE),
@@ -4629,6 +4773,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1028, 0x0684, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x15cc, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x15cd, "Dell X5 Precision", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
         SND_PCI_QUIRK(0x103c, 0x18e6, "HP", ALC269_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x1973, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
@@ -4702,6 +4848,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2),
         SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
         SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
+        SND_PCI_QUIRK(0x104d, 0x9099, "Sony VAIO S13", ALC275_FIXUP_SONY_DISABLE_AAMIX),
         SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
         SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
@@ -4715,7 +4862,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x2208, "Thinkpad T431s", ALC269_FIXUP_LENOVO_DOCK),
-        SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+        SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440_DOCK),
+        SND_PCI_QUIRK(0x17aa, 0x220e, "Thinkpad T440p", ALC292_FIXUP_TPT440_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -4793,9 +4941,54 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
         {.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"},
         {.id = ALC283_FIXUP_CHROME_BOOK, .name = "alc283-dac-wcaps"},
         {.id = ALC283_FIXUP_SENSE_COMBO_JACK, .name = "alc283-sense-combo"},
+        {.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"},
         {}
 };
 
+static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
+        {
+                .codec = 0x10ec0293,
+                .subvendor = 0x1028,
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+                .name = "Dell",
+#endif
+                .pins = (const struct hda_pintbl[]) {
+                        {0x12, 0x40000000},
+                        {0x13, 0x90a60140},
+                        {0x14, 0x90170110},
+                        {0x15, 0x0221401f},
+                        {0x16, 0x21014020},
+                        {0x18, 0x411111f0},
+                        {0x19, 0x21a19030},
+                        {0x1a, 0x411111f0},
+                        {0x1b, 0x411111f0},
+                        {0x1d, 0x40700001},
+                        {0x1e, 0x411111f0},
+                },
+                .value = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
+        },
+        {
+                .codec = 0x10ec0255,
+                .subvendor = 0x1028,
+#ifdef CONFIG_SND_DEBUG_VERBOSE
+                .name = "Dell",
+#endif
+                .pins = (const struct hda_pintbl[]) {
+                        {0x12, 0x90a60140},
+                        {0x14, 0x90170110},
+                        {0x17, 0x40000000},
+                        {0x18, 0x411111f0},
+                        {0x19, 0x411111f0},
+                        {0x1a, 0x411111f0},
+                        {0x1b, 0x411111f0},
+                        {0x1d, 0x40700001},
+                        {0x1e, 0x411111f0},
+                        {0x21, 0x02211020},
+                },
+                .value = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
+        },
+        {}
+};
 
 static void alc269_fill_coef(struct hda_codec *codec)
 {
@@ -4857,6 +5050,7 @@ static int patch_alc269(struct hda_codec *codec)
 
         snd_hda_pick_fixup(codec, alc269_fixup_models,
                        alc269_fixup_tbl, alc269_fixups);
+        snd_hda_pick_pin_fixup(codec, alc269_pin_fixup_tbl, alc269_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
         alc_auto_parse_customize_define(codec);
@@ -5313,6 +5507,8 @@ enum {
         ALC662_FIXUP_BASS_1A,
         ALC662_FIXUP_BASS_CHMAP,
         ALC668_FIXUP_AUTO_MUTE,
+        ALC668_FIXUP_DELL_DISABLE_AAMIX,
+        ALC668_FIXUP_DELL_XPS13,
 };
 
 static const struct hda_fixup alc662_fixups[] = {
@@ -5479,6 +5675,18 @@ static const struct hda_fixup alc662_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc_fixup_inv_dmic_0x12,
         },
+        [ALC668_FIXUP_DELL_XPS13] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_dell_xps13,
+                .chained = true,
+                .chain_id = ALC668_FIXUP_DELL_DISABLE_AAMIX
+        },
+        [ALC668_FIXUP_DELL_DISABLE_AAMIX] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_disable_aamix,
+                .chained = true,
+                .chain_id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE
+        },
         [ALC668_FIXUP_AUTO_MUTE] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc_fixup_auto_mute_via_amp,
@@ -5539,7 +5747,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE),
         SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
-        SND_PCI_QUIRK(0x1028, 0x060a, "Dell XPS 13", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x060a, "Dell XPS 13", ALC668_FIXUP_DELL_XPS13),
         SND_PCI_QUIRK(0x1028, 0x0623, "Dell", ALC668_FIXUP_AUTO_MUTE),
         SND_PCI_QUIRK(0x1028, 0x0624, "Dell", ALC668_FIXUP_AUTO_MUTE),
         SND_PCI_QUIRK(0x1028, 0x0625, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 75515b494034..7f40a150899c 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -795,7 +795,7 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)
         }
 
         while ((dev = dmi_find_device(DMI_DEV_TYPE_OEM_STRING, NULL, dev))) {
-                if (sscanf(dev->name, "HP_Mute_LED_%d_%x",
+                if (sscanf(dev->name, "HP_Mute_LED_%u_%x",
                            &spec->gpio_led_polarity,
                            &spec->gpio_led) == 2) {
                         unsigned int max_gpio;
@@ -808,7 +808,7 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)
                                 spec->vref_mute_led_nid = spec->gpio_led;
                         return 1;
                 }
-                if (sscanf(dev->name, "HP_Mute_LED_%d",
+                if (sscanf(dev->name, "HP_Mute_LED_%u",
                            &spec->gpio_led_polarity) == 1) {
                         set_hp_led_gpio(codec);
                         return 1;
diff --git a/sound/pci/lola/lola_proc.c b/sound/pci/lola/lola_proc.c
index 04df83defc09..c241dc06dd92 100644
--- a/sound/pci/lola/lola_proc.c
+++ b/sound/pci/lola/lola_proc.c
@@ -151,7 +151,7 @@ static void lola_proc_codec_rw_write(struct snd_info_entry *entry,
         char line[64];
         unsigned int id, verb, data, extdata;
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
-                if (sscanf(line, "%i %i %i %i", &id, &verb, &data, &extdata) != 4)
+                if (sscanf(line, "%u %u %u %u", &id, &verb, &data, &extdata) != 4)
                         continue;
                 lola_codec_read(chip, id, verb, data, extdata,
                                 &chip->debug_res,
diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c
index 2d8e95e9fbe5..e8f38e5df10a 100644
--- a/sound/pci/lx6464es/lx_core.c
+++ b/sound/pci/lx6464es/lx_core.c
@@ -24,6 +24,7 @@
 
 /* #define RMH_DEBUG 1 */
 
+#include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
@@ -429,11 +430,6 @@ int lx_dsp_read_async_events(struct lx6464es *chip, u32 *data)
         return ret;
 }
 
-#define CSES_TIMEOUT        100     /* microseconds */
-#define CSES_CE             0x0001
-#define CSES_BROADCAST      0x0002
-#define CSES_UPDATE_LDSV    0x0004
-
 #define PIPE_INFO_TO_CMD(capture, pipe)                                 \
         ((u32)((u32)(pipe) | ((capture) ? ID_IS_CAPTURE : 0L)) << ID_OFFSET)
 
@@ -519,7 +515,6 @@ int lx_buffer_ask(struct lx6464es *chip, u32 pipe, int is_capture,
                                 *r_needed += 1;
                 }
 
-#if 0
                 dev_dbg(chip->card->dev,
                         "CMD_08_ASK_BUFFERS: needed %d, freed %d\n",
                             *r_needed, *r_freed);
@@ -530,7 +525,6 @@ int lx_buffer_ask(struct lx6464es *chip, u32 pipe, int is_capture,
                                             chip->rmh.stat[i],
                                             chip->rmh.stat[i] & MASK_DATA_SIZE);
                 }
-#endif
         }
 
         spin_unlock_irqrestore(&chip->msg_lock, flags);
@@ -971,9 +965,9 @@ int lx_level_peaks(struct lx6464es *chip, int is_capture, int channels,
 
 /* interrupt handling */
 #define PCX_IRQ_NONE 0
-#define IRQCS_ACTIVE_PCIDB  0x00002000L         /* Bit nø 13 */
-#define IRQCS_ENABLE_PCIIRQ 0x00000100L         /* Bit nø 08 */
-#define IRQCS_ENABLE_PCIDB  0x00000200L         /* Bit nø 09 */
+#define IRQCS_ACTIVE_PCIDB      BIT(13)
+#define IRQCS_ENABLE_PCIIRQ     BIT(8)
+#define IRQCS_ENABLE_PCIDB      BIT(9)
 
 static u32 lx_interrupt_test_ack(struct lx6464es *chip)
 {
@@ -1030,25 +1024,21 @@ static int lx_interrupt_handle_async_events(struct lx6464es *chip, u32 irqsrc,
         int err;
         u32 stat[9];            /* answer from CMD_04_GET_EVENT */
 
-        /* On peut optimiser pour ne pas lire les evenements vides
-         * les mots de réponse sont dans l'ordre suivant :
-         * Stat[0]      mot de status général
-         * Stat[1]      fin de buffer OUT pF
-         * Stat[2]      fin de buffer OUT pf
-         * Stat[3]      fin de buffer IN pF
-         * Stat[4]      fin de buffer IN pf
-         * Stat[5]      underrun poid fort
-         * Stat[6]      underrun poid faible
-         * Stat[7]      overrun poid fort
-         * Stat[8]      overrun poid faible
+        /* We can optimize this to not read dumb events.
+         * Answer words are in the following order:
+         * Stat[0]      general status
+         * Stat[1]      end of buffer OUT pF
+         * Stat[2]      end of buffer OUT pf
+         * Stat[3]      end of buffer IN pF
+         * Stat[4]      end of buffer IN pf
+         * Stat[5]      MSB underrun
+         * Stat[6]      LSB underrun
+         * Stat[7]      MSB overrun
+         * Stat[8]      LSB overrun
          * */
 
         u64 orun_mask;
         u64 urun_mask;
-#if 0
-        int has_underrun   = (irqsrc & MASK_SYS_STATUS_URUN) ? 1 : 0;
-        int has_overrun    = (irqsrc & MASK_SYS_STATUS_ORUN) ? 1 : 0;
-#endif
         int eb_pending_out = (irqsrc & MASK_SYS_STATUS_EOBO) ? 1 : 0;
         int eb_pending_in  = (irqsrc & MASK_SYS_STATUS_EOBI) ? 1 : 0;
 
@@ -1199,9 +1189,8 @@ irqreturn_t lx_interrupt(int irq, void *dev_id)
         if (irqsrc & MASK_SYS_STATUS_CMD_DONE)
                 goto exit;
 
-#if 0
         if (irqsrc & MASK_SYS_STATUS_EOBI)
-                dev_dgg(chip->card->dev, "interrupt: EOBI\n");
+                dev_dbg(chip->card->dev, "interrupt: EOBI\n");
 
         if (irqsrc & MASK_SYS_STATUS_EOBO)
                 dev_dbg(chip->card->dev, "interrupt: EOBO\n");
@@ -1211,7 +1200,6 @@ irqreturn_t lx_interrupt(int irq, void *dev_id)
 
         if (irqsrc & MASK_SYS_STATUS_ORUN)
                 dev_dbg(chip->card->dev, "interrupt: ORUN\n");
-#endif
 
         if (async_pending) {
                 u64 notified_in_pipe_mask = 0;
@@ -1238,7 +1226,6 @@ irqreturn_t lx_interrupt(int irq, void *dev_id)
         }
 
         if (async_escmd) {
-#if 0
                 /* backdoor for ethersound commands
                  *
                  * for now, we do not need this
@@ -1246,7 +1233,6 @@ irqreturn_t lx_interrupt(int irq, void *dev_id)
                  * */
 
                 dev_dbg(chip->card->dev, "interrupt requests escmd handling\n");
-#endif
         }
 
 exit:
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index 4789619a52d8..27e3fc4a536b 100644
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -35,7 +35,7 @@ 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
+        depends on ARCH_AT91 && ATMEL_SSC && SND_ATMEL_SOC && I2C
         select SND_ATMEL_SOC_SSC
         select SND_ATMEL_SOC_DMA
         select SND_SOC_WM8904
diff --git a/sound/soc/atmel/atmel-pcm-pdc.c b/sound/soc/atmel/atmel-pcm-pdc.c
index 33ec592ecd75..a366b3503c28 100644
--- a/sound/soc/atmel/atmel-pcm-pdc.c
+++ b/sound/soc/atmel/atmel-pcm-pdc.c
@@ -76,12 +76,6 @@ struct atmel_runtime_data {
         size_t period_size;
 
         dma_addr_t period_ptr;          /* physical address of next period */
-
-        /* PDC register save */
-        u32 pdc_xpr_save;
-        u32 pdc_xcr_save;
-        u32 pdc_xnpr_save;
-        u32 pdc_xncr_save;
 };
 
 /*--------------------------------------------------------------------------*\
@@ -320,67 +314,10 @@ static struct snd_pcm_ops atmel_pcm_ops = {
         .mmap           = atmel_pcm_mmap,
 };
 
-
-/*--------------------------------------------------------------------------*\
- * ASoC platform driver
-\*--------------------------------------------------------------------------*/
-#ifdef CONFIG_PM
-static int atmel_pcm_suspend(struct snd_soc_dai *dai)
-{
-        struct snd_pcm_runtime *runtime = dai->runtime;
-        struct atmel_runtime_data *prtd;
-        struct atmel_pcm_dma_params *params;
-
-        if (!runtime)
-                return 0;
-
-        prtd = runtime->private_data;
-        params = prtd->params;
-
-        /* disable the PDC and save the PDC registers */
-
-        ssc_writel(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable);
-
-        prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr);
-        prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr);
-        prtd->pdc_xnpr_save = ssc_readx(params->ssc->regs, params->pdc->xnpr);
-        prtd->pdc_xncr_save = ssc_readx(params->ssc->regs, params->pdc->xncr);
-
-        return 0;
-}
-
-static int atmel_pcm_resume(struct snd_soc_dai *dai)
-{
-        struct snd_pcm_runtime *runtime = dai->runtime;
-        struct atmel_runtime_data *prtd;
-        struct atmel_pcm_dma_params *params;
-
-        if (!runtime)
-                return 0;
-
-        prtd = runtime->private_data;
-        params = prtd->params;
-
-        /* restore the PDC registers and enable the PDC */
-        ssc_writex(params->ssc->regs, params->pdc->xpr, prtd->pdc_xpr_save);
-        ssc_writex(params->ssc->regs, params->pdc->xcr, prtd->pdc_xcr_save);
-        ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save);
-        ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save);
-
-        ssc_writel(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable);
-        return 0;
-}
-#else
-#define atmel_pcm_suspend       NULL
-#define atmel_pcm_resume        NULL
-#endif
-
 static struct snd_soc_platform_driver atmel_soc_platform = {
         .ops            = &atmel_pcm_ops,
         .pcm_new        = atmel_pcm_new,
         .pcm_free       = atmel_pcm_free,
-        .suspend        = atmel_pcm_suspend,
-        .resume         = atmel_pcm_resume,
 };
 
 int atmel_pcm_pdc_platform_register(struct device *dev)
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c
index f65f08beac31..9579799ace54 100644
--- a/sound/soc/atmel/snd-soc-afeb9260.c
+++ b/sound/soc/atmel/snd-soc-afeb9260.c
@@ -80,17 +80,6 @@ static const struct snd_soc_dapm_route afeb9260_audio_map[] = {
         {"MICIN", NULL, "Mic Jack"},
 };
 
-static int afeb9260_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Line In");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
-
-        return 0;
-}
 
 /* Digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link afeb9260_dai = {
@@ -100,7 +89,6 @@ static struct snd_soc_dai_link afeb9260_dai = {
         .codec_dai_name = "tlv320aic23-hifi",
         .platform_name = "atmel_pcm-audio",
         .codec_name = "tlv320aic23-codec.0-001a",
-        .init = afeb9260_tlv320aic23_init,
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF |
                    SND_SOC_DAIFMT_CBM_CFM,
         .ops = &afeb9260_ops,
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index b07e17160f94..3c4b10ff48c1 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -276,7 +276,7 @@ static int snd_soc_get_volsw_2r_st(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         int val[2], val2[2], i;
@@ -300,7 +300,7 @@ static int snd_soc_put_volsw_2r_st(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         int err;
@@ -333,7 +333,7 @@ static int snd_soc_get_volsw_2r_out(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         unsigned int shift = mc->shift;
@@ -353,7 +353,7 @@ static int snd_soc_put_volsw_2r_out(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         unsigned int shift = mc->shift;
@@ -1327,10 +1327,6 @@ static int pm860x_probe(struct snd_soc_codec *codec)
 
         pm860x->codec = codec;
 
-        ret = snd_soc_codec_set_cache_io(codec, pm860x->regmap);
-        if (ret)
-                return ret;
-
         for (i = 0; i < 4; i++) {
                 ret = request_threaded_irq(pm860x->irq[i], NULL,
                                            pm860x_codec_handler, IRQF_ONESHOT,
@@ -1362,10 +1358,18 @@ static int pm860x_remove(struct snd_soc_codec *codec)
         return 0;
 }
 
+static struct regmap *pm860x_get_regmap(struct device *dev)
+{
+        struct pm860x_priv *pm860x = dev_get_drvdata(dev);
+
+        return pm860x->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_pm860x = {
         .probe          = pm860x_probe,
         .remove         = pm860x_remove,
         .set_bias_level = pm860x_set_bias_level,
+        .get_regmap     = pm860x_get_regmap,
 
         .controls = pm860x_snd_controls,
         .num_controls = ARRAY_SIZE(pm860x_snd_controls),
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f0e840137887..c59943a19f94 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -39,8 +39,9 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_ALC5623 if I2C
         select SND_SOC_ALC5632 if I2C
         select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
-        select SND_SOC_CS42L51 if I2C
-        select SND_SOC_CS42L52 if I2C
+        select SND_SOC_CS42L51_I2C if I2C
+        select SND_SOC_CS42L52 if I2C && INPUT
+        select SND_SOC_CS42L56 if I2C && INPUT
         select SND_SOC_CS42L73 if I2C
         select SND_SOC_CS4270 if I2C
         select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
@@ -71,6 +72,8 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_PCM512x_SPI if SPI_MASTER
         select SND_SOC_RT5631 if I2C
         select SND_SOC_RT5640 if I2C
+        select SND_SOC_RT5645 if I2C
+        select SND_SOC_RT5651 if I2C
         select SND_SOC_SGTL5000 if I2C
         select SND_SOC_SI476X if MFD_SI476X_CORE
         select SND_SOC_SIRF_AUDIO_CODEC
@@ -80,6 +83,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_SSM2602_SPI if SPI_MASTER
         select SND_SOC_SSM2602_I2C if I2C
         select SND_SOC_STA32X if I2C
+        select SND_SOC_STA350 if I2C
         select SND_SOC_STA529 if I2C
         select SND_SOC_STAC9766 if SND_SOC_AC97_BUS
         select SND_SOC_TAS5086 if I2C
@@ -127,7 +131,7 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_WM8955 if I2C
         select SND_SOC_WM8960 if I2C
         select SND_SOC_WM8961 if I2C
-        select SND_SOC_WM8962 if I2C
+        select SND_SOC_WM8962 if I2C && INPUT
         select SND_SOC_WM8971 if I2C
         select SND_SOC_WM8974 if I2C
         select SND_SOC_WM8978 if I2C
@@ -269,7 +273,7 @@ config SND_SOC_AK5386
         tristate "AKM AK5638 CODEC"
 
 config SND_SOC_ALC5623
-       tristate
+       tristate "Realtek ALC5623 CODEC"
 
 config SND_SOC_ALC5632
         tristate
@@ -280,9 +284,17 @@ config SND_SOC_CQ0093VC
 config SND_SOC_CS42L51
         tristate
 
+config SND_SOC_CS42L51_I2C
+        tristate
+        select SND_SOC_CS42L51
+
 config SND_SOC_CS42L52
         tristate "Cirrus Logic CS42L52 CODEC"
-        depends on I2C
+        depends on I2C && INPUT
+
+config SND_SOC_CS42L56
+        tristate "Cirrus Logic CS42L56 CODEC"
+        depends on I2C && INPUT
 
 config SND_SOC_CS42L73
         tristate "Cirrus Logic CS42L73 CODEC"
@@ -396,6 +408,12 @@ config SND_SOC_RT5631
 config SND_SOC_RT5640
         tristate
 
+config SND_SOC_RT5645
+        tristate
+
+config SND_SOC_RT5651
+        tristate
+
 #Freescale sgtl5000 codec
 config SND_SOC_SGTL5000
         tristate "Freescale SGTL5000 CODEC"
@@ -435,6 +453,10 @@ config SND_SOC_SSM2602_I2C
 config SND_SOC_STA32X
         tristate
 
+config SND_SOC_STA350
+        tristate "STA350 speaker amplifier"
+        depends on I2C
+
 config SND_SOC_STA529
         tristate
 
@@ -598,7 +620,7 @@ config SND_SOC_WM8961
 
 config SND_SOC_WM8962
         tristate "Wolfson Microelectronics WM8962 CODEC"
-        depends on I2C
+        depends on I2C && INPUT
 
 config SND_SOC_WM8971
         tristate
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 3c4d275d064b..1ccdaf0c0e3e 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -26,7 +26,9 @@ snd-soc-ak5386-objs := ak5386.o
 snd-soc-arizona-objs := arizona.o
 snd-soc-cq93vc-objs := cq93vc.o
 snd-soc-cs42l51-objs := cs42l51.o
+snd-soc-cs42l51-i2c-objs := cs42l51-i2c.o
 snd-soc-cs42l52-objs := cs42l52.o
+snd-soc-cs42l56-objs := cs42l56.o
 snd-soc-cs42l73-objs := cs42l73.o
 snd-soc-cs4270-objs := cs4270.o
 snd-soc-cs4271-objs := cs4271.o
@@ -60,6 +62,8 @@ snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
 snd-soc-pcm512x-spi-objs := pcm512x-spi.o
 snd-soc-rt5631-objs := rt5631.o
 snd-soc-rt5640-objs := rt5640.o
+snd-soc-rt5645-objs := rt5645.o
+snd-soc-rt5651-objs := rt5651.o
 snd-soc-sgtl5000-objs := sgtl5000.o
 snd-soc-alc5623-objs := alc5623.o
 snd-soc-alc5632-objs := alc5632.o
@@ -74,6 +78,7 @@ snd-soc-ssm2602-objs := ssm2602.o
 snd-soc-ssm2602-spi-objs := ssm2602-spi.o
 snd-soc-ssm2602-i2c-objs := ssm2602-i2c.o
 snd-soc-sta32x-objs := sta32x.o
+snd-soc-sta350-objs := sta350.o
 snd-soc-sta529-objs := sta529.o
 snd-soc-stac9766-objs := stac9766.o
 snd-soc-tas5086-objs := tas5086.o
@@ -177,7 +182,9 @@ obj-$(CONFIG_SND_SOC_ALC5632)	+= snd-soc-alc5632.o
 obj-$(CONFIG_SND_SOC_ARIZONA)   += snd-soc-arizona.o
 obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o
 obj-$(CONFIG_SND_SOC_CS42L51)   += snd-soc-cs42l51.o
+obj-$(CONFIG_SND_SOC_CS42L51_I2C)       += snd-soc-cs42l51-i2c.o
 obj-$(CONFIG_SND_SOC_CS42L52)   += snd-soc-cs42l52.o
+obj-$(CONFIG_SND_SOC_CS42L56)   += snd-soc-cs42l56.o
 obj-$(CONFIG_SND_SOC_CS42L73)   += snd-soc-cs42l73.o
 obj-$(CONFIG_SND_SOC_CS4270)    += snd-soc-cs4270.o
 obj-$(CONFIG_SND_SOC_CS4271)    += snd-soc-cs4271.o
@@ -211,6 +218,8 @@ obj-$(CONFIG_SND_SOC_PCM512x_I2C)	+= snd-soc-pcm512x-i2c.o
 obj-$(CONFIG_SND_SOC_PCM512x_SPI)       += snd-soc-pcm512x-spi.o
 obj-$(CONFIG_SND_SOC_RT5631)    += snd-soc-rt5631.o
 obj-$(CONFIG_SND_SOC_RT5640)    += snd-soc-rt5640.o
+obj-$(CONFIG_SND_SOC_RT5645)    += snd-soc-rt5645.o
+obj-$(CONFIG_SND_SOC_RT5651)    += snd-soc-rt5651.o
 obj-$(CONFIG_SND_SOC_SGTL5000)  += snd-soc-sgtl5000.o
 obj-$(CONFIG_SND_SOC_SIGMADSP)  += snd-soc-sigmadsp.o
 obj-$(CONFIG_SND_SOC_SI476X)    += snd-soc-si476x.o
@@ -221,6 +230,7 @@ obj-$(CONFIG_SND_SOC_SSM2602)	+= snd-soc-ssm2602.o
 obj-$(CONFIG_SND_SOC_SSM2602_SPI)       += snd-soc-ssm2602-spi.o
 obj-$(CONFIG_SND_SOC_SSM2602_I2C)       += snd-soc-ssm2602-i2c.o
 obj-$(CONFIG_SND_SOC_STA32X)   += snd-soc-sta32x.o
+obj-$(CONFIG_SND_SOC_STA350)   += snd-soc-sta350.o
 obj-$(CONFIG_SND_SOC_STA529)   += snd-soc-sta529.o
 obj-$(CONFIG_SND_SOC_STAC9766)  += snd-soc-stac9766.o
 obj-$(CONFIG_SND_SOC_TAS5086)   += snd-soc-tas5086.o
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 1ad92cbf0b24..1fb4402bf72d 100644
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -1139,7 +1139,7 @@ static void anc_configure(struct snd_soc_codec *codec,
 static int sid_status_control_get(struct snd_kcontrol *kcontrol,
                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
 
         mutex_lock(&codec->mutex);
@@ -1153,7 +1153,7 @@ static int sid_status_control_get(struct snd_kcontrol *kcontrol,
 static int sid_status_control_put(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
         unsigned int param, sidconf, val;
         int status = 1;
@@ -1208,7 +1208,7 @@ out:
 static int anc_status_control_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
 
         mutex_lock(&codec->mutex);
@@ -1221,7 +1221,7 @@ static int anc_status_control_get(struct snd_kcontrol *kcontrol,
 static int anc_status_control_put(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(codec->dev);
         struct device *dev = codec->dev;
         bool apply_fir, apply_iir;
@@ -1306,7 +1306,7 @@ static int filter_control_info(struct snd_kcontrol *kcontrol,
 static int filter_control_get(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct filter_control *fc =
                         (struct filter_control *)kcontrol->private_value;
         unsigned int i;
@@ -1322,7 +1322,7 @@ static int filter_control_get(struct snd_kcontrol *kcontrol,
 static int filter_control_put(struct snd_kcontrol *kcontrol,
                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct filter_control *fc =
                         (struct filter_control *)kcontrol->private_value;
         unsigned int i;
diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c
index 34d965a4a040..304d3003339a 100644
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
@@ -189,28 +189,27 @@ static struct snd_soc_dai_driver ad1980_dai = {
 
 static int ad1980_reset(struct snd_soc_codec *codec, int try_warm)
 {
-        u16 retry_cnt = 0;
+        unsigned int retry_cnt = 0;
 
-retry:
-        if (try_warm && soc_ac97_ops->warm_reset) {
-                soc_ac97_ops->warm_reset(codec->ac97);
-                if (ac97_read(codec, AC97_RESET) == 0x0090)
-                        return 1;
-        }
-
-        soc_ac97_ops->reset(codec->ac97);
-        /* Set bit 16slot in register 74h, then every slot will has only 16
-         * bits. This command is sent out in 20bit mode, in which case the
-         * first nibble of data is eaten by the addr. (Tag is always 16 bit)*/
-        ac97_write(codec, AC97_AD_SERIAL_CFG, 0x9900);
-
-        if (ac97_read(codec, AC97_RESET)  != 0x0090)
-                goto err;
-        return 0;
+        do {
+                if (try_warm && soc_ac97_ops->warm_reset) {
+                        soc_ac97_ops->warm_reset(codec->ac97);
+                        if (ac97_read(codec, AC97_RESET) == 0x0090)
+                                return 1;
+                }
 
-err:
-        while (retry_cnt++ < 10)
-                goto retry;
+                soc_ac97_ops->reset(codec->ac97);
+                /*
+                 * Set bit 16slot in register 74h, then every slot will has only
+                 * 16 bits. This command is sent out in 20bit mode, in which
+                 * case the first nibble of data is eaten by the addr. (Tag is
+                 * always 16 bit)
+                 */
+                ac97_write(codec, AC97_AD_SERIAL_CFG, 0x9900);
+
+                if (ac97_read(codec, AC97_RESET)  == 0x0090)
+                        return 0;
+        } while (retry_cnt++ < 10);
 
         printk(KERN_ERR "AD1980 AC97 reset failed\n");
         return -EIO;
diff --git a/sound/soc/codecs/adau1373.c b/sound/soc/codecs/adau1373.c
index 877f5737bb6b..1ff7d4d027e9 100644
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
@@ -519,8 +519,7 @@ static const struct snd_kcontrol_new adau1373_controls[] = {
         SOC_ENUM("HPF Channel", adau1373_hpf_channel_enum),
 
         SOC_ENUM("Bass HPF Cutoff", adau1373_bass_hpf_cutoff_enum),
-        SOC_VALUE_ENUM("Bass Clip Level Threshold",
-            adau1373_bass_clip_level_enum),
+        SOC_ENUM("Bass Clip Level Threshold", adau1373_bass_clip_level_enum),
         SOC_ENUM("Bass LPF Cutoff", adau1373_bass_lpf_cutoff_enum),
         SOC_DOUBLE("Bass Playback Switch", ADAU1373_BASS2, 0, 1, 1, 0),
         SOC_SINGLE_TLV("Bass Playback Volume", ADAU1373_BASS2, 2, 7, 0,
@@ -580,7 +579,7 @@ static SOC_ENUM_SINGLE_VIRT_DECL(adau1373_decimator_enum,
         adau1373_decimator_text);
 
 static const struct snd_kcontrol_new adau1373_decimator_mux =
-        SOC_DAPM_ENUM_VIRT("Decimator Mux", adau1373_decimator_enum);
+        SOC_DAPM_ENUM("Decimator Mux", adau1373_decimator_enum);
 
 static const struct snd_kcontrol_new adau1373_left_adc_mixer_controls[] = {
         SOC_DAPM_SINGLE("DAC1 Switch", ADAU1373_LADC_MIXER, 4, 1, 0),
@@ -694,7 +693,7 @@ static const struct snd_soc_dapm_widget adau1373_dapm_widgets[] = {
         SND_SOC_DAPM_ADC("DMIC1", NULL, ADAU1373_DIGMICCTRL, 0, 0),
         SND_SOC_DAPM_ADC("DMIC2", NULL, ADAU1373_DIGMICCTRL, 2, 0),
 
-        SND_SOC_DAPM_VIRT_MUX("Decimator Mux", SND_SOC_NOPM, 0, 0,
+        SND_SOC_DAPM_MUX("Decimator Mux", SND_SOC_NOPM, 0, 0,
                 &adau1373_decimator_mux),
 
         SND_SOC_DAPM_SUPPLY("MICBIAS2", ADAU1373_PWDN_CTRL1, 5, 0, NULL, 0),
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
index 5062e34ee8dc..c43b93fdf0df 100644
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -172,14 +172,14 @@ static ADAV80X_MUX_ENUM_DECL(adav80x_capture_enum, ADAV80X_DPATH_CTRL1, 3);
 static ADAV80X_MUX_ENUM_DECL(adav80x_dac_enum, ADAV80X_DPATH_CTRL2, 3);
 
 static const struct snd_kcontrol_new adav80x_aux_capture_mux_ctrl =
-        SOC_DAPM_VALUE_ENUM("Route", adav80x_aux_capture_enum);
+        SOC_DAPM_ENUM("Route", adav80x_aux_capture_enum);
 static const struct snd_kcontrol_new adav80x_capture_mux_ctrl =
-        SOC_DAPM_VALUE_ENUM("Route", adav80x_capture_enum);
+        SOC_DAPM_ENUM("Route", adav80x_capture_enum);
 static const struct snd_kcontrol_new adav80x_dac_mux_ctrl =
-        SOC_DAPM_VALUE_ENUM("Route", adav80x_dac_enum);
+        SOC_DAPM_ENUM("Route", adav80x_dac_enum);
 
 #define ADAV80X_MUX(name, ctrl) \
-        SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
+        SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
 
 static const struct snd_soc_dapm_widget adav80x_dapm_widgets[] = {
         SND_SOC_DAPM_DAC("DAC", NULL, ADAV80X_DAC_CTRL1, 7, 1),
@@ -315,7 +315,7 @@ static int adav80x_set_deemph(struct snd_soc_codec *codec)
 static int adav80x_put_deemph(struct snd_kcontrol *kcontrol,
                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
         unsigned int deemph = ucontrol->value.enumerated.item[0];
 
@@ -330,7 +330,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol,
 static int adav80x_get_deemph(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = adav80x->deemph;
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c
index 10adf25d4c14..1fd7f72b2a62 100644
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
@@ -11,13 +11,14 @@
 
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <sound/core.h>
-#include <sound/soc.h>
-#include <sound/initval.h>
 #include <linux/spi/spi.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
+#include <linux/regulator/consumer.h>
 #include <sound/asoundef.h>
+#include <sound/core.h>
+#include <sound/soc.h>
+#include <sound/initval.h>
 
 /* AK4104 registers addresses */
 #define AK4104_REG_CONTROL1             0x00
@@ -47,6 +48,7 @@
 
 struct ak4104_private {
         struct regmap *regmap;
+        struct regulator *regulator;
 };
 
 static const struct snd_soc_dapm_widget ak4104_dapm_widgets[] = {
@@ -174,20 +176,30 @@ static int ak4104_probe(struct snd_soc_codec *codec)
         struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
+        ret = regulator_enable(ak4104->regulator);
+        if (ret < 0) {
+                dev_err(codec->dev, "Unable to enable regulator: %d\n", ret);
+                return ret;
+        }
+
         /* set power-up and non-reset bits */
         ret = regmap_update_bits(ak4104->regmap, AK4104_REG_CONTROL1,
                                  AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN,
                                  AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN);
         if (ret < 0)
-                return ret;
+                goto exit_disable_regulator;
 
         /* enable transmitter */
         ret = regmap_update_bits(ak4104->regmap, AK4104_REG_TX,
                                  AK4104_TX_TXE, AK4104_TX_TXE);
         if (ret < 0)
-                return ret;
+                goto exit_disable_regulator;
 
         return 0;
+
+exit_disable_regulator:
+        regulator_disable(ak4104->regulator);
+        return ret;
 }
 
 static int ak4104_remove(struct snd_soc_codec *codec)
@@ -196,13 +208,42 @@ static int ak4104_remove(struct snd_soc_codec *codec)
 
         regmap_update_bits(ak4104->regmap, AK4104_REG_CONTROL1,
                            AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN, 0);
+        regulator_disable(ak4104->regulator);
 
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int ak4104_soc_suspend(struct snd_soc_codec *codec)
+{
+        struct ak4104_private *priv = snd_soc_codec_get_drvdata(codec);
+
+        regulator_disable(priv->regulator);
+
+        return 0;
+}
+
+static int ak4104_soc_resume(struct snd_soc_codec *codec)
+{
+        struct ak4104_private *priv = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        ret = regulator_enable(priv->regulator);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+#else
+#define ak4104_soc_suspend      NULL
+#define ak4104_soc_resume       NULL
+#endif /* CONFIG_PM */
+
 static struct snd_soc_codec_driver soc_codec_device_ak4104 = {
-        .probe =        ak4104_probe,
-        .remove =       ak4104_remove,
+        .probe = ak4104_probe,
+        .remove = ak4104_remove,
+        .suspend = ak4104_soc_suspend,
+        .resume = ak4104_soc_resume,
 
         .dapm_widgets = ak4104_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(ak4104_dapm_widgets),
@@ -239,6 +280,13 @@ static int ak4104_spi_probe(struct spi_device *spi)
         if (ak4104 == NULL)
                 return -ENOMEM;
 
+        ak4104->regulator = devm_regulator_get(&spi->dev, "vdd");
+        if (IS_ERR(ak4104->regulator)) {
+                ret = PTR_ERR(ak4104->regulator);
+                dev_err(&spi->dev, "Unable to get Vdd regulator: %d\n", ret);
+                return ret;
+        }
+
         ak4104->regmap = devm_regmap_init_spi(spi, &ak4104_regmap);
         if (IS_ERR(ak4104->regmap)) {
                 ret = PTR_ERR(ak4104->regmap);
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index 868c0e2da1ec..7afe8f482088 100644
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -74,7 +74,7 @@ static int ak4641_set_deemph(struct snd_soc_codec *codec)
 static int ak4641_put_deemph(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);
         int deemph = ucontrol->value.enumerated.item[0];
 
@@ -89,7 +89,7 @@ static int ak4641_put_deemph(struct snd_kcontrol *kcontrol,
 static int ak4641_get_deemph(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = ak4641->deemph;
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 92655cc189ae..3ba4c0f11418 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -98,7 +98,7 @@
 #define MGAIN0          (1 << 0) /* MIC amp gain*/
 
 /* TIMER */
-#define ZTM(param)      ((param & 0x3) << 4) /* ALC Zoro Crossing TimeOut */
+#define ZTM(param)      ((param & 0x3) << 4) /* ALC Zero Crossing TimeOut */
 #define WTM(param)      (((param & 0x4) << 4) | ((param & 0x3) << 2))
 
 /* ALC_CTL1 */
@@ -134,6 +134,15 @@
 /* MD_CTL4 */
 #define DACH            (1 << 0)
 
+struct ak4642_drvdata {
+        const struct regmap_config *regmap_config;
+        int extended_frequencies;
+};
+
+struct ak4642_priv {
+        const struct ak4642_drvdata *drvdata;
+};
+
 /*
  * Playback Volume (table 39)
  *
@@ -148,6 +157,8 @@ static const struct snd_kcontrol_new ak4642_snd_controls[] = {
 
         SOC_DOUBLE_R_TLV("Digital Playback Volume", L_DVC, R_DVC,
                          0, 0xFF, 1, out_tlv),
+        SOC_SINGLE("ALC Capture Switch", ALC_CTL1, 5, 1, 0),
+        SOC_SINGLE("ALC Capture ZC Switch", ALC_CTL1, 4, 1, 1),
 };
 
 static const struct snd_kcontrol_new ak4642_headphone_control =
@@ -287,7 +298,9 @@ static int ak4642_dai_set_sysclk(struct snd_soc_dai *codec_dai,
         int clk_id, unsigned int freq, int dir)
 {
         struct snd_soc_codec *codec = codec_dai->codec;
+        struct ak4642_priv *priv = snd_soc_codec_get_drvdata(codec);
         u8 pll;
+        int extended_freq = 0;
 
         switch (freq) {
         case 11289600:
@@ -308,9 +321,25 @@ static int ak4642_dai_set_sysclk(struct snd_soc_dai *codec_dai,
         case 27000000:
                 pll = PLL3 | PLL2 | PLL0;
                 break;
+        case 19200000:
+                pll = PLL3;
+                extended_freq = 1;
+                break;
+        case 13000000:
+                pll = PLL3 | PLL2 | PLL1;
+                extended_freq = 1;
+                break;
+        case 26000000:
+                pll = PLL3 | PLL2 | PLL1 | PLL0;
+                extended_freq = 1;
+                break;
         default:
                 return -EINVAL;
         }
+
+        if (extended_freq && !priv->drvdata->extended_frequencies)
+                return -EINVAL;
+
         snd_soc_update_bits(codec, MD_CTL1, PLL_MASK, pll);
 
         return 0;
@@ -505,30 +534,52 @@ static const struct regmap_config ak4648_regmap = {
         .num_reg_defaults       = ARRAY_SIZE(ak4648_reg),
 };
 
+static const struct ak4642_drvdata ak4642_drvdata = {
+        .regmap_config = &ak4642_regmap,
+};
+
+static const struct ak4642_drvdata ak4643_drvdata = {
+        .regmap_config = &ak4642_regmap,
+};
+
+static const struct ak4642_drvdata ak4648_drvdata = {
+        .regmap_config = &ak4648_regmap,
+        .extended_frequencies = 1,
+};
+
 static struct of_device_id ak4642_of_match[];
 static int ak4642_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
         struct device_node *np = i2c->dev.of_node;
-        const struct regmap_config *regmap_config = NULL;
+        const struct ak4642_drvdata *drvdata = NULL;
         struct regmap *regmap;
+        struct ak4642_priv *priv;
 
         if (np) {
                 const struct of_device_id *of_id;
 
                 of_id = of_match_device(ak4642_of_match, &i2c->dev);
                 if (of_id)
-                        regmap_config = of_id->data;
+                        drvdata = of_id->data;
         } else {
-                regmap_config = (const struct regmap_config *)id->driver_data;
+                drvdata = (const struct ak4642_drvdata *)id->driver_data;
         }
 
-        if (!regmap_config) {
+        if (!drvdata) {
                 dev_err(&i2c->dev, "Unknown device type\n");
                 return -EINVAL;
         }
 
-        regmap = devm_regmap_init_i2c(i2c, regmap_config);
+        priv = devm_kzalloc(&i2c->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        priv->drvdata = drvdata;
+
+        i2c_set_clientdata(i2c, priv);
+
+        regmap = devm_regmap_init_i2c(i2c, drvdata->regmap_config);
         if (IS_ERR(regmap))
                 return PTR_ERR(regmap);
 
@@ -543,17 +594,17 @@ static int ak4642_i2c_remove(struct i2c_client *client)
 }
 
 static struct of_device_id ak4642_of_match[] = {
-        { .compatible = "asahi-kasei,ak4642",   .data = &ak4642_regmap},
-        { .compatible = "asahi-kasei,ak4643",   .data = &ak4642_regmap},
-        { .compatible = "asahi-kasei,ak4648",   .data = &ak4648_regmap},
+        { .compatible = "asahi-kasei,ak4642",   .data = &ak4642_drvdata},
+        { .compatible = "asahi-kasei,ak4643",   .data = &ak4643_drvdata},
+        { .compatible = "asahi-kasei,ak4648",   .data = &ak4648_drvdata},
         {},
 };
 MODULE_DEVICE_TABLE(of, ak4642_of_match);
 
 static const struct i2c_device_id ak4642_i2c_id[] = {
-        { "ak4642", (kernel_ulong_t)&ak4642_regmap },
-        { "ak4643", (kernel_ulong_t)&ak4642_regmap },
-        { "ak4648", (kernel_ulong_t)&ak4648_regmap },
+        { "ak4642", (kernel_ulong_t)&ak4642_drvdata },
+        { "ak4643", (kernel_ulong_t)&ak4643_drvdata },
+        { "ak4648", (kernel_ulong_t)&ak4648_drvdata },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, ak4642_i2c_id);
diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index 2acf82f4a08a..9d0755aa1d16 100644
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -23,6 +23,7 @@
 #include <linux/i2c.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -998,8 +999,10 @@ static int alc5623_i2c_probe(struct i2c_client *client,
 {
         struct alc5623_platform_data *pdata;
         struct alc5623_priv *alc5623;
+        struct device_node *np;
         unsigned int vid1, vid2;
         int ret;
+        u32 val32;
 
         alc5623 = devm_kzalloc(&client->dev, sizeof(struct alc5623_priv),
                                GFP_KERNEL);
@@ -1040,6 +1043,16 @@ static int alc5623_i2c_probe(struct i2c_client *client,
         if (pdata) {
                 alc5623->add_ctrl = pdata->add_ctrl;
                 alc5623->jack_det_ctrl = pdata->jack_det_ctrl;
+        } else {
+                if (client->dev.of_node) {
+                        np = client->dev.of_node;
+                        ret = of_property_read_u32(np, "add-ctrl", &val32);
+                        if (!ret)
+                                alc5623->add_ctrl = val32;
+                        ret = of_property_read_u32(np, "jack-det-ctrl", &val32);
+                        if (!ret)
+                                alc5623->jack_det_ctrl = val32;
+                }
         }
 
         alc5623->id = vid2;
@@ -1081,11 +1094,18 @@ static const struct i2c_device_id alc5623_i2c_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, alc5623_i2c_table);
 
+static const struct of_device_id alc5623_of_match[] = {
+        { .compatible = "realtek,alc5623", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, alc5623_of_match);
+
 /*  i2c codec control layer */
 static struct i2c_driver alc5623_i2c_driver = {
         .driver = {
                 .name = "alc562x-codec",
                 .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(alc5623_of_match),
         },
         .probe = alc5623_i2c_probe,
         .remove =  alc5623_i2c_remove,
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 16df0f913353..05ae17f5bca3 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -107,7 +107,7 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
 
 #define ARIZONA_MUX_CTL_DECL(name) \
         const struct snd_kcontrol_new name##_mux =      \
-                SOC_DAPM_VALUE_ENUM("Route", name##_enum)
+                SOC_DAPM_ENUM("Route", name##_enum)
 
 #define ARIZONA_MUX_ENUMS(name, base_reg) \
         static ARIZONA_MUX_ENUM_DECL(name##_enum, base_reg);      \
@@ -128,7 +128,7 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
         ARIZONA_MUX_ENUMS(name##_aux6, base_reg + 40)
 
 #define ARIZONA_MUX(name, ctrl) \
-        SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
+        SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
 
 #define ARIZONA_MUX_WIDGETS(name, name_str) \
         ARIZONA_MUX(name_str " Input", &name##_mux)
diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c
index 1e25c7af853b..537327c7f7f1 100644
--- a/sound/soc/codecs/cq93vc.c
+++ b/sound/soc/codecs/cq93vc.c
@@ -139,8 +139,6 @@ static int cq93vc_probe(struct snd_soc_codec *codec)
 
         davinci_vc->cq93vc.codec = codec;
 
-        snd_soc_codec_set_cache_io(codec, davinci_vc->regmap);
-
         /* Off, with power on */
         cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
@@ -154,11 +152,19 @@ static int cq93vc_remove(struct snd_soc_codec *codec)
         return 0;
 }
 
+static struct regmap *cq93vc_get_regmap(struct device *dev)
+{
+        struct davinci_vc *davinci_vc = dev->platform_data;
+
+        return davinci_vc->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_cq93vc = {
         .set_bias_level = cq93vc_set_bias_level,
         .probe = cq93vc_probe,
         .remove = cq93vc_remove,
         .resume = cq93vc_resume,
+        .get_regmap = cq93vc_get_regmap,
         .controls = cq93vc_snd_controls,
         .num_controls = ARRAY_SIZE(cq93vc_snd_controls),
 };
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 3920e6264948..9947a9583679 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -438,7 +438,7 @@ static int cs4270_dai_mute(struct snd_soc_dai *dai, int mute)
 static int cs4270_soc_put_mute(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
         int left = !ucontrol->value.integer.value[0];
         int right = !ucontrol->value.integer.value[1];
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index aef4965750c7..93cec52f4733 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -284,7 +284,7 @@ static int cs4271_set_deemph(struct snd_soc_codec *codec)
 static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = cs4271->deemph;
@@ -294,7 +294,7 @@ static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,
 static int cs4271_put_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
 
         cs4271->deemph = ucontrol->value.enumerated.item[0];
diff --git a/sound/soc/codecs/cs42l51-i2c.c b/sound/soc/codecs/cs42l51-i2c.c
new file mode 100644
index 000000000000..cee51ae177c1
--- /dev/null
+++ b/sound/soc/codecs/cs42l51-i2c.c
@@ -0,0 +1,59 @@
+/*
+ * cs42l56.c -- CS42L51 ALSA SoC I2C audio driver
+ *
+ * Copyright 2014 CirrusLogic, Inc.
+ *
+ * Author: Brian Austin <brian.austin@cirrus.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/i2c.h>
+#include <linux/module.h>
+#include <sound/soc.h>
+
+#include "cs42l51.h"
+
+static struct i2c_device_id cs42l51_i2c_id[] = {
+        {"cs42l51", 0},
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, cs42l51_i2c_id);
+
+static int cs42l51_i2c_probe(struct i2c_client *i2c,
+                             const struct i2c_device_id *id)
+{
+        struct regmap_config config;
+
+        config = cs42l51_regmap;
+        config.val_bits = 8;
+        config.reg_bits = 8;
+
+        return cs42l51_probe(&i2c->dev, devm_regmap_init_i2c(i2c, &config));
+}
+
+static int cs42l51_i2c_remove(struct i2c_client *i2c)
+{
+        snd_soc_unregister_codec(&i2c->dev);
+
+        return 0;
+}
+
+static struct i2c_driver cs42l51_i2c_driver = {
+        .driver = {
+                .name = "cs42l51",
+                .owner = THIS_MODULE,
+        },
+        .probe = cs42l51_i2c_probe,
+        .remove = cs42l51_i2c_remove,
+        .id_table = cs42l51_i2c_id,
+};
+
+module_i2c_driver(cs42l51_i2c_driver);
+
+MODULE_DESCRIPTION("ASoC CS42L51 I2C Driver");
+MODULE_AUTHOR("Brian Austin, Cirrus Logic Inc, <brian.austin@cirrus.com>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 6c0da2baa154..09488d97de60 100644
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -29,7 +29,6 @@
 #include <sound/initval.h>
 #include <sound/pcm_params.h>
 #include <sound/pcm.h>
-#include <linux/i2c.h>
 #include <linux/regmap.h>
 
 #include "cs42l51.h"
@@ -55,7 +54,7 @@ struct cs42l51_private {
 static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned long value = snd_soc_read(codec, CS42L51_PCM_MIXER)&3;
 
         switch (value) {
@@ -83,7 +82,7 @@ static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol,
 static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned char val;
 
         switch (ucontrol->value.integer.value[0]) {
@@ -483,7 +482,7 @@ static struct snd_soc_dai_driver cs42l51_dai = {
         .ops = &cs42l51_dai_ops,
 };
 
-static int cs42l51_probe(struct snd_soc_codec *codec)
+static int cs42l51_codec_probe(struct snd_soc_codec *codec)
 {
         int ret, reg;
 
@@ -504,7 +503,7 @@ static int cs42l51_probe(struct snd_soc_codec *codec)
 }
 
 static struct snd_soc_codec_driver soc_codec_device_cs42l51 = {
-        .probe = cs42l51_probe,
+        .probe = cs42l51_codec_probe,
 
         .controls = cs42l51_snd_controls,
         .num_controls = ARRAY_SIZE(cs42l51_snd_controls),
@@ -514,91 +513,56 @@ static struct snd_soc_codec_driver soc_codec_device_cs42l51 = {
         .num_dapm_routes = ARRAY_SIZE(cs42l51_routes),
 };
 
-static const struct regmap_config cs42l51_regmap = {
-        .reg_bits = 8,
-        .val_bits = 8,
-
+const struct regmap_config cs42l51_regmap = {
         .max_register = CS42L51_CHARGE_FREQ,
         .cache_type = REGCACHE_RBTREE,
 };
+EXPORT_SYMBOL_GPL(cs42l51_regmap);
 
-static int cs42l51_i2c_probe(struct i2c_client *i2c_client,
-        const struct i2c_device_id *id)
+int cs42l51_probe(struct device *dev, struct regmap *regmap)
 {
         struct cs42l51_private *cs42l51;
-        struct regmap *regmap;
         unsigned int val;
         int ret;
 
-        regmap = devm_regmap_init_i2c(i2c_client, &cs42l51_regmap);
-        if (IS_ERR(regmap)) {
-                ret = PTR_ERR(regmap);
-                dev_err(&i2c_client->dev, "Failed to create regmap: %d\n",
-                        ret);
-                return ret;
-        }
+        if (IS_ERR(regmap))
+                return PTR_ERR(regmap);
+
+        cs42l51 = devm_kzalloc(dev, sizeof(struct cs42l51_private),
+                               GFP_KERNEL);
+        if (!cs42l51)
+                return -ENOMEM;
+
+        dev_set_drvdata(dev, cs42l51);
 
         /* Verify that we have a CS42L51 */
         ret = regmap_read(regmap, CS42L51_CHIP_REV_ID, &val);
         if (ret < 0) {
-                dev_err(&i2c_client->dev, "failed to read I2C\n");
+                dev_err(dev, "failed to read I2C\n");
                 goto error;
         }
 
         if ((val != CS42L51_MK_CHIP_REV(CS42L51_CHIP_ID, CS42L51_CHIP_REV_A)) &&
             (val != CS42L51_MK_CHIP_REV(CS42L51_CHIP_ID, CS42L51_CHIP_REV_B))) {
-                dev_err(&i2c_client->dev, "Invalid chip id: %x\n", val);
+                dev_err(dev, "Invalid chip id: %x\n", val);
                 ret = -ENODEV;
                 goto error;
         }
+        dev_info(dev, "Cirrus Logic CS42L51, Revision: %02X\n",
+                 val & CS42L51_CHIP_REV_MASK);
 
-        dev_info(&i2c_client->dev, "found device cs42l51 rev %d\n",
-                 val & 7);
-
-        cs42l51 = devm_kzalloc(&i2c_client->dev, sizeof(struct cs42l51_private),
-                               GFP_KERNEL);
-        if (!cs42l51)
-                return -ENOMEM;
-
-        i2c_set_clientdata(i2c_client, cs42l51);
-
-        ret =  snd_soc_register_codec(&i2c_client->dev,
+        ret =  snd_soc_register_codec(dev,
                         &soc_codec_device_cs42l51, &cs42l51_dai, 1);
 error:
         return ret;
 }
-
-static int cs42l51_i2c_remove(struct i2c_client *client)
-{
-        snd_soc_unregister_codec(&client->dev);
-        return 0;
-}
-
-static const struct i2c_device_id cs42l51_id[] = {
-        {"cs42l51", 0},
-        {}
-};
-MODULE_DEVICE_TABLE(i2c, cs42l51_id);
+EXPORT_SYMBOL_GPL(cs42l51_probe);
 
 static const struct of_device_id cs42l51_of_match[] = {
         { .compatible = "cirrus,cs42l51", },
         { }
 };
 MODULE_DEVICE_TABLE(of, cs42l51_of_match);
-
-static struct i2c_driver cs42l51_i2c_driver = {
-        .driver = {
-                .name = "cs42l51-codec",
-                .owner = THIS_MODULE,
-                .of_match_table = cs42l51_of_match,
-        },
-        .id_table = cs42l51_id,
-        .probe = cs42l51_i2c_probe,
-        .remove = cs42l51_i2c_remove,
-};
-
-module_i2c_driver(cs42l51_i2c_driver);
-
 MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
 MODULE_DESCRIPTION("Cirrus Logic CS42L51 ALSA SoC Codec Driver");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/cs42l51.h b/sound/soc/codecs/cs42l51.h
index 2beeb171db4b..8c55bf384bc6 100644
--- a/sound/soc/codecs/cs42l51.h
+++ b/sound/soc/codecs/cs42l51.h
@@ -18,9 +18,15 @@
 #ifndef _CS42L51_H
 #define _CS42L51_H
 
+struct device;
+
+extern const struct regmap_config cs42l51_regmap;
+int cs42l51_probe(struct device *dev, struct regmap *regmap);
+
 #define CS42L51_CHIP_ID                 0x1B
 #define CS42L51_CHIP_REV_A              0x00
 #define CS42L51_CHIP_REV_B              0x01
+#define CS42L51_CHIP_REV_MASK           0x07
 
 #define CS42L51_CHIP_REV_ID             0x01
 #define CS42L51_MK_CHIP_REV(a, b)       ((a)<<3|(b))
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c
index 2213a037c893..071fc77f2f06 100644
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -50,11 +50,9 @@ struct  cs42l52_private {
         u8 mclksel;
         u32 mclk;
         u8 flags;
-#if IS_ENABLED(CONFIG_INPUT)
         struct input_dev *beep;
         struct work_struct beep_work;
         int beep_rate;
-#endif
 };
 
 static const struct reg_default cs42l52_reg_defaults[] = {
@@ -962,7 +960,6 @@ static int cs42l52_resume(struct snd_soc_codec *codec)
         return 0;
 }
 
-#if IS_ENABLED(CONFIG_INPUT)
 static int beep_rates[] = {
         261, 522, 585, 667, 706, 774, 889, 1000,
         1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182
@@ -1096,15 +1093,6 @@ static void cs42l52_free_beep(struct snd_soc_codec *codec)
         snd_soc_update_bits(codec, CS42L52_BEEP_TONE_CTL,
                             CS42L52_BEEP_EN_MASK, 0);
 }
-#else
-static void cs42l52_init_beep(struct snd_soc_codec *codec)
-{
-}
-
-static void cs42l52_free_beep(struct snd_soc_codec *codec)
-{
-}
-#endif
 
 static int cs42l52_probe(struct snd_soc_codec *codec)
 {
diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c
new file mode 100644
index 000000000000..5bb134b4ab9b
--- /dev/null
+++ b/sound/soc/codecs/cs42l56.c
@@ -0,0 +1,1427 @@
+/*
+ * cs42l56.c -- CS42L56 ALSA SoC audio driver
+ *
+ * Copyright 2014 CirrusLogic, Inc.
+ *
+ * Author: Brian Austin <brian.austin@cirrus.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/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+#include <sound/cs42l56.h>
+#include "cs42l56.h"
+
+#define CS42L56_NUM_SUPPLIES 3
+static const char *const cs42l56_supply_names[CS42L56_NUM_SUPPLIES] = {
+        "VA",
+        "VCP",
+        "VLDO",
+};
+
+struct  cs42l56_private {
+        struct regmap *regmap;
+        struct snd_soc_codec *codec;
+        struct device *dev;
+        struct cs42l56_platform_data pdata;
+        struct regulator_bulk_data supplies[CS42L56_NUM_SUPPLIES];
+        u32 mclk;
+        u8 mclk_prediv;
+        u8 mclk_div2;
+        u8 mclk_ratio;
+        u8 iface;
+        u8 iface_fmt;
+        u8 iface_inv;
+#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+        struct input_dev *beep;
+        struct work_struct beep_work;
+        int beep_rate;
+#endif
+};
+
+static const struct reg_default cs42l56_reg_defaults[] = {
+        { 1, 0x56 },    /* r01  - ID 1 */
+        { 2, 0x04 },    /* r02  - ID 2 */
+        { 3, 0x7f },    /* r03  - Power Ctl 1 */
+        { 4, 0xff },    /* r04  - Power Ctl 2 */
+        { 5, 0x00 },    /* ro5  - Clocking Ctl 1 */
+        { 6, 0x0b },    /* r06  - Clocking Ctl 2 */
+        { 7, 0x00 },    /* r07  - Serial Format */
+        { 8, 0x05 },    /* r08  - Class H Ctl */
+        { 9, 0x0c },    /* r09  - Misc Ctl */
+        { 10, 0x80 },   /* r0a  - INT Status */
+        { 11, 0x00 },   /* r0b  - Playback Ctl */
+        { 12, 0x0c },   /* r0c  - DSP Mute Ctl */
+        { 13, 0x00 },   /* r0d  - ADCA Mixer Volume */
+        { 14, 0x00 },   /* r0e  - ADCB Mixer Volume */
+        { 15, 0x00 },   /* r0f  - PCMA Mixer Volume */
+        { 16, 0x00 },   /* r10  - PCMB Mixer Volume */
+        { 17, 0x00 },   /* r11  - Analog Input Advisory Volume */
+        { 18, 0x00 },   /* r12  - Digital Input Advisory Volume */
+        { 19, 0x00 },   /* r13  - Master A Volume */
+        { 20, 0x00 },   /* r14  - Master B Volume */
+        { 21, 0x00 },   /* r15  - Beep Freq / On Time */
+        { 22, 0x00 },   /* r16  - Beep Volume / Off Time */
+        { 23, 0x00 },   /* r17  - Beep Tone Ctl */
+        { 24, 0x88 },   /* r18  - Tone Ctl */
+        { 25, 0x00 },   /* r19  - Channel Mixer & Swap */
+        { 26, 0x00 },   /* r1a  - AIN Ref Config / ADC Mux */
+        { 27, 0xa0 },   /* r1b  - High-Pass Filter Ctl */
+        { 28, 0x00 },   /* r1c  - Misc ADC Ctl */
+        { 29, 0x00 },   /* r1d  - Gain & Bias Ctl */
+        { 30, 0x00 },   /* r1e  - PGAA Mux & Volume */
+        { 31, 0x00 },   /* r1f  - PGAB Mux & Volume */
+        { 32, 0x00 },   /* r20  - ADCA Attenuator */
+        { 33, 0x00 },   /* r21  - ADCB Attenuator */
+        { 34, 0x00 },   /* r22  - ALC Enable & Attack Rate */
+        { 35, 0xbf },   /* r23  - ALC Release Rate */
+        { 36, 0x00 },   /* r24  - ALC Threshold */
+        { 37, 0x00 },   /* r25  - Noise Gate Ctl */
+        { 38, 0x00 },   /* r26  - ALC, Limiter, SFT, ZeroCross */
+        { 39, 0x00 },   /* r27  - Analog Mute, LO & HP Mux */
+        { 40, 0x00 },   /* r28  - HP A Volume */
+        { 41, 0x00 },   /* r29  - HP B Volume */
+        { 42, 0x00 },   /* r2a  - LINEOUT A Volume */
+        { 43, 0x00 },   /* r2b  - LINEOUT B Volume */
+        { 44, 0x00 },   /* r2c  - Limit Threshold Ctl */
+        { 45, 0x7f },   /* r2d  - Limiter Ctl & Release Rate */
+        { 46, 0x00 },   /* r2e  - Limiter Attack Rate */
+};
+
+static bool cs42l56_readable_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case CS42L56_CHIP_ID_1:
+        case CS42L56_CHIP_ID_2:
+        case CS42L56_PWRCTL_1:
+        case CS42L56_PWRCTL_2:
+        case CS42L56_CLKCTL_1:
+        case CS42L56_CLKCTL_2:
+        case CS42L56_SERIAL_FMT:
+        case CS42L56_CLASSH_CTL:
+        case CS42L56_MISC_CTL:
+        case CS42L56_INT_STATUS:
+        case CS42L56_PLAYBACK_CTL:
+        case CS42L56_DSP_MUTE_CTL:
+        case CS42L56_ADCA_MIX_VOLUME:
+        case CS42L56_ADCB_MIX_VOLUME:
+        case CS42L56_PCMA_MIX_VOLUME:
+        case CS42L56_PCMB_MIX_VOLUME:
+        case CS42L56_ANAINPUT_ADV_VOLUME:
+        case CS42L56_DIGINPUT_ADV_VOLUME:
+        case CS42L56_MASTER_A_VOLUME:
+        case CS42L56_MASTER_B_VOLUME:
+        case CS42L56_BEEP_FREQ_ONTIME:
+        case CS42L56_BEEP_FREQ_OFFTIME:
+        case CS42L56_BEEP_TONE_CFG:
+        case CS42L56_TONE_CTL:
+        case CS42L56_CHAN_MIX_SWAP:
+        case CS42L56_AIN_REFCFG_ADC_MUX:
+        case CS42L56_HPF_CTL:
+        case CS42L56_MISC_ADC_CTL:
+        case CS42L56_GAIN_BIAS_CTL:
+        case CS42L56_PGAA_MUX_VOLUME:
+        case CS42L56_PGAB_MUX_VOLUME:
+        case CS42L56_ADCA_ATTENUATOR:
+        case CS42L56_ADCB_ATTENUATOR:
+        case CS42L56_ALC_EN_ATTACK_RATE:
+        case CS42L56_ALC_RELEASE_RATE:
+        case CS42L56_ALC_THRESHOLD:
+        case CS42L56_NOISE_GATE_CTL:
+        case CS42L56_ALC_LIM_SFT_ZC:
+        case CS42L56_AMUTE_HPLO_MUX:
+        case CS42L56_HPA_VOLUME:
+        case CS42L56_HPB_VOLUME:
+        case CS42L56_LOA_VOLUME:
+        case CS42L56_LOB_VOLUME:
+        case CS42L56_LIM_THRESHOLD_CTL:
+        case CS42L56_LIM_CTL_RELEASE_RATE:
+        case CS42L56_LIM_ATTACK_RATE:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static bool cs42l56_volatile_register(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case CS42L56_INT_STATUS:
+                return 1;
+        default:
+                return 0;
+        }
+}
+
+static DECLARE_TLV_DB_SCALE(beep_tlv, -5000, 200, 0);
+static DECLARE_TLV_DB_SCALE(hl_tlv, -6000, 50, 0);
+static DECLARE_TLV_DB_SCALE(adv_tlv, -10200, 50, 0);
+static DECLARE_TLV_DB_SCALE(adc_tlv, -9600, 100, 0);
+static DECLARE_TLV_DB_SCALE(tone_tlv, -1050, 150, 0);
+static DECLARE_TLV_DB_SCALE(preamp_tlv, 0, 1000, 0);
+static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0);
+
+static const unsigned int ngnb_tlv[] = {
+        TLV_DB_RANGE_HEAD(2),
+        0, 1, TLV_DB_SCALE_ITEM(-8200, 600, 0),
+        2, 5, TLV_DB_SCALE_ITEM(-7600, 300, 0),
+};
+static const unsigned int ngb_tlv[] = {
+        TLV_DB_RANGE_HEAD(2),
+        0, 2, TLV_DB_SCALE_ITEM(-6400, 600, 0),
+        3, 7, TLV_DB_SCALE_ITEM(-4600, 300, 0),
+};
+static const unsigned int alc_tlv[] = {
+        TLV_DB_RANGE_HEAD(2),
+        0, 2, TLV_DB_SCALE_ITEM(-3000, 600, 0),
+        3, 7, TLV_DB_SCALE_ITEM(-1200, 300, 0),
+};
+
+static const char * const beep_config_text[] = {
+        "Off", "Single", "Multiple", "Continuous"
+};
+
+static const struct soc_enum beep_config_enum =
+        SOC_ENUM_SINGLE(CS42L56_BEEP_TONE_CFG, 6,
+                        ARRAY_SIZE(beep_config_text), beep_config_text);
+
+static const char * const beep_pitch_text[] = {
+        "C4", "C5", "D5", "E5", "F5", "G5", "A5", "B5",
+        "C6", "D6", "E6", "F6", "G6", "A6", "B6", "C7"
+};
+
+static const struct soc_enum beep_pitch_enum =
+        SOC_ENUM_SINGLE(CS42L56_BEEP_FREQ_ONTIME, 4,
+                        ARRAY_SIZE(beep_pitch_text), beep_pitch_text);
+
+static const char * const beep_ontime_text[] = {
+        "86 ms", "430 ms", "780 ms", "1.20 s", "1.50 s",
+        "1.80 s", "2.20 s", "2.50 s", "2.80 s", "3.20 s",
+        "3.50 s", "3.80 s", "4.20 s", "4.50 s", "4.80 s", "5.20 s"
+};
+
+static const struct soc_enum beep_ontime_enum =
+        SOC_ENUM_SINGLE(CS42L56_BEEP_FREQ_ONTIME, 0,
+                        ARRAY_SIZE(beep_ontime_text), beep_ontime_text);
+
+static const char * const beep_offtime_text[] = {
+        "1.23 s", "2.58 s", "3.90 s", "5.20 s",
+        "6.60 s", "8.05 s", "9.35 s", "10.80 s"
+};
+
+static const struct soc_enum beep_offtime_enum =
+        SOC_ENUM_SINGLE(CS42L56_BEEP_FREQ_OFFTIME, 5,
+                        ARRAY_SIZE(beep_offtime_text), beep_offtime_text);
+
+static const char * const beep_treble_text[] = {
+        "5kHz", "7kHz", "10kHz", "15kHz"
+};
+
+static const struct soc_enum beep_treble_enum =
+        SOC_ENUM_SINGLE(CS42L56_BEEP_TONE_CFG, 3,
+                        ARRAY_SIZE(beep_treble_text), beep_treble_text);
+
+static const char * const beep_bass_text[] = {
+        "50Hz", "100Hz", "200Hz", "250Hz"
+};
+
+static const struct soc_enum beep_bass_enum =
+        SOC_ENUM_SINGLE(CS42L56_BEEP_TONE_CFG, 1,
+                        ARRAY_SIZE(beep_bass_text), beep_bass_text);
+
+static const char * const adc_swap_text[] = {
+        "None", "A+B/2", "A-B/2", "Swap"
+};
+
+static const struct soc_enum adc_swap_enum =
+        SOC_ENUM_SINGLE(CS42L56_MISC_ADC_CTL, 3,
+                        ARRAY_SIZE(adc_swap_text), adc_swap_text);
+
+static const char * const pgaa_mux_text[] = {
+        "AIN1A", "AIN2A", "AIN3A"};
+
+static const struct soc_enum pgaa_mux_enum =
+        SOC_ENUM_SINGLE(CS42L56_PGAA_MUX_VOLUME, 0,
+                              ARRAY_SIZE(pgaa_mux_text),
+                              pgaa_mux_text);
+
+static const struct snd_kcontrol_new pgaa_mux =
+        SOC_DAPM_ENUM("Route", pgaa_mux_enum);
+
+static const char * const pgab_mux_text[] = {
+        "AIN1B", "AIN2B", "AIN3B"};
+
+static const struct soc_enum pgab_mux_enum =
+        SOC_ENUM_SINGLE(CS42L56_PGAB_MUX_VOLUME, 0,
+                              ARRAY_SIZE(pgab_mux_text),
+                              pgab_mux_text);
+
+static const struct snd_kcontrol_new pgab_mux =
+        SOC_DAPM_ENUM("Route", pgab_mux_enum);
+
+static const char * const adca_mux_text[] = {
+        "PGAA", "AIN1A", "AIN2A", "AIN3A"};
+
+static const struct soc_enum adca_mux_enum =
+        SOC_ENUM_SINGLE(CS42L56_AIN_REFCFG_ADC_MUX, 0,
+                              ARRAY_SIZE(adca_mux_text),
+                              adca_mux_text);
+
+static const struct snd_kcontrol_new adca_mux =
+        SOC_DAPM_ENUM("Route", adca_mux_enum);
+
+static const char * const adcb_mux_text[] = {
+        "PGAB", "AIN1B", "AIN2B", "AIN3B"};
+
+static const struct soc_enum adcb_mux_enum =
+        SOC_ENUM_SINGLE(CS42L56_AIN_REFCFG_ADC_MUX, 2,
+                              ARRAY_SIZE(adcb_mux_text),
+                              adcb_mux_text);
+
+static const struct snd_kcontrol_new adcb_mux =
+        SOC_DAPM_ENUM("Route", adcb_mux_enum);
+
+static const char * const left_swap_text[] = {
+        "Left", "LR 2", "Right"};
+
+static const char * const right_swap_text[] = {
+        "Right", "LR 2", "Left"};
+
+static const unsigned int swap_values[] = { 0, 1, 3 };
+
+static const struct soc_enum adca_swap_enum =
+        SOC_VALUE_ENUM_SINGLE(CS42L56_CHAN_MIX_SWAP, 0, 3,
+                              ARRAY_SIZE(left_swap_text),
+                              left_swap_text,
+                              swap_values);
+
+static const struct soc_enum pcma_swap_enum =
+        SOC_VALUE_ENUM_SINGLE(CS42L56_CHAN_MIX_SWAP, 4, 3,
+                              ARRAY_SIZE(left_swap_text),
+                              left_swap_text,
+                              swap_values);
+
+static const struct soc_enum adcb_swap_enum =
+        SOC_VALUE_ENUM_SINGLE(CS42L56_CHAN_MIX_SWAP, 2, 3,
+                              ARRAY_SIZE(right_swap_text),
+                              right_swap_text,
+                              swap_values);
+
+static const struct soc_enum pcmb_swap_enum =
+        SOC_VALUE_ENUM_SINGLE(CS42L56_CHAN_MIX_SWAP, 6, 3,
+                              ARRAY_SIZE(right_swap_text),
+                              right_swap_text,
+                              swap_values);
+
+static const struct snd_kcontrol_new hpa_switch =
+        SOC_DAPM_SINGLE("Switch", CS42L56_PWRCTL_2, 6, 1, 1);
+
+static const struct snd_kcontrol_new hpb_switch =
+        SOC_DAPM_SINGLE("Switch", CS42L56_PWRCTL_2, 4, 1, 1);
+
+static const struct snd_kcontrol_new loa_switch =
+        SOC_DAPM_SINGLE("Switch", CS42L56_PWRCTL_2, 2, 1, 1);
+
+static const struct snd_kcontrol_new lob_switch =
+        SOC_DAPM_SINGLE("Switch", CS42L56_PWRCTL_2, 0, 1, 1);
+
+static const char * const hploa_input_text[] = {
+        "DACA", "PGAA"};
+
+static const struct soc_enum lineouta_input_enum =
+        SOC_ENUM_SINGLE(CS42L56_AMUTE_HPLO_MUX, 2,
+                              ARRAY_SIZE(hploa_input_text),
+                              hploa_input_text);
+
+static const struct snd_kcontrol_new lineouta_input =
+        SOC_DAPM_ENUM("Route", lineouta_input_enum);
+
+static const struct soc_enum hpa_input_enum =
+        SOC_ENUM_SINGLE(CS42L56_AMUTE_HPLO_MUX, 0,
+                              ARRAY_SIZE(hploa_input_text),
+                              hploa_input_text);
+
+static const struct snd_kcontrol_new hpa_input =
+        SOC_DAPM_ENUM("Route", hpa_input_enum);
+
+static const char * const hplob_input_text[] = {
+        "DACB", "PGAB"};
+
+static const struct soc_enum lineoutb_input_enum =
+        SOC_ENUM_SINGLE(CS42L56_AMUTE_HPLO_MUX, 3,
+                              ARRAY_SIZE(hplob_input_text),
+                              hplob_input_text);
+
+static const struct snd_kcontrol_new lineoutb_input =
+        SOC_DAPM_ENUM("Route", lineoutb_input_enum);
+
+static const struct soc_enum hpb_input_enum =
+        SOC_ENUM_SINGLE(CS42L56_AMUTE_HPLO_MUX, 1,
+                              ARRAY_SIZE(hplob_input_text),
+                              hplob_input_text);
+
+static const struct snd_kcontrol_new hpb_input =
+        SOC_DAPM_ENUM("Route", hpb_input_enum);
+
+static const char * const dig_mux_text[] = {
+        "ADC", "DSP"};
+
+static const struct soc_enum dig_mux_enum =
+        SOC_ENUM_SINGLE(CS42L56_MISC_CTL, 7,
+                              ARRAY_SIZE(dig_mux_text),
+                              dig_mux_text);
+
+static const struct snd_kcontrol_new dig_mux =
+        SOC_DAPM_ENUM("Route", dig_mux_enum);
+
+static const char * const hpf_freq_text[] = {
+        "1.8Hz", "119Hz", "236Hz", "464Hz"
+};
+
+static const struct soc_enum hpfa_freq_enum =
+        SOC_ENUM_SINGLE(CS42L56_HPF_CTL, 0,
+                        ARRAY_SIZE(hpf_freq_text), hpf_freq_text);
+
+static const struct soc_enum hpfb_freq_enum =
+        SOC_ENUM_SINGLE(CS42L56_HPF_CTL, 2,
+                        ARRAY_SIZE(hpf_freq_text), hpf_freq_text);
+
+static const char * const ng_delay_text[] = {
+        "50ms", "100ms", "150ms", "200ms"
+};
+
+static const struct soc_enum ng_delay_enum =
+        SOC_ENUM_SINGLE(CS42L56_NOISE_GATE_CTL, 0,
+                        ARRAY_SIZE(ng_delay_text), ng_delay_text);
+
+static const struct snd_kcontrol_new cs42l56_snd_controls[] = {
+
+        SOC_DOUBLE_R_SX_TLV("Master Volume", CS42L56_MASTER_A_VOLUME,
+                              CS42L56_MASTER_B_VOLUME, 0, 0x34, 0xfd, adv_tlv),
+        SOC_DOUBLE("Master Mute Switch", CS42L56_DSP_MUTE_CTL, 0, 1, 1, 1),
+
+        SOC_DOUBLE_R_SX_TLV("ADC Mixer Volume", CS42L56_ADCA_MIX_VOLUME,
+                              CS42L56_ADCB_MIX_VOLUME, 0, 0x88, 0xa9, hl_tlv),
+        SOC_DOUBLE("ADC Mixer Mute Switch", CS42L56_DSP_MUTE_CTL, 6, 7, 1, 1),
+
+        SOC_DOUBLE_R_SX_TLV("PCM Mixer Volume", CS42L56_PCMA_MIX_VOLUME,
+                              CS42L56_PCMB_MIX_VOLUME, 0, 0x88, 0xa9, hl_tlv),
+        SOC_DOUBLE("PCM Mixer Mute Switch", CS42L56_DSP_MUTE_CTL, 4, 5, 1, 1),
+
+        SOC_SINGLE_TLV("Analog Advisory Volume",
+                          CS42L56_ANAINPUT_ADV_VOLUME, 0, 0x00, 1, adv_tlv),
+        SOC_SINGLE_TLV("Digital Advisory Volume",
+                          CS42L56_DIGINPUT_ADV_VOLUME, 0, 0x00, 1, adv_tlv),
+
+        SOC_DOUBLE_R_SX_TLV("PGA Volume", CS42L56_PGAA_MUX_VOLUME,
+                              CS42L56_PGAB_MUX_VOLUME, 0, 0x34, 0xfd, pga_tlv),
+        SOC_DOUBLE_R_TLV("ADC Volume", CS42L56_ADCA_ATTENUATOR,
+                              CS42L56_ADCB_ATTENUATOR, 0, 0x00, 1, adc_tlv),
+        SOC_DOUBLE("ADC Mute Switch", CS42L56_MISC_ADC_CTL, 2, 3, 1, 1),
+        SOC_DOUBLE("ADC Boost Switch", CS42L56_GAIN_BIAS_CTL, 3, 2, 1, 1),
+
+        SOC_DOUBLE_R_SX_TLV("Headphone Volume", CS42L56_HPA_VOLUME,
+                              CS42L56_HPA_VOLUME, 0, 0x44, 0x55, hl_tlv),
+        SOC_DOUBLE_R_SX_TLV("LineOut Volume", CS42L56_LOA_VOLUME,
+                              CS42L56_LOA_VOLUME, 0, 0x44, 0x55, hl_tlv),
+
+        SOC_SINGLE_TLV("Bass Shelving Volume", CS42L56_TONE_CTL,
+                        0, 0x00, 1, tone_tlv),
+        SOC_SINGLE_TLV("Treble Shelving Volume", CS42L56_TONE_CTL,
+                        4, 0x00, 1, tone_tlv),
+
+        SOC_DOUBLE_TLV("PGA Preamp Volume", CS42L56_GAIN_BIAS_CTL,
+                        4, 6, 0x02, 1, preamp_tlv),
+
+        SOC_SINGLE("DSP Switch", CS42L56_PLAYBACK_CTL, 7, 1, 1),
+        SOC_SINGLE("Gang Playback Switch", CS42L56_PLAYBACK_CTL, 4, 1, 1),
+        SOC_SINGLE("Gang ADC Switch", CS42L56_MISC_ADC_CTL, 7, 1, 1),
+        SOC_SINGLE("Gang PGA Switch", CS42L56_MISC_ADC_CTL, 6, 1, 1),
+
+        SOC_SINGLE("PCMA Invert", CS42L56_PLAYBACK_CTL, 2, 1, 1),
+        SOC_SINGLE("PCMB Invert", CS42L56_PLAYBACK_CTL, 3, 1, 1),
+        SOC_SINGLE("ADCA Invert", CS42L56_MISC_ADC_CTL, 2, 1, 1),
+        SOC_SINGLE("ADCB Invert", CS42L56_MISC_ADC_CTL, 3, 1, 1),
+
+        SOC_ENUM("PCMA Swap", pcma_swap_enum),
+        SOC_ENUM("PCMB Swap", pcmb_swap_enum),
+        SOC_ENUM("ADCA Swap", adca_swap_enum),
+        SOC_ENUM("ADCB Swap", adcb_swap_enum),
+
+        SOC_DOUBLE("HPF Switch", CS42L56_HPF_CTL, 5, 7, 1, 1),
+        SOC_DOUBLE("HPF Freeze Switch", CS42L56_HPF_CTL, 4, 6, 1, 1),
+        SOC_ENUM("HPFA Corner Freq", hpfa_freq_enum),
+        SOC_ENUM("HPFB Corner Freq", hpfb_freq_enum),
+
+        SOC_SINGLE("Analog Soft Ramp", CS42L56_MISC_CTL, 4, 1, 1),
+        SOC_DOUBLE("Analog Soft Ramp Disable", CS42L56_ALC_LIM_SFT_ZC,
+                7, 5, 1, 1),
+        SOC_SINGLE("Analog Zero Cross", CS42L56_MISC_CTL, 3, 1, 1),
+        SOC_DOUBLE("Analog Zero Cross Disable", CS42L56_ALC_LIM_SFT_ZC,
+                6, 4, 1, 1),
+        SOC_SINGLE("Digital Soft Ramp", CS42L56_MISC_CTL, 2, 1, 1),
+        SOC_SINGLE("Digital Soft Ramp Disable", CS42L56_ALC_LIM_SFT_ZC,
+                3, 1, 1),
+
+        SOC_SINGLE("HL Deemphasis", CS42L56_PLAYBACK_CTL, 6, 1, 1),
+
+        SOC_SINGLE("ALC Switch", CS42L56_ALC_EN_ATTACK_RATE, 6, 1, 1),
+        SOC_SINGLE("ALC Limit All Switch", CS42L56_ALC_RELEASE_RATE, 7, 1, 1),
+        SOC_SINGLE_RANGE("ALC Attack", CS42L56_ALC_EN_ATTACK_RATE,
+                        0, 0, 0x3f, 0),
+        SOC_SINGLE_RANGE("ALC Release", CS42L56_ALC_RELEASE_RATE,
+                        0, 0x3f, 0, 0),
+        SOC_SINGLE_TLV("ALC MAX", CS42L56_ALC_THRESHOLD,
+                        5, 0x07, 1, alc_tlv),
+        SOC_SINGLE_TLV("ALC MIN", CS42L56_ALC_THRESHOLD,
+                        2, 0x07, 1, alc_tlv),
+
+        SOC_SINGLE("Limiter Switch", CS42L56_LIM_CTL_RELEASE_RATE, 7, 1, 1),
+        SOC_SINGLE("Limit All Switch", CS42L56_LIM_CTL_RELEASE_RATE, 6, 1, 1),
+        SOC_SINGLE_RANGE("Limiter Attack", CS42L56_LIM_ATTACK_RATE,
+                        0, 0, 0x3f, 0),
+        SOC_SINGLE_RANGE("Limiter Release", CS42L56_LIM_CTL_RELEASE_RATE,
+                        0, 0x3f, 0, 0),
+        SOC_SINGLE_TLV("Limiter MAX", CS42L56_LIM_THRESHOLD_CTL,
+                        5, 0x07, 1, alc_tlv),
+        SOC_SINGLE_TLV("Limiter Cushion", CS42L56_ALC_THRESHOLD,
+                        2, 0x07, 1, alc_tlv),
+
+        SOC_SINGLE("NG Switch", CS42L56_NOISE_GATE_CTL, 6, 1, 1),
+        SOC_SINGLE("NG All Switch", CS42L56_NOISE_GATE_CTL, 7, 1, 1),
+        SOC_SINGLE("NG Boost Switch", CS42L56_NOISE_GATE_CTL, 5, 1, 1),
+        SOC_SINGLE_TLV("NG Unboost Threshold", CS42L56_NOISE_GATE_CTL,
+                        2, 0x07, 1, ngnb_tlv),
+        SOC_SINGLE_TLV("NG Boost Threshold", CS42L56_NOISE_GATE_CTL,
+                        2, 0x07, 1, ngb_tlv),
+        SOC_ENUM("NG Delay", ng_delay_enum),
+
+        SOC_ENUM("Beep Config", beep_config_enum),
+        SOC_ENUM("Beep Pitch", beep_pitch_enum),
+        SOC_ENUM("Beep on Time", beep_ontime_enum),
+        SOC_ENUM("Beep off Time", beep_offtime_enum),
+        SOC_SINGLE_SX_TLV("Beep Volume", CS42L56_BEEP_FREQ_OFFTIME,
+                        0, 0x07, 0x23, beep_tlv),
+        SOC_SINGLE("Beep Tone Ctl Switch", CS42L56_BEEP_TONE_CFG, 0, 1, 1),
+        SOC_ENUM("Beep Treble Corner Freq", beep_treble_enum),
+        SOC_ENUM("Beep Bass Corner Freq", beep_bass_enum),
+
+};
+
+static const struct snd_soc_dapm_widget cs42l56_dapm_widgets[] = {
+
+        SND_SOC_DAPM_SIGGEN("Beep"),
+        SND_SOC_DAPM_SUPPLY("VBUF", CS42L56_PWRCTL_1, 5, 1, NULL, 0),
+        SND_SOC_DAPM_MICBIAS("MIC1 Bias", CS42L56_PWRCTL_1, 4, 1),
+        SND_SOC_DAPM_SUPPLY("Charge Pump", CS42L56_PWRCTL_1, 3, 1, NULL, 0),
+
+        SND_SOC_DAPM_INPUT("AIN1A"),
+        SND_SOC_DAPM_INPUT("AIN2A"),
+        SND_SOC_DAPM_INPUT("AIN1B"),
+        SND_SOC_DAPM_INPUT("AIN2B"),
+        SND_SOC_DAPM_INPUT("AIN3A"),
+        SND_SOC_DAPM_INPUT("AIN3B"),
+
+        SND_SOC_DAPM_AIF_OUT("SDOUT", NULL,  0,
+                        SND_SOC_NOPM, 0, 0),
+
+        SND_SOC_DAPM_AIF_IN("SDIN", NULL,  0,
+                        SND_SOC_NOPM, 0, 0),
+
+        SND_SOC_DAPM_MUX("Digital Output Mux", SND_SOC_NOPM,
+                         0, 0, &dig_mux),
+
+        SND_SOC_DAPM_PGA("PGAA", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("PGAB", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MUX("PGAA Input Mux",
+                        SND_SOC_NOPM, 0, 0, &pgaa_mux),
+        SND_SOC_DAPM_MUX("PGAB Input Mux",
+                        SND_SOC_NOPM, 0, 0, &pgab_mux),
+
+        SND_SOC_DAPM_MUX("ADCA Mux", SND_SOC_NOPM,
+                         0, 0, &adca_mux),
+        SND_SOC_DAPM_MUX("ADCB Mux", SND_SOC_NOPM,
+                         0, 0, &adcb_mux),
+
+        SND_SOC_DAPM_ADC("ADCA", NULL, CS42L56_PWRCTL_1, 1, 1),
+        SND_SOC_DAPM_ADC("ADCB", NULL, CS42L56_PWRCTL_1, 2, 1),
+
+        SND_SOC_DAPM_DAC("DACA", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("DACB", NULL, SND_SOC_NOPM, 0, 0),
+
+        SND_SOC_DAPM_OUTPUT("HPA"),
+        SND_SOC_DAPM_OUTPUT("LOA"),
+        SND_SOC_DAPM_OUTPUT("HPB"),
+        SND_SOC_DAPM_OUTPUT("LOB"),
+
+        SND_SOC_DAPM_SWITCH("Headphone Right",
+                            CS42L56_PWRCTL_2, 4, 1, &hpb_switch),
+        SND_SOC_DAPM_SWITCH("Headphone Left",
+                            CS42L56_PWRCTL_2, 6, 1, &hpa_switch),
+
+        SND_SOC_DAPM_SWITCH("Lineout Right",
+                            CS42L56_PWRCTL_2, 0, 1, &lob_switch),
+        SND_SOC_DAPM_SWITCH("Lineout Left",
+                            CS42L56_PWRCTL_2, 2, 1, &loa_switch),
+
+        SND_SOC_DAPM_MUX("LINEOUTA Input Mux", SND_SOC_NOPM,
+                         0, 0, &lineouta_input),
+        SND_SOC_DAPM_MUX("LINEOUTB Input Mux", SND_SOC_NOPM,
+                         0, 0, &lineoutb_input),
+        SND_SOC_DAPM_MUX("HPA Input Mux", SND_SOC_NOPM,
+                         0, 0, &hpa_input),
+        SND_SOC_DAPM_MUX("HPB Input Mux", SND_SOC_NOPM,
+                         0, 0, &hpb_input),
+
+};
+
+static const struct snd_soc_dapm_route cs42l56_audio_map[] = {
+
+        {"HiFi Capture", "DSP", "Digital Output Mux"},
+        {"HiFi Capture", "ADC", "Digital Output Mux"},
+
+        {"Digital Output Mux", NULL, "ADCA"},
+        {"Digital Output Mux", NULL, "ADCB"},
+
+        {"ADCB", NULL, "ADCB Mux"},
+        {"ADCA", NULL, "ADCA Mux"},
+
+        {"ADCA Mux", NULL, "AIN3A"},
+        {"ADCA Mux", NULL, "AIN2A"},
+        {"ADCA Mux", NULL, "AIN1A"},
+        {"ADCA Mux", NULL, "PGAA"},
+        {"ADCB Mux", NULL, "AIN3B"},
+        {"ADCB Mux", NULL, "AIN2B"},
+        {"ADCB Mux", NULL, "AIN1B"},
+        {"ADCB Mux", NULL, "PGAB"},
+
+        {"PGAA", "AIN1A", "PGAA Input Mux"},
+        {"PGAA", "AIN2A", "PGAA Input Mux"},
+        {"PGAA", "AIN3A", "PGAA Input Mux"},
+        {"PGAB", "AIN1B", "PGAB Input Mux"},
+        {"PGAB", "AIN2B", "PGAB Input Mux"},
+        {"PGAB", "AIN3B", "PGAB Input Mux"},
+
+        {"PGAA Input Mux", NULL, "AIN1A"},
+        {"PGAA Input Mux", NULL, "AIN2A"},
+        {"PGAA Input Mux", NULL, "AIN3A"},
+        {"PGAB Input Mux", NULL, "AIN1B"},
+        {"PGAB Input Mux", NULL, "AIN2B"},
+        {"PGAB Input Mux", NULL, "AIN3B"},
+
+        {"LOB", NULL, "Lineout Right"},
+        {"LOA", NULL, "Lineout Left"},
+
+        {"Lineout Right", "Switch", "LINEOUTB Input Mux"},
+        {"Lineout Left", "Switch", "LINEOUTA Input Mux"},
+
+        {"LINEOUTA Input Mux", "PGAA", "PGAA"},
+        {"LINEOUTB Input Mux", "PGAB", "PGAB"},
+        {"LINEOUTA Input Mux", "DACA", "DACA"},
+        {"LINEOUTB Input Mux", "DACB", "DACB"},
+
+        {"HPA", NULL, "Headphone Left"},
+        {"HPB", NULL, "Headphone Right"},
+
+        {"Headphone Right", "Switch", "HPB Input Mux"},
+        {"Headphone Left", "Switch", "HPA Input Mux"},
+
+        {"HPA Input Mux", "PGAA", "PGAA"},
+        {"HPB Input Mux", "PGAB", "PGAB"},
+        {"HPA Input Mux", "DACA", "DACA"},
+        {"HPB Input Mux", "DACB", "DACB"},
+
+        {"DACB", NULL, "HiFi Playback"},
+        {"DACA", NULL, "HiFi Playback"},
+
+};
+
+struct cs42l56_clk_para {
+        u32 mclk;
+        u32 srate;
+        u8 ratio;
+};
+
+static const struct cs42l56_clk_para clk_ratio_table[] = {
+        /* 8k */
+        { 6000000, 8000, CS42L56_MCLK_LRCLK_768 },
+        { 6144000, 8000, CS42L56_MCLK_LRCLK_750 },
+        { 12000000, 8000, CS42L56_MCLK_LRCLK_768 },
+        { 12288000, 8000, CS42L56_MCLK_LRCLK_750 },
+        { 24000000, 8000, CS42L56_MCLK_LRCLK_768 },
+        { 24576000, 8000, CS42L56_MCLK_LRCLK_750 },
+        /* 11.025k */
+        { 5644800, 11025, CS42L56_MCLK_LRCLK_512},
+        { 11289600, 11025, CS42L56_MCLK_LRCLK_512},
+        { 22579200, 11025, CS42L56_MCLK_LRCLK_512 },
+        /* 11.0294k */
+        { 6000000, 110294, CS42L56_MCLK_LRCLK_544 },
+        { 12000000, 110294, CS42L56_MCLK_LRCLK_544 },
+        { 24000000, 110294, CS42L56_MCLK_LRCLK_544 },
+        /* 12k */
+        { 6000000, 12000, CS42L56_MCLK_LRCLK_500 },
+        { 6144000, 12000, CS42L56_MCLK_LRCLK_512 },
+        { 12000000, 12000, CS42L56_MCLK_LRCLK_500 },
+        { 12288000, 12000, CS42L56_MCLK_LRCLK_512 },
+        { 24000000, 12000, CS42L56_MCLK_LRCLK_500 },
+        { 24576000, 12000, CS42L56_MCLK_LRCLK_512 },
+        /* 16k */
+        { 6000000, 16000, CS42L56_MCLK_LRCLK_375 },
+        { 6144000, 16000, CS42L56_MCLK_LRCLK_384 },
+        { 12000000, 16000, CS42L56_MCLK_LRCLK_375 },
+        { 12288000, 16000, CS42L56_MCLK_LRCLK_384 },
+        { 24000000, 16000, CS42L56_MCLK_LRCLK_375 },
+        { 24576000, 16000, CS42L56_MCLK_LRCLK_384 },
+        /* 22.050k */
+        { 5644800, 22050, CS42L56_MCLK_LRCLK_256 },
+        { 11289600, 22050, CS42L56_MCLK_LRCLK_256 },
+        { 22579200, 22050, CS42L56_MCLK_LRCLK_256 },
+        /* 22.0588k */
+        { 6000000, 220588, CS42L56_MCLK_LRCLK_272 },
+        { 12000000, 220588, CS42L56_MCLK_LRCLK_272 },
+        { 24000000, 220588, CS42L56_MCLK_LRCLK_272 },
+        /* 24k */
+        { 6000000, 24000, CS42L56_MCLK_LRCLK_250 },
+        { 6144000, 24000, CS42L56_MCLK_LRCLK_256 },
+        { 12000000, 24000, CS42L56_MCLK_LRCLK_250 },
+        { 12288000, 24000, CS42L56_MCLK_LRCLK_256 },
+        { 24000000, 24000, CS42L56_MCLK_LRCLK_250 },
+        { 24576000, 24000, CS42L56_MCLK_LRCLK_256 },
+        /* 32k */
+        { 6000000, 32000, CS42L56_MCLK_LRCLK_187P5 },
+        { 6144000, 32000, CS42L56_MCLK_LRCLK_192 },
+        { 12000000, 32000, CS42L56_MCLK_LRCLK_187P5 },
+        { 12288000, 32000, CS42L56_MCLK_LRCLK_192 },
+        { 24000000, 32000, CS42L56_MCLK_LRCLK_187P5 },
+        { 24576000, 32000, CS42L56_MCLK_LRCLK_192 },
+        /* 44.118k */
+        { 6000000, 44118, CS42L56_MCLK_LRCLK_136 },
+        { 12000000, 44118, CS42L56_MCLK_LRCLK_136 },
+        { 24000000, 44118, CS42L56_MCLK_LRCLK_136 },
+        /* 44.1k */
+        { 5644800, 44100, CS42L56_MCLK_LRCLK_128 },
+        { 11289600, 44100, CS42L56_MCLK_LRCLK_128 },
+        { 22579200, 44100, CS42L56_MCLK_LRCLK_128 },
+        /* 48k */
+        { 6000000, 48000, CS42L56_MCLK_LRCLK_125 },
+        { 6144000, 48000, CS42L56_MCLK_LRCLK_128 },
+        { 12000000, 48000, CS42L56_MCLK_LRCLK_125 },
+        { 12288000, 48000, CS42L56_MCLK_LRCLK_128 },
+        { 24000000, 48000, CS42L56_MCLK_LRCLK_125 },
+        { 24576000, 48000, CS42L56_MCLK_LRCLK_128 },
+};
+
+static int cs42l56_get_mclk_ratio(int mclk, int rate)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(clk_ratio_table); i++) {
+                if (clk_ratio_table[i].mclk == mclk &&
+                    clk_ratio_table[i].srate == rate)
+                        return clk_ratio_table[i].ratio;
+        }
+        return -EINVAL;
+}
+
+static int cs42l56_set_sysclk(struct snd_soc_dai *codec_dai,
+                        int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);
+
+        switch (freq) {
+        case CS42L56_MCLK_5P6448MHZ:
+        case CS42L56_MCLK_6MHZ:
+        case CS42L56_MCLK_6P144MHZ:
+                cs42l56->mclk_div2 = 0;
+                cs42l56->mclk_prediv = 0;
+                break;
+        case CS42L56_MCLK_11P2896MHZ:
+        case CS42L56_MCLK_12MHZ:
+        case CS42L56_MCLK_12P288MHZ:
+                cs42l56->mclk_div2 = 1;
+                cs42l56->mclk_prediv = 0;
+                break;
+        case CS42L56_MCLK_22P5792MHZ:
+        case CS42L56_MCLK_24MHZ:
+        case CS42L56_MCLK_24P576MHZ:
+                cs42l56->mclk_div2 = 1;
+                cs42l56->mclk_prediv = 1;
+                break;
+        default:
+                return -EINVAL;
+        }
+        cs42l56->mclk = freq;
+
+        snd_soc_update_bits(codec, CS42L56_CLKCTL_1,
+                            CS42L56_MCLK_PREDIV_MASK,
+                                cs42l56->mclk_prediv);
+        snd_soc_update_bits(codec, CS42L56_CLKCTL_1,
+                            CS42L56_MCLK_DIV2_MASK,
+                                cs42l56->mclk_div2);
+
+        return 0;
+}
+
+static int cs42l56_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                cs42l56->iface = CS42L56_MASTER_MODE;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                cs42l56->iface = CS42L56_SLAVE_MODE;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+         /* interface format */
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+                cs42l56->iface_fmt = CS42L56_DIG_FMT_I2S;
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                cs42l56->iface_fmt = CS42L56_DIG_FMT_LEFT_J;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        /* sclk inversion */
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                cs42l56->iface_inv = 0;
+                break;
+        case SND_SOC_DAIFMT_IB_NF:
+                cs42l56->iface_inv = CS42L56_SCLK_INV;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        snd_soc_update_bits(codec, CS42L56_CLKCTL_1,
+                            CS42L56_MS_MODE_MASK, cs42l56->iface);
+        snd_soc_update_bits(codec, CS42L56_SERIAL_FMT,
+                            CS42L56_DIG_FMT_MASK, cs42l56->iface_fmt);
+        snd_soc_update_bits(codec, CS42L56_CLKCTL_1,
+                            CS42L56_SCLK_INV_MASK, cs42l56->iface_inv);
+        return 0;
+}
+
+static int cs42l56_digital_mute(struct snd_soc_dai *dai, int mute)
+{
+        struct snd_soc_codec *codec = dai->codec;
+
+        if (mute) {
+                /* Hit the DSP Mixer first */
+                snd_soc_update_bits(codec, CS42L56_DSP_MUTE_CTL,
+                                    CS42L56_ADCAMIX_MUTE_MASK |
+                                CS42L56_ADCBMIX_MUTE_MASK |
+                                CS42L56_PCMAMIX_MUTE_MASK |
+                                CS42L56_PCMBMIX_MUTE_MASK |
+                                CS42L56_MSTB_MUTE_MASK |
+                                CS42L56_MSTA_MUTE_MASK,
+                                CS42L56_MUTE);
+                /* Mute ADC's */
+                snd_soc_update_bits(codec, CS42L56_MISC_ADC_CTL,
+                                CS42L56_ADCA_MUTE_MASK |
+                                CS42L56_ADCB_MUTE_MASK,
+                                CS42L56_MUTE);
+                /* HP And LO */
+                snd_soc_update_bits(codec, CS42L56_HPA_VOLUME,
+                                CS42L56_HP_MUTE_MASK,
+                                CS42L56_MUTE);
+                snd_soc_update_bits(codec, CS42L56_HPB_VOLUME,
+                                CS42L56_HP_MUTE_MASK,
+                                CS42L56_MUTE);
+                snd_soc_update_bits(codec, CS42L56_LOA_VOLUME,
+                                CS42L56_LO_MUTE_MASK,
+                                CS42L56_MUTE);
+                snd_soc_update_bits(codec, CS42L56_LOB_VOLUME,
+                                CS42L56_LO_MUTE_MASK,
+                                CS42L56_MUTE);
+
+
+        } else {
+                snd_soc_update_bits(codec, CS42L56_DSP_MUTE_CTL,
+                                    CS42L56_ADCAMIX_MUTE_MASK |
+                                CS42L56_ADCBMIX_MUTE_MASK |
+                                CS42L56_PCMAMIX_MUTE_MASK |
+                                CS42L56_PCMBMIX_MUTE_MASK |
+                                CS42L56_MSTB_MUTE_MASK |
+                                CS42L56_MSTA_MUTE_MASK,
+                                CS42L56_UNMUTE);
+                snd_soc_update_bits(codec, CS42L56_MISC_ADC_CTL,
+                                CS42L56_ADCA_MUTE_MASK |
+                                CS42L56_ADCB_MUTE_MASK,
+                                CS42L56_UNMUTE);
+                snd_soc_update_bits(codec, CS42L56_HPA_VOLUME,
+                                CS42L56_HP_MUTE_MASK,
+                                CS42L56_UNMUTE);
+                snd_soc_update_bits(codec, CS42L56_HPB_VOLUME,
+                                CS42L56_HP_MUTE_MASK,
+                                CS42L56_UNMUTE);
+                snd_soc_update_bits(codec, CS42L56_LOA_VOLUME,
+                                CS42L56_LO_MUTE_MASK,
+                                CS42L56_UNMUTE);
+                snd_soc_update_bits(codec, CS42L56_LOB_VOLUME,
+                                CS42L56_LO_MUTE_MASK,
+                                CS42L56_UNMUTE);
+        }
+        return 0;
+}
+
+static int cs42l56_pcm_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 cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);
+        int ratio;
+
+        ratio = cs42l56_get_mclk_ratio(cs42l56->mclk, params_rate(params));
+        if (ratio >= 0) {
+                snd_soc_update_bits(codec, CS42L56_CLKCTL_2,
+                                    CS42L56_CLK_RATIO_MASK, ratio);
+        } else {
+                dev_err(codec->dev, "unsupported mclk/sclk/lrclk ratio\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int cs42l56_set_bias_level(struct snd_soc_codec *codec,
+                                        enum snd_soc_bias_level level)
+{
+        struct cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        switch (level) {
+        case SND_SOC_BIAS_ON:
+                break;
+        case SND_SOC_BIAS_PREPARE:
+                snd_soc_update_bits(codec, CS42L56_CLKCTL_1,
+                                    CS42L56_MCLK_DIS_MASK, 0);
+                snd_soc_update_bits(codec, CS42L56_PWRCTL_1,
+                                    CS42L56_PDN_ALL_MASK, 0);
+                break;
+        case SND_SOC_BIAS_STANDBY:
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
+                        regcache_cache_only(cs42l56->regmap, false);
+                        regcache_sync(cs42l56->regmap);
+                        ret = regulator_bulk_enable(ARRAY_SIZE(cs42l56->supplies),
+                                                    cs42l56->supplies);
+                        if (ret != 0) {
+                                dev_err(cs42l56->dev,
+                                        "Failed to enable regulators: %d\n",
+                                        ret);
+                                return ret;
+                        }
+                }
+                snd_soc_update_bits(codec, CS42L56_PWRCTL_1,
+                                    CS42L56_PDN_ALL_MASK, 1);
+                break;
+        case SND_SOC_BIAS_OFF:
+                snd_soc_update_bits(codec, CS42L56_PWRCTL_1,
+                                    CS42L56_PDN_ALL_MASK, 1);
+                snd_soc_update_bits(codec, CS42L56_CLKCTL_1,
+                                    CS42L56_MCLK_DIS_MASK, 1);
+                regcache_cache_only(cs42l56->regmap, true);
+                regulator_bulk_disable(ARRAY_SIZE(cs42l56->supplies),
+                                                    cs42l56->supplies);
+                break;
+        }
+        codec->dapm.bias_level = level;
+
+        return 0;
+}
+
+#define CS42L56_RATES (SNDRV_PCM_RATE_8000_48000)
+
+#define CS42L56_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S18_3LE | \
+                        SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE | \
+                        SNDRV_PCM_FMTBIT_S32_LE)
+
+
+static struct snd_soc_dai_ops cs42l56_ops = {
+        .hw_params      = cs42l56_pcm_hw_params,
+        .digital_mute   = cs42l56_digital_mute,
+        .set_fmt        = cs42l56_set_dai_fmt,
+        .set_sysclk     = cs42l56_set_sysclk,
+};
+
+static struct snd_soc_dai_driver cs42l56_dai = {
+                .name = "cs42l56",
+                .playback = {
+                        .stream_name = "HiFi Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = CS42L56_RATES,
+                        .formats = CS42L56_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "HiFi Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = CS42L56_RATES,
+                        .formats = CS42L56_FORMATS,
+                },
+                .ops = &cs42l56_ops,
+};
+
+static int cs42l56_suspend(struct snd_soc_codec *codec)
+{
+        cs42l56_set_bias_level(codec, SND_SOC_BIAS_OFF);
+
+        return 0;
+}
+
+static int cs42l56_resume(struct snd_soc_codec *codec)
+{
+        cs42l56_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
+        return 0;
+}
+
+static int beep_freq[] = {
+        261, 522, 585, 667, 706, 774, 889, 1000,
+        1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182
+};
+
+static void cs42l56_beep_work(struct work_struct *work)
+{
+        struct cs42l56_private *cs42l56 =
+                container_of(work, struct cs42l56_private, beep_work);
+        struct snd_soc_codec *codec = cs42l56->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+        int i;
+        int val = 0;
+        int best = 0;
+
+        if (cs42l56->beep_rate) {
+                for (i = 0; i < ARRAY_SIZE(beep_freq); i++) {
+                        if (abs(cs42l56->beep_rate - beep_freq[i]) <
+                            abs(cs42l56->beep_rate - beep_freq[best]))
+                                best = i;
+                }
+
+                dev_dbg(codec->dev, "Set beep rate %dHz for requested %dHz\n",
+                        beep_freq[best], cs42l56->beep_rate);
+
+                val = (best << CS42L56_BEEP_RATE_SHIFT);
+
+                snd_soc_dapm_enable_pin(dapm, "Beep");
+        } else {
+                dev_dbg(codec->dev, "Disabling beep\n");
+                snd_soc_dapm_disable_pin(dapm, "Beep");
+        }
+
+        snd_soc_update_bits(codec, CS42L56_BEEP_FREQ_ONTIME,
+                            CS42L56_BEEP_FREQ_MASK, val);
+
+        snd_soc_dapm_sync(dapm);
+}
+
+/* For usability define a way of injecting beep events for the device -
+ * many systems will not have a keyboard.
+ */
+static int cs42l56_beep_event(struct input_dev *dev, unsigned int type,
+                             unsigned int code, int hz)
+{
+        struct snd_soc_codec *codec = input_get_drvdata(dev);
+        struct cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);
+
+        dev_dbg(codec->dev, "Beep event %x %x\n", code, hz);
+
+        switch (code) {
+        case SND_BELL:
+                if (hz)
+                        hz = 261;
+        case SND_TONE:
+                break;
+        default:
+                return -1;
+        }
+
+        /* Kick the beep from a workqueue */
+        cs42l56->beep_rate = hz;
+        schedule_work(&cs42l56->beep_work);
+        return 0;
+}
+
+static ssize_t cs42l56_beep_set(struct device *dev,
+                               struct device_attribute *attr,
+                               const char *buf, size_t count)
+{
+        struct cs42l56_private *cs42l56 = dev_get_drvdata(dev);
+        long int time;
+        int ret;
+
+        ret = kstrtol(buf, 10, &time);
+        if (ret != 0)
+                return ret;
+
+        input_event(cs42l56->beep, EV_SND, SND_TONE, time);
+
+        return count;
+}
+
+static DEVICE_ATTR(beep, 0200, NULL, cs42l56_beep_set);
+
+static void cs42l56_init_beep(struct snd_soc_codec *codec)
+{
+        struct cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        cs42l56->beep = devm_input_allocate_device(codec->dev);
+        if (!cs42l56->beep) {
+                dev_err(codec->dev, "Failed to allocate beep device\n");
+                return;
+        }
+
+        INIT_WORK(&cs42l56->beep_work, cs42l56_beep_work);
+        cs42l56->beep_rate = 0;
+
+        cs42l56->beep->name = "CS42L56 Beep Generator";
+        cs42l56->beep->phys = dev_name(codec->dev);
+        cs42l56->beep->id.bustype = BUS_I2C;
+
+        cs42l56->beep->evbit[0] = BIT_MASK(EV_SND);
+        cs42l56->beep->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
+        cs42l56->beep->event = cs42l56_beep_event;
+        cs42l56->beep->dev.parent = codec->dev;
+        input_set_drvdata(cs42l56->beep, codec);
+
+        ret = input_register_device(cs42l56->beep);
+        if (ret != 0) {
+                cs42l56->beep = NULL;
+                dev_err(codec->dev, "Failed to register beep device\n");
+        }
+
+        ret = device_create_file(codec->dev, &dev_attr_beep);
+        if (ret != 0) {
+                dev_err(codec->dev, "Failed to create keyclick file: %d\n",
+                        ret);
+        }
+}
+
+static void cs42l56_free_beep(struct snd_soc_codec *codec)
+{
+        struct cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);
+
+        device_remove_file(codec->dev, &dev_attr_beep);
+        cancel_work_sync(&cs42l56->beep_work);
+        cs42l56->beep = NULL;
+
+        snd_soc_update_bits(codec, CS42L56_BEEP_TONE_CFG,
+                            CS42L56_BEEP_EN_MASK, 0);
+}
+
+static int cs42l56_probe(struct snd_soc_codec *codec)
+{
+        cs42l56_init_beep(codec);
+
+        cs42l56_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
+        return 0;
+}
+
+static int cs42l56_remove(struct snd_soc_codec *codec)
+{
+        struct cs42l56_private *cs42l56 = snd_soc_codec_get_drvdata(codec);
+
+        cs42l56_free_beep(codec);
+        cs42l56_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        regulator_bulk_free(ARRAY_SIZE(cs42l56->supplies), cs42l56->supplies);
+
+        return 0;
+}
+
+static struct snd_soc_codec_driver soc_codec_dev_cs42l56 = {
+        .probe = cs42l56_probe,
+        .remove = cs42l56_remove,
+        .suspend = cs42l56_suspend,
+        .resume = cs42l56_resume,
+        .set_bias_level = cs42l56_set_bias_level,
+
+        .dapm_widgets = cs42l56_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(cs42l56_dapm_widgets),
+        .dapm_routes = cs42l56_audio_map,
+        .num_dapm_routes = ARRAY_SIZE(cs42l56_audio_map),
+
+        .controls = cs42l56_snd_controls,
+        .num_controls = ARRAY_SIZE(cs42l56_snd_controls),
+};
+
+static struct regmap_config cs42l56_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .max_register = CS42L56_MAX_REGISTER,
+        .reg_defaults = cs42l56_reg_defaults,
+        .num_reg_defaults = ARRAY_SIZE(cs42l56_reg_defaults),
+        .readable_reg = cs42l56_readable_register,
+        .volatile_reg = cs42l56_volatile_register,
+        .cache_type = REGCACHE_RBTREE,
+};
+
+static int cs42l56_handle_of_data(struct i2c_client *i2c_client,
+                                    struct cs42l56_platform_data *pdata)
+{
+        struct device_node *np = i2c_client->dev.of_node;
+        u32 val32;
+
+        if (of_property_read_bool(np, "cirrus,ain1a-reference-cfg"))
+                pdata->ain1a_ref_cfg = true;
+
+        if (of_property_read_bool(np, "cirrus,ain2a-reference-cfg"))
+                pdata->ain2a_ref_cfg = true;
+
+        if (of_property_read_bool(np, "cirrus,ain1b-reference-cfg"))
+                pdata->ain1b_ref_cfg = true;
+
+        if (of_property_read_bool(np, "cirrus,ain2b-reference-cfg"))
+                pdata->ain2b_ref_cfg = true;
+
+        if (of_property_read_u32(np, "cirrus,micbias-lvl", &val32) >= 0)
+                pdata->micbias_lvl = val32;
+
+        if (of_property_read_u32(np, "cirrus,chgfreq-divisor", &val32) >= 0)
+                pdata->chgfreq = val32;
+
+        if (of_property_read_u32(np, "cirrus,adaptive-pwr-cfg", &val32) >= 0)
+                pdata->adaptive_pwr = val32;
+
+        if (of_property_read_u32(np, "cirrus,hpf-left-freq", &val32) >= 0)
+                pdata->hpfa_freq = val32;
+
+        if (of_property_read_u32(np, "cirrus,hpf-left-freq", &val32) >= 0)
+                pdata->hpfb_freq = val32;
+
+        pdata->gpio_nreset = of_get_named_gpio(np, "cirrus,gpio-nreset", 0);
+
+        return 0;
+}
+
+static int cs42l56_i2c_probe(struct i2c_client *i2c_client,
+                             const struct i2c_device_id *id)
+{
+        struct cs42l56_private *cs42l56;
+        struct cs42l56_platform_data *pdata =
+                dev_get_platdata(&i2c_client->dev);
+        int ret, i;
+        unsigned int devid = 0;
+        unsigned int alpha_rev, metal_rev;
+        unsigned int reg;
+
+        cs42l56 = devm_kzalloc(&i2c_client->dev,
+                               sizeof(struct cs42l56_private),
+                               GFP_KERNEL);
+        if (cs42l56 == NULL)
+                return -ENOMEM;
+        cs42l56->dev = &i2c_client->dev;
+
+        cs42l56->regmap = devm_regmap_init_i2c(i2c_client, &cs42l56_regmap);
+        if (IS_ERR(cs42l56->regmap)) {
+                ret = PTR_ERR(cs42l56->regmap);
+                dev_err(&i2c_client->dev, "regmap_init() failed: %d\n", ret);
+                return ret;
+        }
+
+        if (pdata) {
+                cs42l56->pdata = *pdata;
+        } else {
+                pdata = devm_kzalloc(&i2c_client->dev,
+                                     sizeof(struct cs42l56_platform_data),
+                                     GFP_KERNEL);
+                if (!pdata) {
+                        dev_err(&i2c_client->dev,
+                                "could not allocate pdata\n");
+                        return -ENOMEM;
+                }
+                if (i2c_client->dev.of_node) {
+                        ret = cs42l56_handle_of_data(i2c_client,
+                                                     &cs42l56->pdata);
+                        if (ret != 0)
+                                return ret;
+                }
+                cs42l56->pdata = *pdata;
+        }
+
+        if (cs42l56->pdata.gpio_nreset) {
+                ret = gpio_request_one(cs42l56->pdata.gpio_nreset,
+                                       GPIOF_OUT_INIT_HIGH, "CS42L56 /RST");
+                if (ret < 0) {
+                        dev_err(&i2c_client->dev,
+                                "Failed to request /RST %d: %d\n",
+                                cs42l56->pdata.gpio_nreset, ret);
+                        return ret;
+                }
+                gpio_set_value_cansleep(cs42l56->pdata.gpio_nreset, 0);
+                gpio_set_value_cansleep(cs42l56->pdata.gpio_nreset, 1);
+        }
+
+
+        i2c_set_clientdata(i2c_client, cs42l56);
+
+        for (i = 0; i < ARRAY_SIZE(cs42l56->supplies); i++)
+                cs42l56->supplies[i].supply = cs42l56_supply_names[i];
+
+        ret = devm_regulator_bulk_get(&i2c_client->dev,
+                                      ARRAY_SIZE(cs42l56->supplies),
+                                      cs42l56->supplies);
+        if (ret != 0) {
+                dev_err(&i2c_client->dev,
+                        "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        ret = regulator_bulk_enable(ARRAY_SIZE(cs42l56->supplies),
+                                    cs42l56->supplies);
+        if (ret != 0) {
+                dev_err(&i2c_client->dev,
+                        "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+
+        regcache_cache_bypass(cs42l56->regmap, true);
+
+        ret = regmap_read(cs42l56->regmap, CS42L56_CHIP_ID_1, &reg);
+        devid = reg & CS42L56_CHIP_ID_MASK;
+        if (devid != CS42L56_DEVID) {
+                dev_err(&i2c_client->dev,
+                        "CS42L56 Device ID (%X). Expected %X\n",
+                        devid, CS42L56_DEVID);
+                goto err_enable;
+        }
+        alpha_rev = reg & CS42L56_AREV_MASK;
+        metal_rev = reg & CS42L56_MTLREV_MASK;
+
+        dev_info(&i2c_client->dev, "Cirrus Logic CS42L56 ");
+        dev_info(&i2c_client->dev, "Alpha Rev %X Metal Rev %X\n",
+                 alpha_rev, metal_rev);
+
+        regcache_cache_bypass(cs42l56->regmap, false);
+
+        if (cs42l56->pdata.ain1a_ref_cfg)
+                regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX,
+                                   CS42L56_AIN1A_REF_MASK, 1);
+
+        if (cs42l56->pdata.ain1b_ref_cfg)
+                regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX,
+                                   CS42L56_AIN1B_REF_MASK, 1);
+
+        if (cs42l56->pdata.ain2a_ref_cfg)
+                regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX,
+                                   CS42L56_AIN2A_REF_MASK, 1);
+
+        if (cs42l56->pdata.ain2b_ref_cfg)
+                regmap_update_bits(cs42l56->regmap, CS42L56_AIN_REFCFG_ADC_MUX,
+                                   CS42L56_AIN2B_REF_MASK, 1);
+
+        if (cs42l56->pdata.micbias_lvl)
+                regmap_update_bits(cs42l56->regmap, CS42L56_GAIN_BIAS_CTL,
+                                   CS42L56_MIC_BIAS_MASK,
+                                cs42l56->pdata.micbias_lvl);
+
+        if (cs42l56->pdata.chgfreq)
+                regmap_update_bits(cs42l56->regmap, CS42L56_CLASSH_CTL,
+                                   CS42L56_CHRG_FREQ_MASK,
+                                cs42l56->pdata.chgfreq);
+
+        if (cs42l56->pdata.hpfb_freq)
+                regmap_update_bits(cs42l56->regmap, CS42L56_HPF_CTL,
+                                   CS42L56_HPFB_FREQ_MASK,
+                                cs42l56->pdata.hpfb_freq);
+
+        if (cs42l56->pdata.hpfa_freq)
+                regmap_update_bits(cs42l56->regmap, CS42L56_HPF_CTL,
+                                   CS42L56_HPFA_FREQ_MASK,
+                                cs42l56->pdata.hpfa_freq);
+
+        if (cs42l56->pdata.adaptive_pwr)
+                regmap_update_bits(cs42l56->regmap, CS42L56_CLASSH_CTL,
+                                   CS42L56_ADAPT_PWR_MASK,
+                                cs42l56->pdata.adaptive_pwr);
+
+        ret =  snd_soc_register_codec(&i2c_client->dev,
+                        &soc_codec_dev_cs42l56, &cs42l56_dai, 1);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+
+err_enable:
+        regulator_bulk_disable(ARRAY_SIZE(cs42l56->supplies),
+                               cs42l56->supplies);
+        return ret;
+}
+
+static int cs42l56_i2c_remove(struct i2c_client *client)
+{
+        struct cs42l56_private *cs42l56 = i2c_get_clientdata(client);
+
+        snd_soc_unregister_codec(&client->dev);
+        regulator_bulk_disable(ARRAY_SIZE(cs42l56->supplies),
+                               cs42l56->supplies);
+        return 0;
+}
+
+static const struct of_device_id cs42l56_of_match[] = {
+        { .compatible = "cirrus,cs42l56", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, cs42l56_of_match);
+
+
+static const struct i2c_device_id cs42l56_id[] = {
+        { "cs42l56", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, cs42l56_id);
+
+static struct i2c_driver cs42l56_i2c_driver = {
+        .driver = {
+                .name = "cs42l56",
+                .owner = THIS_MODULE,
+                .of_match_table = cs42l56_of_match,
+        },
+        .id_table = cs42l56_id,
+        .probe =    cs42l56_i2c_probe,
+        .remove =   cs42l56_i2c_remove,
+};
+
+module_i2c_driver(cs42l56_i2c_driver);
+
+MODULE_DESCRIPTION("ASoC CS42L56 driver");
+MODULE_AUTHOR("Brian Austin, Cirrus Logic Inc, <brian.austin@cirrus.com>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/cs42l56.h b/sound/soc/codecs/cs42l56.h
new file mode 100644
index 000000000000..ad2b50a90b16
--- /dev/null
+++ b/sound/soc/codecs/cs42l56.h
@@ -0,0 +1,175 @@
+/*
+ * cs42l52.h -- CS42L56 ALSA SoC audio driver
+ *
+ * Copyright 2014 CirrusLogic, Inc.
+ *
+ * Author: Brian Austin <brian.austin@cirrus.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.
+ *
+ */
+
+#ifndef __CS42L56_H__
+#define __CS42L56_H__
+
+#define CS42L56_CHIP_ID_1               0x01
+#define CS42L56_CHIP_ID_2               0x02
+#define CS42L56_PWRCTL_1                0x03
+#define CS42L56_PWRCTL_2                0x04
+#define CS42L56_CLKCTL_1                0x05
+#define CS42L56_CLKCTL_2                0x06
+#define CS42L56_SERIAL_FMT              0x07
+#define CS42L56_CLASSH_CTL              0x08
+#define CS42L56_MISC_CTL                0x09
+#define CS42L56_INT_STATUS              0x0a
+#define CS42L56_PLAYBACK_CTL            0x0b
+#define CS42L56_DSP_MUTE_CTL            0x0c
+#define CS42L56_ADCA_MIX_VOLUME         0x0d
+#define CS42L56_ADCB_MIX_VOLUME         0x0e
+#define CS42L56_PCMA_MIX_VOLUME         0x0f
+#define CS42L56_PCMB_MIX_VOLUME         0x10
+#define CS42L56_ANAINPUT_ADV_VOLUME     0x11
+#define CS42L56_DIGINPUT_ADV_VOLUME     0x12
+#define CS42L56_MASTER_A_VOLUME         0x13
+#define CS42L56_MASTER_B_VOLUME         0x14
+#define CS42L56_BEEP_FREQ_ONTIME        0x15
+#define CS42L56_BEEP_FREQ_OFFTIME       0x16
+#define CS42L56_BEEP_TONE_CFG           0x17
+#define CS42L56_TONE_CTL                0x18
+#define CS42L56_CHAN_MIX_SWAP           0x19
+#define CS42L56_AIN_REFCFG_ADC_MUX      0x1a
+#define CS42L56_HPF_CTL                 0x1b
+#define CS42L56_MISC_ADC_CTL            0x1c
+#define CS42L56_GAIN_BIAS_CTL           0x1d
+#define CS42L56_PGAA_MUX_VOLUME         0x1e
+#define CS42L56_PGAB_MUX_VOLUME         0x1f
+#define CS42L56_ADCA_ATTENUATOR         0x20
+#define CS42L56_ADCB_ATTENUATOR         0x21
+#define CS42L56_ALC_EN_ATTACK_RATE      0x22
+#define CS42L56_ALC_RELEASE_RATE        0x23
+#define CS42L56_ALC_THRESHOLD           0x24
+#define CS42L56_NOISE_GATE_CTL          0x25
+#define CS42L56_ALC_LIM_SFT_ZC          0x26
+#define CS42L56_AMUTE_HPLO_MUX          0x27
+#define CS42L56_HPA_VOLUME              0x28
+#define CS42L56_HPB_VOLUME              0x29
+#define CS42L56_LOA_VOLUME              0x2a
+#define CS42L56_LOB_VOLUME              0x2b
+#define CS42L56_LIM_THRESHOLD_CTL       0x2c
+#define CS42L56_LIM_CTL_RELEASE_RATE    0x2d
+#define CS42L56_LIM_ATTACK_RATE         0x2e
+
+/* Device ID and Rev ID Masks */
+#define CS42L56_DEVID                   0x56
+#define CS42L56_CHIP_ID_MASK            0xff
+#define CS42L56_AREV_MASK               0x1c
+#define CS42L56_MTLREV_MASK             0x03
+
+/* Power bit masks */
+#define CS42L56_PDN_ALL_MASK            0x01
+#define CS42L56_PDN_ADCA_MASK           0x02
+#define CS42L56_PDN_ADCB_MASK           0x04
+#define CS42L56_PDN_CHRG_MASK           0x08
+#define CS42L56_PDN_BIAS_MASK           0x10
+#define CS42L56_PDN_VBUF_MASK           0x20
+#define CS42L56_PDN_LOA_MASK            0x03
+#define CS42L56_PDN_LOB_MASK            0x0c
+#define CS42L56_PDN_HPA_MASK            0x30
+#define CS42L56_PDN_HPB_MASK            0xc0
+
+/* serial port and clk masks */
+#define CS42L56_MASTER_MODE             1
+#define CS42L56_SLAVE_MODE              0
+#define CS42L56_MS_MODE_MASK            0x40
+#define CS42L56_SCLK_INV                1
+#define CS42L56_SCLK_INV_MASK           0x20
+#define CS42L56_SCLK_MCLK_MASK          0x18
+#define CS42L56_MCLK_PREDIV_MASK        0x04
+#define CS42L56_MCLK_DIV2_MASK          0x02
+#define CS42L56_MCLK_DIS_MASK           0x01
+#define CS42L56_CLK_AUTO_MASK           0x20
+#define CS42L56_CLK_RATIO_MASK          0x1f
+#define CS42L56_DIG_FMT_I2S             0
+#define CS42L56_DIG_FMT_LEFT_J          1
+#define CS42L56_DIG_FMT_MASK            0x08
+
+/* Class H and misc ctl masks */
+#define CS42L56_ADAPT_PWR_MASK          0xc0
+#define CS42L56_CHRG_FREQ_MASK          0x0f
+#define CS42L56_DIG_MUX_MASK            0x80
+#define CS42L56_ANLGSFT_MASK            0x10
+#define CS42L56_ANLGZC_MASK             0x08
+#define CS42L56_DIGSFT_MASK             0x04
+#define CS42L56_FREEZE_MASK             0x01
+#define CS42L56_MIC_BIAS_MASK           0x03
+#define CS42L56_HPFA_FREQ_MASK          0x03
+#define CS42L56_HPFB_FREQ_MASK          0xc0
+#define CS42L56_AIN1A_REF_MASK          0x10
+#define CS42L56_AIN2A_REF_MASK          0x40
+#define CS42L56_AIN1B_REF_MASK          0x20
+#define CS42L56_AIN2B_REF_MASK          0x80
+
+/* Playback Capture ctl masks */
+#define CS42L56_PDN_DSP_MASK            0x80
+#define CS42L56_DEEMPH_MASK             0x40
+#define CS42L56_PLYBCK_GANG_MASK        0x10
+#define CS42L56_PCM_INV_MASK            0x0c
+#define CS42L56_MUTE                    1
+#define CS42L56_UNMUTE                  0
+#define CS42L56_ADCAMIX_MUTE_MASK       0x40
+#define CS42L56_ADCBMIX_MUTE_MASK       0x80
+#define CS42L56_PCMAMIX_MUTE_MASK       0x10
+#define CS42L56_PCMBMIX_MUTE_MASK       0x20
+#define CS42L56_MSTB_MUTE_MASK          0x02
+#define CS42L56_MSTA_MUTE_MASK          0x01
+#define CS42L56_ADCA_MUTE_MASK          0x01
+#define CS42L56_ADCB_MUTE_MASK          0x02
+#define CS42L56_HP_MUTE_MASK            0x80
+#define CS42L56_LO_MUTE_MASK            0x80
+
+/* Beep masks */
+#define CS42L56_BEEP_FREQ_MASK          0xf0
+#define CS42L56_BEEP_ONTIME_MASK        0x0f
+#define CS42L56_BEEP_OFFTIME_MASK       0xe0
+#define CS42L56_BEEP_CFG_MASK           0xc0
+#define CS42L56_BEEP_TREBCF_MASK        0x18
+#define CS42L56_BEEP_BASSCF_MASK        0x06
+#define CS42L56_BEEP_TCEN_MASK          0x01
+#define CS42L56_BEEP_RATE_SHIFT         4
+#define CS42L56_BEEP_EN_MASK            0x3f
+
+
+/* Supported MCLKS */
+#define CS42L56_MCLK_5P6448MHZ          5644800
+#define CS42L56_MCLK_6MHZ               6000000
+#define CS42L56_MCLK_6P144MHZ           6144000
+#define CS42L56_MCLK_11P2896MHZ         11289600
+#define CS42L56_MCLK_12MHZ              12000000
+#define CS42L56_MCLK_12P288MHZ          12288000
+#define CS42L56_MCLK_22P5792MHZ         22579200
+#define CS42L56_MCLK_24MHZ              24000000
+#define CS42L56_MCLK_24P576MHZ          24576000
+
+/* Clock ratios */
+#define CS42L56_MCLK_LRCLK_128          0x08
+#define CS42L56_MCLK_LRCLK_125          0x09
+#define CS42L56_MCLK_LRCLK_136          0x0b
+#define CS42L56_MCLK_LRCLK_192          0x0c
+#define CS42L56_MCLK_LRCLK_187P5        0x0d
+#define CS42L56_MCLK_LRCLK_256          0x10
+#define CS42L56_MCLK_LRCLK_250          0x11
+#define CS42L56_MCLK_LRCLK_272          0x13
+#define CS42L56_MCLK_LRCLK_384          0x14
+#define CS42L56_MCLK_LRCLK_375          0x15
+#define CS42L56_MCLK_LRCLK_512          0x18
+#define CS42L56_MCLK_LRCLK_500          0x19
+#define CS42L56_MCLK_LRCLK_544          0x1b
+#define CS42L56_MCLK_LRCLK_750          0x1c
+#define CS42L56_MCLK_LRCLK_768          0x1d
+
+
+#define CS42L56_MAX_REGISTER            0x34
+
+#endif
diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index 85020322eee7..a25bc6061a30 100644
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
@@ -248,8 +248,7 @@ static int cs42xx8_hw_params(struct snd_pcm_substream *substream,
                              struct snd_pcm_hw_params *params,
                              struct snd_soc_dai *dai)
 {
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_codec *codec = dai->codec;
         struct cs42xx8_priv *cs42xx8 = snd_soc_codec_get_drvdata(codec);
         bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
         u32 ratio = cs42xx8->sysclk / params_rate(params);
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 137e8ebc092c..21810e5f3321 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -335,7 +335,7 @@ static SOC_ENUM_SINGLE_DECL(da7210_hp_mode_sel,
 static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
 
         if (ucontrol->value.integer.value[0]) {
                 /* Check if noise suppression is enabled */
@@ -358,7 +358,7 @@ static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol,
 static int da7210_put_noise_sup_sw(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         u8 val;
 
         if (ucontrol->value.integer.value[0]) {
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index 738fa18a50d2..9ec577f0edb4 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -345,7 +345,7 @@ static void da7213_alc_calib(struct snd_soc_codec *codec)
 static int da7213_put_mixin_gain(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
@@ -361,7 +361,7 @@ static int da7213_put_mixin_gain(struct snd_kcontrol *kcontrol,
 static int da7213_put_alc_sw(struct snd_kcontrol *kcontrol,
                             struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
 
         /* Force ALC offset calibration if enabling ALC */
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index 48f3fef68484..2fae31cb0067 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -332,7 +332,7 @@ static SOC_ENUM_SINGLE_DECL(da732x_adc2_voice_filter_enum,
 static int da732x_hpf_set(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value;
         unsigned int reg = enum_ctrl->reg;
         unsigned int sel = ucontrol->value.integer.value[0];
@@ -360,7 +360,7 @@ static int da732x_hpf_set(struct snd_kcontrol *kcontrol,
 static int da732x_hpf_get(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value;
         unsigned int reg = enum_ctrl->reg;
         int val;
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c
index 4ff06b50fbba..ad19cc56702b 100644
--- a/sound/soc/codecs/da9055.c
+++ b/sound/soc/codecs/da9055.c
@@ -484,7 +484,7 @@ static int da9055_get_alc_data(struct snd_soc_codec *codec, u8 reg_val)
 static int da9055_put_alc_sw(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         u8 reg_val, adc_left, adc_right, mic_left, mic_right;
         int avg_left_data, avg_right_data, offset_l, offset_r;
 
diff --git a/sound/soc/codecs/hdmi.c b/sound/soc/codecs/hdmi.c
index 9cb1c7d3e1dc..1087fd5f9917 100644
--- a/sound/soc/codecs/hdmi.c
+++ b/sound/soc/codecs/hdmi.c
@@ -20,6 +20,7 @@
  */
 #include <linux/module.h>
 #include <sound/soc.h>
+#include <linux/of.h>
 #include <linux/of_device.h>
 
 #define DRV_NAME "hdmi-audio-codec"
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c
index 4f048db9f55f..a924bb9d7886 100644
--- a/sound/soc/codecs/lm4857.c
+++ b/sound/soc/codecs/lm4857.c
@@ -49,7 +49,7 @@ static const struct reg_default lm4857_default_regs[] = {
 static int lm4857_get_mode(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct lm4857 *lm4857 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = lm4857->mode;
@@ -60,7 +60,7 @@ static int lm4857_get_mode(struct snd_kcontrol *kcontrol,
 static int lm4857_set_mode(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct lm4857 *lm4857 = snd_soc_codec_get_drvdata(codec);
         uint8_t value = ucontrol->value.integer.value[0];
 
diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c
index ec481fc428c7..e1c196a41930 100644
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
@@ -43,7 +43,7 @@ static struct reg_default max9768_default_regs[] = {
 static int max9768_get_gpio(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max9768 *max9768 = snd_soc_codec_get_drvdata(codec);
         int val = gpio_get_value_cansleep(max9768->mute_gpio);
 
@@ -55,7 +55,7 @@ static int max9768_get_gpio(struct snd_kcontrol *kcontrol,
 static int max9768_set_gpio(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max9768 *max9768 = snd_soc_codec_get_drvdata(codec);
 
         gpio_set_value_cansleep(max9768->mute_gpio, !ucontrol->value.integer.value[0]);
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index ef7cf89f5623..9134982807b5 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -635,7 +635,7 @@ static SOC_ENUM_SINGLE_DECL(max98088_dai1_adc_filter_enum,
 static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
        struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
        unsigned int sel = ucontrol->value.integer.value[0];
 
@@ -649,7 +649,7 @@ static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol,
 static int max98088_mic1pre_get(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
        struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
 
        ucontrol->value.integer.value[0] = max98088->mic1pre;
@@ -659,7 +659,7 @@ static int max98088_mic1pre_get(struct snd_kcontrol *kcontrol,
 static int max98088_mic2pre_set(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
        struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
        unsigned int sel = ucontrol->value.integer.value[0];
 
@@ -673,7 +673,7 @@ static int max98088_mic2pre_set(struct snd_kcontrol *kcontrol,
 static int max98088_mic2pre_get(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
        struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
 
        ucontrol->value.integer.value[0] = max98088->mic2pre;
@@ -1750,7 +1750,7 @@ static void max98088_setup_eq2(struct snd_soc_codec *codec)
 static int max98088_put_eq_enum(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
        struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
        struct max98088_pdata *pdata = max98088->pdata;
        int channel = max98088_get_channel(codec, kcontrol->id.name);
@@ -1782,7 +1782,7 @@ static int max98088_put_eq_enum(struct snd_kcontrol *kcontrol,
 static int max98088_get_eq_enum(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+       struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
        struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
        int channel = max98088_get_channel(codec, kcontrol->id.name);
        struct max98088_cdata *cdata;
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index f7b0b37aa858..9b76f5a45115 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -11,10 +11,12 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
+#include <linux/acpi.h>
 #include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -255,6 +257,7 @@ static struct reg_default max98090_reg[] = {
 static bool max98090_volatile_register(struct device *dev, unsigned int reg)
 {
         switch (reg) {
+        case M98090_REG_SOFTWARE_RESET:
         case M98090_REG_DEVICE_STATUS:
         case M98090_REG_JACK_STATUS:
         case M98090_REG_REVISION_ID:
@@ -389,6 +392,7 @@ static const DECLARE_TLV_DB_SCALE(max98090_alc_tlv, -1500, 100, 0);
 static const DECLARE_TLV_DB_SCALE(max98090_alcmakeup_tlv, 0, 100, 0);
 static const DECLARE_TLV_DB_SCALE(max98090_alccomp_tlv, -3100, 100, 0);
 static const DECLARE_TLV_DB_SCALE(max98090_drcexp_tlv, -6600, 100, 0);
+static const DECLARE_TLV_DB_SCALE(max98090_sdg_tlv, 50, 200, 0);
 
 static const unsigned int max98090_mixout_tlv[] = {
         TLV_DB_RANGE_HEAD(2),
@@ -426,7 +430,7 @@ static const unsigned int max98090_rcv_lout_tlv[] = {
 static int max98090_get_enab_tlv(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98090_priv *max98090 = snd_soc_codec_get_drvdata(codec);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
@@ -466,7 +470,7 @@ static int max98090_get_enab_tlv(struct snd_kcontrol *kcontrol,
 static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98090_priv *max98090 = snd_soc_codec_get_drvdata(codec);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
@@ -665,7 +669,7 @@ static const struct snd_kcontrol_new max98090_snd_controls[] = {
         SOC_SINGLE_EXT_TLV("Digital Sidetone Volume",
                 M98090_REG_ADC_SIDETONE, M98090_DVST_SHIFT,
                 M98090_DVST_NUM - 1, 1, max98090_get_enab_tlv,
-                max98090_put_enab_tlv, max98090_micboost_tlv),
+                max98090_put_enab_tlv, max98090_sdg_tlv),
         SOC_SINGLE_TLV("Digital Coarse Volume", M98090_REG_DAI_PLAYBACK_LEVEL,
                 M98090_DVG_SHIFT, M98090_DVG_NUM - 1, 0,
                 max98090_dvg_tlv),
@@ -875,7 +879,7 @@ static const char *dmic_mux_text[] = { "ADC", "DMIC" };
 static SOC_ENUM_SINGLE_VIRT_DECL(dmic_mux_enum, dmic_mux_text);
 
 static const struct snd_kcontrol_new max98090_dmic_mux =
-        SOC_DAPM_ENUM_VIRT("DMIC Mux", dmic_mux_enum);
+        SOC_DAPM_ENUM("DMIC Mux", dmic_mux_enum);
 
 static const char *max98090_micpre_text[] = { "Off", "On" };
 
@@ -1175,8 +1179,7 @@ static const struct snd_soc_dapm_widget max98090_dapm_widgets[] = {
         SND_SOC_DAPM_MUX("MIC2 Mux", SND_SOC_NOPM,
                 0, 0, &max98090_mic2_mux),
 
-        SND_SOC_DAPM_VIRT_MUX("DMIC Mux", SND_SOC_NOPM,
-                0, 0, &max98090_dmic_mux),
+        SND_SOC_DAPM_MUX("DMIC Mux", SND_SOC_NOPM, 0, 0, &max98090_dmic_mux),
 
         SND_SOC_DAPM_PGA_E("MIC1 Input", M98090_REG_MIC1_INPUT_LEVEL,
                 M98090_MIC_PA1EN_SHIFT, 0, NULL, 0, max98090_micinput_event,
@@ -1673,6 +1676,7 @@ static int max98090_dai_set_fmt(struct snd_soc_dai *codec_dai,
                                 M98090_REG_CLOCK_RATIO_NI_LSB, 0x00);
                         snd_soc_update_bits(codec, M98090_REG_CLOCK_MODE,
                                 M98090_USE_M1_MASK, 0);
+                        max98090->master = false;
                         break;
                 case SND_SOC_DAIFMT_CBM_CFM:
                         /* Set to master mode */
@@ -1689,6 +1693,7 @@ static int max98090_dai_set_fmt(struct snd_soc_dai *codec_dai,
                                 regval |= M98090_MAS_MASK |
                                         M98090_BSEL_32;
                         }
+                        max98090->master = true;
                         break;
                 case SND_SOC_DAIFMT_CBS_CFM:
                 case SND_SOC_DAIFMT_CBM_CFS:
@@ -1792,13 +1797,6 @@ static int max98090_set_bias_level(struct snd_soc_codec *codec,
 
         switch (level) {
         case SND_SOC_BIAS_ON:
-                if (max98090->jack_state == M98090_JACK_STATE_HEADSET) {
-                        /*
-                         * Set to normal bias level.
-                         */
-                        snd_soc_update_bits(codec, M98090_REG_MIC_BIAS_VOLTAGE,
-                                M98090_MBVSEL_MASK, M98090_MBVSEL_2V8);
-                }
                 break;
 
         case SND_SOC_BIAS_PREPARE:
@@ -1872,7 +1870,8 @@ static int max98090_dai_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        max98090_configure_bclk(codec);
+        if (max98090->master)
+                max98090_configure_bclk(codec);
 
         cdata->rate = max98090->lrclk;
 
@@ -1951,8 +1950,6 @@ static int max98090_dai_set_sysclk(struct snd_soc_dai *dai,
 
         max98090->sysclk = freq;
 
-        max98090_configure_bclk(codec);
-
         return 0;
 }
 
@@ -2224,6 +2221,7 @@ static int max98090_probe(struct snd_soc_codec *codec)
         /* Initialize private data */
 
         max98090->sysclk = (unsigned)-1;
+        max98090->master = false;
 
         cdata = &max98090->dai[0];
         cdata->rate = (unsigned)-1;
@@ -2293,6 +2291,9 @@ static int max98090_probe(struct snd_soc_codec *codec)
         snd_soc_write(codec, M98090_REG_BIAS_CONTROL,
                 M98090_VCM_MODE_MASK);
 
+        snd_soc_update_bits(codec, M98090_REG_MIC_BIAS_VOLTAGE,
+                M98090_MBVSEL_MASK, M98090_MBVSEL_2V8);
+
         max98090_handle_pdata(codec);
 
         max98090_add_widgets(codec);
@@ -2329,9 +2330,11 @@ static const struct regmap_config max98090_regmap = {
 };
 
 static int max98090_i2c_probe(struct i2c_client *i2c,
-                                 const struct i2c_device_id *id)
+                                 const struct i2c_device_id *i2c_id)
 {
         struct max98090_priv *max98090;
+        const struct acpi_device_id *acpi_id;
+        kernel_ulong_t driver_data = 0;
         int ret;
 
         pr_debug("max98090_i2c_probe\n");
@@ -2341,7 +2344,19 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
         if (max98090 == NULL)
                 return -ENOMEM;
 
-        max98090->devtype = id->driver_data;
+        if (ACPI_HANDLE(&i2c->dev)) {
+                acpi_id = acpi_match_device(i2c->dev.driver->acpi_match_table,
+                                            &i2c->dev);
+                if (!acpi_id) {
+                        dev_err(&i2c->dev, "No driver data\n");
+                        return -EINVAL;
+                }
+                driver_data = acpi_id->driver_data;
+        } else if (i2c_id) {
+                driver_data = i2c_id->driver_data;
+        }
+
+        max98090->devtype = driver_data;
         i2c_set_clientdata(i2c, max98090);
         max98090->pdata = i2c->dev.platform_data;
         max98090->irq = i2c->irq;
@@ -2373,6 +2388,8 @@ static int max98090_runtime_resume(struct device *dev)
 
         regcache_cache_only(max98090->regmap, false);
 
+        max98090_reset(max98090);
+
         regcache_sync(max98090->regmap);
 
         return 0;
@@ -2388,9 +2405,34 @@ static int max98090_runtime_suspend(struct device *dev)
 }
 #endif
 
+#ifdef CONFIG_PM
+static int max98090_resume(struct device *dev)
+{
+        struct max98090_priv *max98090 = dev_get_drvdata(dev);
+        unsigned int status;
+
+        regcache_mark_dirty(max98090->regmap);
+
+        max98090_reset(max98090);
+
+        /* clear IRQ status */
+        regmap_read(max98090->regmap, M98090_REG_DEVICE_STATUS, &status);
+
+        regcache_sync(max98090->regmap);
+
+        return 0;
+}
+
+static int max98090_suspend(struct device *dev)
+{
+        return 0;
+}
+#endif
+
 static const struct dev_pm_ops max98090_pm = {
         SET_RUNTIME_PM_OPS(max98090_runtime_suspend,
                 max98090_runtime_resume, NULL)
+        SET_SYSTEM_SLEEP_PM_OPS(max98090_suspend, max98090_resume)
 };
 
 static const struct i2c_device_id max98090_i2c_id[] = {
@@ -2405,12 +2447,21 @@ static const struct of_device_id max98090_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, max98090_of_match);
 
+#ifdef CONFIG_ACPI
+static struct acpi_device_id max98090_acpi_match[] = {
+        { "193C9890", MAX98090 },
+        { }
+};
+MODULE_DEVICE_TABLE(acpi, max98090_acpi_match);
+#endif
+
 static struct i2c_driver max98090_i2c_driver = {
         .driver = {
                 .name = "max98090",
                 .owner = THIS_MODULE,
                 .pm = &max98090_pm,
                 .of_match_table = of_match_ptr(max98090_of_match),
+                .acpi_match_table = ACPI_PTR(max98090_acpi_match),
         },
         .probe  = max98090_i2c_probe,
         .remove = max98090_i2c_remove,
diff --git a/sound/soc/codecs/max98090.h b/sound/soc/codecs/max98090.h
index 1a4e2334a7b2..5a3c8d0613cb 100644
--- a/sound/soc/codecs/max98090.h
+++ b/sound/soc/codecs/max98090.h
@@ -1540,6 +1540,7 @@ struct max98090_priv {
         unsigned int pa2en;
         unsigned int extmic_mux;
         unsigned int sidetone;
+        bool master;
 };
 
 int max98090_mic_detect(struct snd_soc_codec *codec,
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 03f0536e6f61..d6c1e4c19a5a 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -612,7 +612,7 @@ static SOC_ENUM_SINGLE_DECL(max98095_dai3_dac_filter_enum,
 static int max98095_mic1pre_set(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
         unsigned int sel = ucontrol->value.integer.value[0];
 
@@ -626,7 +626,7 @@ static int max98095_mic1pre_set(struct snd_kcontrol *kcontrol,
 static int max98095_mic1pre_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = max98095->mic1pre;
@@ -636,7 +636,7 @@ static int max98095_mic1pre_get(struct snd_kcontrol *kcontrol,
 static int max98095_mic2pre_set(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
         unsigned int sel = ucontrol->value.integer.value[0];
 
@@ -650,7 +650,7 @@ static int max98095_mic2pre_set(struct snd_kcontrol *kcontrol,
 static int max98095_mic2pre_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = max98095->mic2pre;
@@ -1737,7 +1737,7 @@ static int max98095_get_eq_channel(const char *name)
 static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
         struct max98095_pdata *pdata = max98095->pdata;
         int channel = max98095_get_eq_channel(kcontrol->id.name);
@@ -1801,7 +1801,7 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol,
 static int max98095_get_eq_enum(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
         int channel = max98095_get_eq_channel(kcontrol->id.name);
         struct max98095_cdata *cdata;
@@ -1891,7 +1891,7 @@ static int max98095_get_bq_channel(struct snd_soc_codec *codec,
 static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
         struct max98095_pdata *pdata = max98095->pdata;
         int channel = max98095_get_bq_channel(codec, kcontrol->id.name);
@@ -1952,7 +1952,7 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol,
 static int max98095_get_bq_enum(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec);
         int channel = max98095_get_bq_channel(codec, kcontrol->id.name);
         struct max98095_cdata *cdata;
@@ -2399,10 +2399,17 @@ static const struct i2c_device_id max98095_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, max98095_i2c_id);
 
+static const struct of_device_id max98095_of_match[] = {
+        { .compatible = "maxim,max98095", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, max98095_of_match);
+
 static struct i2c_driver max98095_i2c_driver = {
         .driver = {
                 .name = "max98095",
                 .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(max98095_of_match),
         },
         .probe  = max98095_i2c_probe,
         .remove = max98095_i2c_remove,
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index 2c59b1fb69dc..9965277b595a 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -22,6 +22,7 @@
  */
 #include <linux/module.h>
 #include <linux/device.h>
+#include <linux/of.h>
 #include <linux/mfd/mc13xxx.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -409,7 +410,7 @@ static const char * const adcl_enum_text[] = {
 static SOC_ENUM_SINGLE_VIRT_DECL(adcl_enum, adcl_enum_text);
 
 static const struct snd_kcontrol_new left_input_mux =
-        SOC_DAPM_ENUM_VIRT("Route", adcl_enum);
+        SOC_DAPM_ENUM("Route", adcl_enum);
 
 static const char * const adcr_enum_text[] = {
         "MC1R", "MC2", "RXINR", "TXIN",
@@ -418,7 +419,7 @@ static const char * const adcr_enum_text[] = {
 static SOC_ENUM_SINGLE_VIRT_DECL(adcr_enum, adcr_enum_text);
 
 static const struct snd_kcontrol_new right_input_mux =
-        SOC_DAPM_ENUM_VIRT("Route", adcr_enum);
+        SOC_DAPM_ENUM("Route", adcr_enum);
 
 static const struct snd_kcontrol_new samp_ctl =
         SOC_DAPM_SINGLE("Switch", MC13783_AUDIO_RX0, 3, 1, 0);
@@ -478,9 +479,9 @@ static const struct snd_soc_dapm_widget mc13783_dapm_widgets[] = {
         SND_SOC_DAPM_SWITCH("MC2 Amp", MC13783_AUDIO_TX, 9, 0, &mc2_amp_ctl),
         SND_SOC_DAPM_SWITCH("TXIN Amp", MC13783_AUDIO_TX, 11, 0, &atx_amp_ctl),
 
-        SND_SOC_DAPM_VIRT_MUX("PGA Left Input Mux", SND_SOC_NOPM, 0, 0,
+        SND_SOC_DAPM_MUX("PGA Left Input Mux", SND_SOC_NOPM, 0, 0,
                               &left_input_mux),
-        SND_SOC_DAPM_VIRT_MUX("PGA Right Input Mux", SND_SOC_NOPM, 0, 0,
+        SND_SOC_DAPM_MUX("PGA Right Input Mux", SND_SOC_NOPM, 0, 0,
                               &right_input_mux),
 
         SND_SOC_DAPM_MUX("Speaker Amp Source MUX", SND_SOC_NOPM, 0, 0,
@@ -608,14 +609,6 @@ static struct snd_kcontrol_new mc13783_control_list[] = {
 static int mc13783_probe(struct snd_soc_codec *codec)
 {
         struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);
-        int ret;
-
-        ret = snd_soc_codec_set_cache_io(codec,
-                        dev_get_regmap(codec->dev->parent, NULL));
-        if (ret != 0) {
-                dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
-                return ret;
-        }
 
         /* these are the reset values */
         mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX0, 0x25893);
@@ -735,9 +728,15 @@ static struct snd_soc_dai_driver mc13783_dai_sync[] = {
         }
 };
 
+static struct regmap *mc13783_get_regmap(struct device *dev)
+{
+        return dev_get_regmap(dev->parent, NULL);
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_mc13783 = {
         .probe          = mc13783_probe,
         .remove         = mc13783_remove,
+        .get_regmap     = mc13783_get_regmap,
         .controls       = mc13783_control_list,
         .num_controls   = ARRAY_SIZE(mc13783_control_list),
         .dapm_widgets   = mc13783_dapm_widgets,
@@ -750,6 +749,7 @@ static int __init mc13783_codec_probe(struct platform_device *pdev)
 {
         struct mc13783_priv *priv;
         struct mc13xxx_codec_platform_data *pdata = pdev->dev.platform_data;
+        struct device_node *np;
         int ret;
 
         priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
@@ -760,7 +760,17 @@ static int __init mc13783_codec_probe(struct platform_device *pdev)
                 priv->adc_ssi_port = pdata->adc_ssi_port;
                 priv->dac_ssi_port = pdata->dac_ssi_port;
         } else {
-                return -ENOSYS;
+                np = of_get_child_by_name(pdev->dev.parent->of_node, "codec");
+                if (!np)
+                        return -ENOSYS;
+
+                ret = of_property_read_u32(np, "adc-port", &priv->adc_ssi_port);
+                if (ret)
+                        return ret;
+
+                ret = of_property_read_u32(np, "dac-port", &priv->dac_ssi_port);
+                if (ret)
+                        return ret;
         }
 
         dev_set_drvdata(&pdev->dev, priv);
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index e427544183d7..a722a023c262 100644
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -115,7 +115,7 @@ static int pcm1681_set_deemph(struct snd_soc_codec *codec)
 static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = priv->deemph;
@@ -126,7 +126,7 @@ static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol,
 static int pcm1681_put_deemph(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec);
 
         priv->deemph = ucontrol->value.enumerated.item[0];
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index 4b4c0c7bb918..163ec3855fd4 100644
--- a/sound/soc/codecs/pcm512x.c
+++ b/sound/soc/codecs/pcm512x.c
@@ -269,7 +269,7 @@ SOC_DOUBLE("Playback Digital Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,
            PCM512x_RQMR_SHIFT, 1, 1),
 
 SOC_SINGLE("Deemphasis Switch", PCM512x_DSP, PCM512x_DEMP_SHIFT, 1, 1),
-SOC_VALUE_ENUM("DSP Program", pcm512x_dsp_program),
+SOC_ENUM("DSP Program", pcm512x_dsp_program),
 
 SOC_ENUM("Clock Missing Period", pcm512x_clk_missing),
 SOC_ENUM("Auto Mute Time Left", pcm512x_autom_l),
@@ -517,6 +517,7 @@ void pcm512x_remove(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(pcm512x_remove);
 
+#ifdef CONFIG_PM_RUNTIME
 static int pcm512x_suspend(struct device *dev)
 {
         struct pcm512x_priv *pcm512x = dev_get_drvdata(dev);
@@ -578,6 +579,7 @@ static int pcm512x_resume(struct device *dev)
 
         return 0;
 }
+#endif
 
 const struct dev_pm_ops pcm512x_pm_ops = {
         SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL)
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c
index d4c229f0233f..30e234708579 100644
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -188,7 +188,7 @@ static unsigned int mic_bst_tlv[] = {
 static int rt5631_dmic_get(struct snd_kcontrol *kcontrol,
                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = rt5631->dmic_used_flag;
@@ -199,7 +199,7 @@ static int rt5631_dmic_get(struct snd_kcontrol *kcontrol,
 static int rt5631_dmic_put(struct snd_kcontrol *kcontrol,
                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec);
 
         rt5631->dmic_used_flag = ucontrol->value.integer.value[0];
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 68b4dd622b87..9e0d48f98927 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -1,5 +1,5 @@
 /*
- * rt5640.c  --  RT5640 ALSA SoC audio codec driver
+ * rt5640.c  --  RT5640/RT5639 ALSA SoC audio codec driver
  *
  * Copyright 2011 Realtek Semiconductor Corp.
  * Author: Johnny Hsu <johnnyhsu@realtek.com>
@@ -18,6 +18,7 @@
 #include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
+#include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
@@ -59,7 +60,7 @@ static struct reg_default init_list[] = {
 };
 #define RT5640_INIT_REG_LEN ARRAY_SIZE(init_list)
 
-static const struct reg_default rt5640_reg[RT5640_VENDOR_ID2 + 1] = {
+static const struct reg_default rt5640_reg[] = {
         { 0x00, 0x000e },
         { 0x01, 0xc8c8 },
         { 0x02, 0xc8c8 },
@@ -398,18 +399,13 @@ static const struct snd_kcontrol_new rt5640_snd_controls[] = {
                 RT5640_VOL_L_SFT, RT5640_VOL_R_SFT, 1, 1),
         SOC_DOUBLE_TLV("OUT Playback Volume", RT5640_OUTPUT,
                 RT5640_L_VOL_SFT, RT5640_R_VOL_SFT, 39, 1, out_vol_tlv),
-        /* MONO Output Control */
-        SOC_SINGLE("Mono Playback Switch", RT5640_MONO_OUT,
-                                RT5640_L_MUTE_SFT, 1, 1),
+
         /* DAC Digital Volume */
         SOC_DOUBLE("DAC2 Playback Switch", RT5640_DAC2_CTRL,
                 RT5640_M_DAC_L2_VOL_SFT, RT5640_M_DAC_R2_VOL_SFT, 1, 1),
         SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5640_DAC1_DIG_VOL,
                         RT5640_L_VOL_SFT, RT5640_R_VOL_SFT,
                         175, 0, dac_vol_tlv),
-        SOC_DOUBLE_TLV("Mono DAC Playback Volume", RT5640_DAC2_DIG_VOL,
-                        RT5640_L_VOL_SFT, RT5640_R_VOL_SFT,
-                        175, 0, dac_vol_tlv),
         /* IN1/IN2 Control */
         SOC_SINGLE_TLV("IN1 Boost", RT5640_IN1_IN2,
                 RT5640_BST_SFT1, 8, 0, bst_tlv),
@@ -441,6 +437,15 @@ static const struct snd_kcontrol_new rt5640_snd_controls[] = {
         SOC_ENUM("DAC IF2 Data Switch", rt5640_if2_dac_enum),
 };
 
+static const struct snd_kcontrol_new rt5640_specific_snd_controls[] = {
+        /* MONO Output Control */
+        SOC_SINGLE("Mono Playback Switch", RT5640_MONO_OUT, RT5640_L_MUTE_SFT,
+                1, 1),
+
+        SOC_DOUBLE_TLV("Mono DAC Playback Volume", RT5640_DAC2_DIG_VOL,
+                RT5640_L_VOL_SFT, RT5640_R_VOL_SFT, 175, 0, dac_vol_tlv),
+};
+
 /**
  * set_dmic_clk - Set parameter of dmic.
  *
@@ -480,14 +485,14 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w,
         return idx;
 }
 
-static int check_sysclk1_source(struct snd_soc_dapm_widget *source,
+static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
         unsigned int val;
 
         val = snd_soc_read(source->codec, RT5640_GLB_CLK);
         val &= RT5640_SCLK_SRC_MASK;
-        if (val == RT5640_SCLK_SRC_PLL1 || val == RT5640_SCLK_SRC_PLL1T)
+        if (val == RT5640_SCLK_SRC_PLL1)
                 return 1;
         else
                 return 0;
@@ -554,6 +559,20 @@ static const struct snd_kcontrol_new rt5640_sto_dac_r_mix[] = {
                         RT5640_M_ANC_DAC_R_SFT, 1, 1),
 };
 
+static const struct snd_kcontrol_new rt5639_sto_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5640_STO_DAC_MIXER,
+                        RT5640_M_DAC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5640_STO_DAC_MIXER,
+                        RT5640_M_DAC_L2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5639_sto_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5640_STO_DAC_MIXER,
+                        RT5640_M_DAC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5640_STO_DAC_MIXER,
+                        RT5640_M_DAC_R2_SFT, 1, 1),
+};
+
 static const struct snd_kcontrol_new rt5640_mono_dac_l_mix[] = {
         SOC_DAPM_SINGLE("DAC L1 Switch", RT5640_MONO_DAC_MIXER,
                         RT5640_M_DAC_L1_MONO_L_SFT, 1, 1),
@@ -676,6 +695,30 @@ static const struct snd_kcontrol_new rt5640_out_r_mix[] = {
                         RT5640_M_DAC_R1_OM_R_SFT, 1, 1),
 };
 
+static const struct snd_kcontrol_new rt5639_out_l_mix[] = {
+        SOC_DAPM_SINGLE("BST1 Switch", RT5640_OUT_L3_MIXER,
+                        RT5640_M_BST1_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INL Switch", RT5640_OUT_L3_MIXER,
+                        RT5640_M_IN_L_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("REC MIXL Switch", RT5640_OUT_L3_MIXER,
+                        RT5640_M_RM_L_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5640_OUT_L3_MIXER,
+                        RT5640_M_DAC_L1_OM_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5639_out_r_mix[] = {
+        SOC_DAPM_SINGLE("BST2 Switch", RT5640_OUT_R3_MIXER,
+                        RT5640_M_BST4_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5640_OUT_R3_MIXER,
+                        RT5640_M_BST1_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5640_OUT_R3_MIXER,
+                        RT5640_M_IN_R_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("REC MIXR Switch", RT5640_OUT_R3_MIXER,
+                        RT5640_M_RM_R_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5640_OUT_R3_MIXER,
+                        RT5640_M_DAC_R1_OM_R_SFT, 1, 1),
+};
+
 static const struct snd_kcontrol_new rt5640_spo_l_mix[] = {
         SOC_DAPM_SINGLE("DAC R1 Switch", RT5640_SPO_L_MIXER,
                         RT5640_M_DAC_R1_SPM_L_SFT, 1, 1),
@@ -707,6 +750,13 @@ static const struct snd_kcontrol_new rt5640_hpo_mix[] = {
                         RT5640_M_HPVOL_HM_SFT, 1, 1),
 };
 
+static const struct snd_kcontrol_new rt5639_hpo_mix[] = {
+        SOC_DAPM_SINGLE("HPO MIX DAC1 Switch", RT5640_HPO_MIXER,
+                        RT5640_M_DAC1_HM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("HPO MIX HPVOL Switch", RT5640_HPO_MIXER,
+                        RT5640_M_HPVOL_HM_SFT, 1, 1),
+};
+
 static const struct snd_kcontrol_new rt5640_lout_mix[] = {
         SOC_DAPM_SINGLE("DAC L1 Switch", RT5640_LOUT_MIXER,
                         RT5640_M_DAC_L1_LM_SFT, 1, 1),
@@ -824,7 +874,7 @@ static SOC_VALUE_ENUM_SINGLE_DECL(rt5640_dac_l2_enum,
                                   0x3, rt5640_dac_l2_src, rt5640_dac_l2_values);
 
 static const struct snd_kcontrol_new rt5640_dac_l2_mux =
-        SOC_DAPM_VALUE_ENUM("DAC2 left channel source", rt5640_dac_l2_enum);
+        SOC_DAPM_ENUM("DAC2 left channel source", rt5640_dac_l2_enum);
 
 static const char * const rt5640_dac_r2_src[] = {
         "IF2",
@@ -859,7 +909,7 @@ static SOC_VALUE_ENUM_SINGLE_DECL(rt5640_dai_iis_map_enum,
                                   rt5640_dai_iis_map_values);
 
 static const struct snd_kcontrol_new rt5640_dai_mux =
-        SOC_DAPM_VALUE_ENUM("DAI select", rt5640_dai_iis_map_enum);
+        SOC_DAPM_ENUM("DAI select", rt5640_dai_iis_map_enum);
 
 /* SDI select */
 static const char * const rt5640_sdi_sel[] = {
@@ -872,54 +922,6 @@ static SOC_ENUM_SINGLE_DECL(rt5640_sdi_sel_enum, RT5640_I2S2_SDP,
 static const struct snd_kcontrol_new rt5640_sdi_mux =
         SOC_DAPM_ENUM("SDI select", rt5640_sdi_sel_enum);
 
-static int rt5640_set_dmic1_event(struct snd_soc_dapm_widget *w,
-        struct snd_kcontrol *kcontrol, int event)
-{
-        struct snd_soc_codec *codec = w->codec;
-
-        switch (event) {
-        case SND_SOC_DAPM_PRE_PMU:
-                snd_soc_update_bits(codec, RT5640_GPIO_CTRL1,
-                        RT5640_GP2_PIN_MASK | RT5640_GP3_PIN_MASK,
-                        RT5640_GP2_PIN_DMIC1_SCL | RT5640_GP3_PIN_DMIC1_SDA);
-                snd_soc_update_bits(codec, RT5640_DMIC,
-                        RT5640_DMIC_1L_LH_MASK | RT5640_DMIC_1R_LH_MASK |
-                        RT5640_DMIC_1_DP_MASK,
-                        RT5640_DMIC_1L_LH_FALLING | RT5640_DMIC_1R_LH_RISING |
-                        RT5640_DMIC_1_DP_IN1P);
-                break;
-
-        default:
-                return 0;
-        }
-
-        return 0;
-}
-
-static int rt5640_set_dmic2_event(struct snd_soc_dapm_widget *w,
-        struct snd_kcontrol *kcontrol, int event)
-{
-        struct snd_soc_codec *codec = w->codec;
-
-        switch (event) {
-        case SND_SOC_DAPM_PRE_PMU:
-                snd_soc_update_bits(codec, RT5640_GPIO_CTRL1,
-                        RT5640_GP2_PIN_MASK | RT5640_GP4_PIN_MASK,
-                        RT5640_GP2_PIN_DMIC1_SCL | RT5640_GP4_PIN_DMIC2_SDA);
-                snd_soc_update_bits(codec, RT5640_DMIC,
-                        RT5640_DMIC_2L_LH_MASK | RT5640_DMIC_2R_LH_MASK |
-                        RT5640_DMIC_2_DP_MASK,
-                        RT5640_DMIC_2L_LH_FALLING | RT5640_DMIC_2R_LH_RISING |
-                        RT5640_DMIC_2_DP_IN1N);
-                break;
-
-        default:
-                return 0;
-        }
-
-        return 0;
-}
-
 static void hp_amp_power_on(struct snd_soc_codec *codec)
 {
         struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
@@ -1054,12 +1056,10 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = {
 
         SND_SOC_DAPM_SUPPLY("DMIC CLK", SND_SOC_NOPM, 0, 0,
                 set_dmic_clk, SND_SOC_DAPM_PRE_PMU),
-        SND_SOC_DAPM_SUPPLY("DMIC1 Power", RT5640_DMIC,
-                RT5640_DMIC_1_EN_SFT, 0, rt5640_set_dmic1_event,
-                SND_SOC_DAPM_PRE_PMU),
-        SND_SOC_DAPM_SUPPLY("DMIC2 Power", RT5640_DMIC,
-                RT5640_DMIC_2_EN_SFT, 0, rt5640_set_dmic2_event,
-                SND_SOC_DAPM_PRE_PMU),
+        SND_SOC_DAPM_SUPPLY("DMIC1 Power", RT5640_DMIC, RT5640_DMIC_1_EN_SFT, 0,
+                NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DMIC2 Power", RT5640_DMIC, RT5640_DMIC_2_EN_SFT, 0,
+                NULL, 0),
         /* Boost */
         SND_SOC_DAPM_PGA("BST1", RT5640_PWR_ANLG2,
                 RT5640_PWR_BST1_BIT, 0, NULL, 0),
@@ -1146,26 +1146,15 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = {
         SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),
         SND_SOC_DAPM_AIF_IN("AIF2RX", "AIF2 Playback", 0, SND_SOC_NOPM, 0, 0),
         SND_SOC_DAPM_AIF_OUT("AIF2TX", "AIF2 Capture", 0, SND_SOC_NOPM, 0, 0),
-        /* Audio DSP */
-        SND_SOC_DAPM_PGA("Audio DSP", SND_SOC_NOPM, 0, 0, NULL, 0),
-        /* ANC */
-        SND_SOC_DAPM_PGA("ANC", SND_SOC_NOPM, 0, 0, NULL, 0),
+
         /* Output Side */
         /* DAC mixer before sound effect  */
         SND_SOC_DAPM_MIXER("DAC MIXL", SND_SOC_NOPM, 0, 0,
                 rt5640_dac_l_mix, ARRAY_SIZE(rt5640_dac_l_mix)),
         SND_SOC_DAPM_MIXER("DAC MIXR", SND_SOC_NOPM, 0, 0,
                 rt5640_dac_r_mix, ARRAY_SIZE(rt5640_dac_r_mix)),
-        /* DAC2 channel Mux */
-        SND_SOC_DAPM_MUX("DAC L2 Mux", SND_SOC_NOPM, 0, 0,
-                                &rt5640_dac_l2_mux),
-        SND_SOC_DAPM_MUX("DAC R2 Mux", SND_SOC_NOPM, 0, 0,
-                                &rt5640_dac_r2_mux),
+
         /* DAC Mixer */
-        SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,
-                rt5640_sto_dac_l_mix, ARRAY_SIZE(rt5640_sto_dac_l_mix)),
-        SND_SOC_DAPM_MIXER("Stereo DAC MIXR", SND_SOC_NOPM, 0, 0,
-                rt5640_sto_dac_r_mix, ARRAY_SIZE(rt5640_sto_dac_r_mix)),
         SND_SOC_DAPM_MIXER("Mono DAC MIXL", SND_SOC_NOPM, 0, 0,
                 rt5640_mono_dac_l_mix, ARRAY_SIZE(rt5640_mono_dac_l_mix)),
         SND_SOC_DAPM_MIXER("Mono DAC MIXR", SND_SOC_NOPM, 0, 0,
@@ -1177,21 +1166,14 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = {
         /* DACs */
         SND_SOC_DAPM_DAC("DAC L1", NULL, RT5640_PWR_DIG1,
                         RT5640_PWR_DAC_L1_BIT, 0),
-        SND_SOC_DAPM_DAC("DAC L2", NULL, RT5640_PWR_DIG1,
-                        RT5640_PWR_DAC_L2_BIT, 0),
         SND_SOC_DAPM_DAC("DAC R1", NULL, RT5640_PWR_DIG1,
                         RT5640_PWR_DAC_R1_BIT, 0),
-        SND_SOC_DAPM_DAC("DAC R2", NULL, RT5640_PWR_DIG1,
-                        RT5640_PWR_DAC_R2_BIT, 0),
+
         /* SPK/OUT Mixer */
         SND_SOC_DAPM_MIXER("SPK MIXL", RT5640_PWR_MIXER, RT5640_PWR_SM_L_BIT,
                 0, rt5640_spk_l_mix, ARRAY_SIZE(rt5640_spk_l_mix)),
         SND_SOC_DAPM_MIXER("SPK MIXR", RT5640_PWR_MIXER, RT5640_PWR_SM_R_BIT,
                 0, rt5640_spk_r_mix, ARRAY_SIZE(rt5640_spk_r_mix)),
-        SND_SOC_DAPM_MIXER("OUT MIXL", RT5640_PWR_MIXER, RT5640_PWR_OM_L_BIT,
-                0, rt5640_out_l_mix, ARRAY_SIZE(rt5640_out_l_mix)),
-        SND_SOC_DAPM_MIXER("OUT MIXR", RT5640_PWR_MIXER, RT5640_PWR_OM_R_BIT,
-                0, rt5640_out_r_mix, ARRAY_SIZE(rt5640_out_r_mix)),
         /* Ouput Volume */
         SND_SOC_DAPM_PGA("SPKVOL L", RT5640_PWR_VOL,
                 RT5640_PWR_SV_L_BIT, 0, NULL, 0),
@@ -1210,16 +1192,8 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = {
                 0, rt5640_spo_l_mix, ARRAY_SIZE(rt5640_spo_l_mix)),
         SND_SOC_DAPM_MIXER("SPOR MIX", SND_SOC_NOPM, 0,
                 0, rt5640_spo_r_mix, ARRAY_SIZE(rt5640_spo_r_mix)),
-        SND_SOC_DAPM_MIXER("HPO MIX L", SND_SOC_NOPM, 0, 0,
-                rt5640_hpo_mix, ARRAY_SIZE(rt5640_hpo_mix)),
-        SND_SOC_DAPM_MIXER("HPO MIX R", SND_SOC_NOPM, 0, 0,
-                rt5640_hpo_mix, ARRAY_SIZE(rt5640_hpo_mix)),
         SND_SOC_DAPM_MIXER("LOUT MIX", RT5640_PWR_ANLG1, RT5640_PWR_LM_BIT, 0,
                 rt5640_lout_mix, ARRAY_SIZE(rt5640_lout_mix)),
-        SND_SOC_DAPM_MIXER("Mono MIX", RT5640_PWR_ANLG1, RT5640_PWR_MM_BIT, 0,
-                rt5640_mono_mix, ARRAY_SIZE(rt5640_mono_mix)),
-        SND_SOC_DAPM_SUPPLY("Improve MONO Amp Drv", RT5640_PWR_ANLG1,
-                RT5640_PWR_MA_BIT, 0, NULL, 0),
         SND_SOC_DAPM_SUPPLY_S("Improve HP Amp Drv", 1, SND_SOC_NOPM,
                 0, 0, rt5640_hp_power_event, SND_SOC_DAPM_POST_PMU),
         SND_SOC_DAPM_PGA_S("HP Amp", 1, SND_SOC_NOPM, 0, 0,
@@ -1251,10 +1225,69 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = {
         SND_SOC_DAPM_OUTPUT("HPOR"),
         SND_SOC_DAPM_OUTPUT("LOUTL"),
         SND_SOC_DAPM_OUTPUT("LOUTR"),
+};
+
+static const struct snd_soc_dapm_widget rt5640_specific_dapm_widgets[] = {
+        /* Audio DSP */
+        SND_SOC_DAPM_PGA("Audio DSP", SND_SOC_NOPM, 0, 0, NULL, 0),
+        /* ANC */
+        SND_SOC_DAPM_PGA("ANC", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        /* DAC2 channel Mux */
+        SND_SOC_DAPM_MUX("DAC L2 Mux", SND_SOC_NOPM, 0, 0, &rt5640_dac_l2_mux),
+        SND_SOC_DAPM_MUX("DAC R2 Mux", SND_SOC_NOPM, 0, 0, &rt5640_dac_r2_mux),
+
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5640_sto_dac_l_mix, ARRAY_SIZE(rt5640_sto_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5640_sto_dac_r_mix, ARRAY_SIZE(rt5640_sto_dac_r_mix)),
+
+        SND_SOC_DAPM_DAC("DAC R2", NULL, RT5640_PWR_DIG1, RT5640_PWR_DAC_R2_BIT,
+                0),
+        SND_SOC_DAPM_DAC("DAC L2", NULL, RT5640_PWR_DIG1, RT5640_PWR_DAC_L2_BIT,
+                0),
+
+        SND_SOC_DAPM_MIXER("OUT MIXL", RT5640_PWR_MIXER, RT5640_PWR_OM_L_BIT,
+                0, rt5640_out_l_mix, ARRAY_SIZE(rt5640_out_l_mix)),
+        SND_SOC_DAPM_MIXER("OUT MIXR", RT5640_PWR_MIXER, RT5640_PWR_OM_R_BIT,
+                0, rt5640_out_r_mix, ARRAY_SIZE(rt5640_out_r_mix)),
+
+        SND_SOC_DAPM_MIXER("HPO MIX L", SND_SOC_NOPM, 0, 0,
+                rt5640_hpo_mix, ARRAY_SIZE(rt5640_hpo_mix)),
+        SND_SOC_DAPM_MIXER("HPO MIX R", SND_SOC_NOPM, 0, 0,
+                rt5640_hpo_mix, ARRAY_SIZE(rt5640_hpo_mix)),
+
+        SND_SOC_DAPM_MIXER("Mono MIX", RT5640_PWR_ANLG1, RT5640_PWR_MM_BIT, 0,
+                rt5640_mono_mix, ARRAY_SIZE(rt5640_mono_mix)),
+        SND_SOC_DAPM_SUPPLY("Improve MONO Amp Drv", RT5640_PWR_ANLG1,
+                RT5640_PWR_MA_BIT, 0, NULL, 0),
+
         SND_SOC_DAPM_OUTPUT("MONOP"),
         SND_SOC_DAPM_OUTPUT("MONON"),
 };
 
+static const struct snd_soc_dapm_widget rt5639_specific_dapm_widgets[] = {
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5639_sto_dac_l_mix, ARRAY_SIZE(rt5639_sto_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5639_sto_dac_r_mix, ARRAY_SIZE(rt5639_sto_dac_r_mix)),
+
+        SND_SOC_DAPM_SUPPLY("DAC L2 Filter", RT5640_PWR_DIG1,
+                RT5640_PWR_DAC_L2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DAC R2 Filter", RT5640_PWR_DIG1,
+                RT5640_PWR_DAC_R2_BIT, 0, NULL, 0),
+
+        SND_SOC_DAPM_MIXER("OUT MIXL", RT5640_PWR_MIXER, RT5640_PWR_OM_L_BIT,
+                0, rt5639_out_l_mix, ARRAY_SIZE(rt5639_out_l_mix)),
+        SND_SOC_DAPM_MIXER("OUT MIXR", RT5640_PWR_MIXER, RT5640_PWR_OM_R_BIT,
+                0, rt5639_out_r_mix, ARRAY_SIZE(rt5639_out_r_mix)),
+
+        SND_SOC_DAPM_MIXER("HPO MIX L", SND_SOC_NOPM, 0, 0,
+                rt5639_hpo_mix, ARRAY_SIZE(rt5639_hpo_mix)),
+        SND_SOC_DAPM_MIXER("HPO MIX R", SND_SOC_NOPM, 0, 0,
+                rt5639_hpo_mix, ARRAY_SIZE(rt5639_hpo_mix)),
+};
+
 static const struct snd_soc_dapm_route rt5640_dapm_routes[] = {
         {"IN1P", NULL, "LDO2"},
         {"IN2P", NULL, "LDO2"},
@@ -1323,22 +1356,22 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = {
         {"Stereo ADC MIXL", "ADC1 Switch", "Stereo ADC L1 Mux"},
         {"Stereo ADC MIXL", "ADC2 Switch", "Stereo ADC L2 Mux"},
         {"Stereo ADC MIXL", NULL, "Stereo Filter"},
-        {"Stereo Filter", NULL, "PLL1", check_sysclk1_source},
+        {"Stereo Filter", NULL, "PLL1", is_sys_clk_from_pll},
 
         {"Stereo ADC MIXR", "ADC1 Switch", "Stereo ADC R1 Mux"},
         {"Stereo ADC MIXR", "ADC2 Switch", "Stereo ADC R2 Mux"},
         {"Stereo ADC MIXR", NULL, "Stereo Filter"},
-        {"Stereo Filter", NULL, "PLL1", check_sysclk1_source},
+        {"Stereo Filter", NULL, "PLL1", is_sys_clk_from_pll},
 
         {"Mono ADC MIXL", "ADC1 Switch", "Mono ADC L1 Mux"},
         {"Mono ADC MIXL", "ADC2 Switch", "Mono ADC L2 Mux"},
         {"Mono ADC MIXL", NULL, "Mono Left Filter"},
-        {"Mono Left Filter", NULL, "PLL1", check_sysclk1_source},
+        {"Mono Left Filter", NULL, "PLL1", is_sys_clk_from_pll},
 
         {"Mono ADC MIXR", "ADC1 Switch", "Mono ADC R1 Mux"},
         {"Mono ADC MIXR", "ADC2 Switch", "Mono ADC R2 Mux"},
         {"Mono ADC MIXR", NULL, "Mono Right Filter"},
-        {"Mono Right Filter", NULL, "PLL1", check_sysclk1_source},
+        {"Mono Right Filter", NULL, "PLL1", is_sys_clk_from_pll},
 
         {"IF2 ADC L", NULL, "Mono ADC MIXL"},
         {"IF2 ADC R", NULL, "Mono ADC MIXR"},
@@ -1396,71 +1429,38 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = {
         {"DAC MIXR", "Stereo ADC Switch", "Stereo ADC MIXR"},
         {"DAC MIXR", "INF1 Switch", "IF1 DAC R"},
 
-        {"ANC", NULL, "Stereo ADC MIXL"},
-        {"ANC", NULL, "Stereo ADC MIXR"},
-
-        {"Audio DSP", NULL, "DAC MIXL"},
-        {"Audio DSP", NULL, "DAC MIXR"},
-
-        {"DAC L2 Mux", "IF2", "IF2 DAC L"},
-        {"DAC L2 Mux", "Base L/R", "Audio DSP"},
-
-        {"DAC R2 Mux", "IF2", "IF2 DAC R"},
-
         {"Stereo DAC MIXL", "DAC L1 Switch", "DAC MIXL"},
-        {"Stereo DAC MIXL", "DAC L2 Switch", "DAC L2 Mux"},
-        {"Stereo DAC MIXL", "ANC Switch", "ANC"},
         {"Stereo DAC MIXR", "DAC R1 Switch", "DAC MIXR"},
-        {"Stereo DAC MIXR", "DAC R2 Switch", "DAC R2 Mux"},
-        {"Stereo DAC MIXR", "ANC Switch", "ANC"},
 
         {"Mono DAC MIXL", "DAC L1 Switch", "DAC MIXL"},
-        {"Mono DAC MIXL", "DAC L2 Switch", "DAC L2 Mux"},
-        {"Mono DAC MIXL", "DAC R2 Switch", "DAC R2 Mux"},
         {"Mono DAC MIXR", "DAC R1 Switch", "DAC MIXR"},
-        {"Mono DAC MIXR", "DAC R2 Switch", "DAC R2 Mux"},
-        {"Mono DAC MIXR", "DAC L2 Switch", "DAC L2 Mux"},
 
         {"DIG MIXL", "DAC L1 Switch", "DAC MIXL"},
-        {"DIG MIXL", "DAC L2 Switch", "DAC L2 Mux"},
         {"DIG MIXR", "DAC R1 Switch", "DAC MIXR"},
-        {"DIG MIXR", "DAC R2 Switch", "DAC R2 Mux"},
 
         {"DAC L1", NULL, "Stereo DAC MIXL"},
-        {"DAC L1", NULL, "PLL1", check_sysclk1_source},
+        {"DAC L1", NULL, "PLL1", is_sys_clk_from_pll},
         {"DAC R1", NULL, "Stereo DAC MIXR"},
-        {"DAC R1", NULL, "PLL1", check_sysclk1_source},
-        {"DAC L2", NULL, "Mono DAC MIXL"},
-        {"DAC L2", NULL, "PLL1", check_sysclk1_source},
-        {"DAC R2", NULL, "Mono DAC MIXR"},
-        {"DAC R2", NULL, "PLL1", check_sysclk1_source},
+        {"DAC R1", NULL, "PLL1", is_sys_clk_from_pll},
 
         {"SPK MIXL", "REC MIXL Switch", "RECMIXL"},
         {"SPK MIXL", "INL Switch", "INL VOL"},
         {"SPK MIXL", "DAC L1 Switch", "DAC L1"},
-        {"SPK MIXL", "DAC L2 Switch", "DAC L2"},
         {"SPK MIXL", "OUT MIXL Switch", "OUT MIXL"},
         {"SPK MIXR", "REC MIXR Switch", "RECMIXR"},
         {"SPK MIXR", "INR Switch", "INR VOL"},
         {"SPK MIXR", "DAC R1 Switch", "DAC R1"},
-        {"SPK MIXR", "DAC R2 Switch", "DAC R2"},
         {"SPK MIXR", "OUT MIXR Switch", "OUT MIXR"},
 
-        {"OUT MIXL", "SPK MIXL Switch", "SPK MIXL"},
         {"OUT MIXL", "BST1 Switch", "BST1"},
         {"OUT MIXL", "INL Switch", "INL VOL"},
         {"OUT MIXL", "REC MIXL Switch", "RECMIXL"},
-        {"OUT MIXL", "DAC R2 Switch", "DAC R2"},
-        {"OUT MIXL", "DAC L2 Switch", "DAC L2"},
         {"OUT MIXL", "DAC L1 Switch", "DAC L1"},
 
-        {"OUT MIXR", "SPK MIXR Switch", "SPK MIXR"},
         {"OUT MIXR", "BST2 Switch", "BST2"},
         {"OUT MIXR", "BST1 Switch", "BST1"},
         {"OUT MIXR", "INR Switch", "INR VOL"},
         {"OUT MIXR", "REC MIXR Switch", "RECMIXR"},
-        {"OUT MIXR", "DAC L2 Switch", "DAC L2"},
-        {"OUT MIXR", "DAC R2 Switch", "DAC R2"},
         {"OUT MIXR", "DAC R1 Switch", "DAC R1"},
 
         {"SPKVOL L", NULL, "SPK MIXL"},
@@ -1479,11 +1479,9 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = {
         {"SPOR MIX", "SPKVOL R Switch", "SPKVOL R"},
         {"SPOR MIX", "BST1 Switch", "BST1"},
 
-        {"HPO MIX L", "HPO MIX DAC2 Switch", "DAC L2"},
         {"HPO MIX L", "HPO MIX DAC1 Switch", "DAC L1"},
         {"HPO MIX L", "HPO MIX HPVOL Switch", "HPOVOL L"},
         {"HPO MIX L", NULL, "HP L Amp"},
-        {"HPO MIX R", "HPO MIX DAC2 Switch", "DAC R2"},
         {"HPO MIX R", "HPO MIX DAC1 Switch", "DAC R1"},
         {"HPO MIX R", "HPO MIX HPVOL Switch", "HPOVOL R"},
         {"HPO MIX R", NULL, "HP R Amp"},
@@ -1493,12 +1491,6 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = {
         {"LOUT MIX", "OUTVOL L Switch", "OUTVOL L"},
         {"LOUT MIX", "OUTVOL R Switch", "OUTVOL R"},
 
-        {"Mono MIX", "DAC R2 Switch", "DAC R2"},
-        {"Mono MIX", "DAC L2 Switch", "DAC L2"},
-        {"Mono MIX", "OUTVOL R Switch", "OUTVOL R"},
-        {"Mono MIX", "OUTVOL L Switch", "OUTVOL L"},
-        {"Mono MIX", "BST1 Switch", "BST1"},
-
         {"HP Amp", NULL, "HPO MIX L"},
         {"HP Amp", NULL, "HPO MIX R"},
 
@@ -1523,11 +1515,82 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = {
         {"HPOR", NULL, "HP R Playback"},
         {"LOUTL", NULL, "LOUT MIX"},
         {"LOUTR", NULL, "LOUT MIX"},
+};
+
+static const struct snd_soc_dapm_route rt5640_specific_dapm_routes[] = {
+        {"ANC", NULL, "Stereo ADC MIXL"},
+        {"ANC", NULL, "Stereo ADC MIXR"},
+
+        {"Audio DSP", NULL, "DAC MIXL"},
+        {"Audio DSP", NULL, "DAC MIXR"},
+
+        {"DAC L2 Mux", "IF2", "IF2 DAC L"},
+        {"DAC L2 Mux", "Base L/R", "Audio DSP"},
+
+        {"DAC R2 Mux", "IF2", "IF2 DAC R"},
+
+        {"Stereo DAC MIXL", "DAC L2 Switch", "DAC L2 Mux"},
+        {"Stereo DAC MIXL", "ANC Switch", "ANC"},
+        {"Stereo DAC MIXR", "DAC R2 Switch", "DAC R2 Mux"},
+        {"Stereo DAC MIXR", "ANC Switch", "ANC"},
+
+        {"Mono DAC MIXL", "DAC L2 Switch", "DAC L2 Mux"},
+        {"Mono DAC MIXL", "DAC R2 Switch", "DAC R2 Mux"},
+
+        {"Mono DAC MIXR", "DAC R2 Switch", "DAC R2 Mux"},
+        {"Mono DAC MIXR", "DAC L2 Switch", "DAC L2 Mux"},
+
+        {"DIG MIXR", "DAC R2 Switch", "DAC R2 Mux"},
+        {"DIG MIXL", "DAC L2 Switch", "DAC L2 Mux"},
+
+        {"DAC L2", NULL, "Mono DAC MIXL"},
+        {"DAC L2", NULL, "PLL1", is_sys_clk_from_pll},
+        {"DAC R2", NULL, "Mono DAC MIXR"},
+        {"DAC R2", NULL, "PLL1", is_sys_clk_from_pll},
+
+        {"SPK MIXL", "DAC L2 Switch", "DAC L2"},
+        {"SPK MIXR", "DAC R2 Switch", "DAC R2"},
+
+        {"OUT MIXL", "SPK MIXL Switch", "SPK MIXL"},
+        {"OUT MIXR", "SPK MIXR Switch", "SPK MIXR"},
+
+        {"OUT MIXL", "DAC R2 Switch", "DAC R2"},
+        {"OUT MIXL", "DAC L2 Switch", "DAC L2"},
+
+        {"OUT MIXR", "DAC L2 Switch", "DAC L2"},
+        {"OUT MIXR", "DAC R2 Switch", "DAC R2"},
+
+        {"HPO MIX L", "HPO MIX DAC2 Switch", "DAC L2"},
+        {"HPO MIX R", "HPO MIX DAC2 Switch", "DAC R2"},
+
+        {"Mono MIX", "DAC R2 Switch", "DAC R2"},
+        {"Mono MIX", "DAC L2 Switch", "DAC L2"},
+        {"Mono MIX", "OUTVOL R Switch", "OUTVOL R"},
+        {"Mono MIX", "OUTVOL L Switch", "OUTVOL L"},
+        {"Mono MIX", "BST1 Switch", "BST1"},
+
         {"MONOP", NULL, "Mono MIX"},
         {"MONON", NULL, "Mono MIX"},
         {"MONOP", NULL, "Improve MONO Amp Drv"},
 };
 
+static const struct snd_soc_dapm_route rt5639_specific_dapm_routes[] = {
+        {"Stereo DAC MIXL", "DAC L2 Switch", "IF2 DAC L"},
+        {"Stereo DAC MIXR", "DAC R2 Switch", "IF2 DAC R"},
+
+        {"Mono DAC MIXL", "DAC L2 Switch", "IF2 DAC L"},
+        {"Mono DAC MIXL", "DAC R2 Switch", "IF2 DAC R"},
+
+        {"Mono DAC MIXR", "DAC R2 Switch", "IF2 DAC R"},
+        {"Mono DAC MIXR", "DAC L2 Switch", "IF2 DAC L"},
+
+        {"DIG MIXL", "DAC L2 Switch", "IF2 DAC L"},
+        {"DIG MIXR", "DAC R2 Switch", "IF2 DAC R"},
+
+        {"IF2 DAC L", NULL, "DAC L2 Filter"},
+        {"IF2 DAC R", NULL, "DAC R2 Filter"},
+};
+
 static int get_sdp_info(struct snd_soc_codec *codec, int dai_id)
 {
         int ret = 0, val;
@@ -1622,16 +1685,16 @@ static int rt5640_hw_params(struct snd_pcm_substream *substream,
         dev_dbg(dai->dev, "bclk_ms is %d and pre_div is %d for iis %d\n",
                                 bclk_ms, pre_div, dai->id);
 
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S16_LE:
+        switch (params_width(params)) {
+        case 16:
                 break;
-        case SNDRV_PCM_FORMAT_S20_3LE:
+        case 20:
                 val_len |= RT5640_I2S_DL_20;
                 break;
-        case SNDRV_PCM_FORMAT_S24_LE:
+        case 24:
                 val_len |= RT5640_I2S_DL_24;
                 break;
-        case SNDRV_PCM_FORMAT_S8:
+        case 8:
                 val_len |= RT5640_I2S_DL_8;
                 break;
         default:
@@ -1744,12 +1807,6 @@ static int rt5640_set_dai_sysclk(struct snd_soc_dai *dai,
         case RT5640_SCLK_S_PLL1:
                 reg_val |= RT5640_SCLK_SRC_PLL1;
                 break;
-        case RT5640_SCLK_S_PLL1_TK:
-                reg_val |= RT5640_SCLK_SRC_PLL1T;
-                break;
-        case RT5640_SCLK_S_RCCLK:
-                reg_val |= RT5640_SCLK_SRC_RCCLK;
-                break;
         default:
                 dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id);
                 return -EINVAL;
@@ -1890,11 +1947,9 @@ static int rt5640_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
 static int rt5640_set_bias_level(struct snd_soc_codec *codec,
                         enum snd_soc_bias_level level)
 {
-        struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);
         switch (level) {
         case SND_SOC_BIAS_STANDBY:
                 if (SND_SOC_BIAS_OFF == codec->dapm.bias_level) {
-                        regcache_cache_only(rt5640->regmap, false);
                         snd_soc_update_bits(codec, RT5640_PWR_ANLG1,
                                 RT5640_PWR_VREF1 | RT5640_PWR_MB |
                                 RT5640_PWR_BG | RT5640_PWR_VREF2,
@@ -1904,7 +1959,6 @@ static int rt5640_set_bias_level(struct snd_soc_codec *codec,
                         snd_soc_update_bits(codec, RT5640_PWR_ANLG1,
                                 RT5640_PWR_FV1 | RT5640_PWR_FV2,
                                 RT5640_PWR_FV1 | RT5640_PWR_FV2);
-                        regcache_sync(rt5640->regmap);
                         snd_soc_update_bits(codec, RT5640_DUMMY1,
                                                 0x0301, 0x0301);
                         snd_soc_update_bits(codec, RT5640_MICBIAS,
@@ -1938,13 +1992,39 @@ static int rt5640_probe(struct snd_soc_codec *codec)
 
         rt5640->codec = codec;
 
-        codec->dapm.idle_bias_off = 1;
         rt5640_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
         snd_soc_update_bits(codec, RT5640_DUMMY1, 0x0301, 0x0301);
         snd_soc_update_bits(codec, RT5640_MICBIAS, 0x0030, 0x0030);
         snd_soc_update_bits(codec, RT5640_DSP_PATH2, 0xfc00, 0x0c00);
 
+        switch (snd_soc_read(codec, RT5640_RESET) & RT5640_ID_MASK) {
+        case RT5640_ID_5640:
+        case RT5640_ID_5642:
+                snd_soc_add_codec_controls(codec,
+                        rt5640_specific_snd_controls,
+                        ARRAY_SIZE(rt5640_specific_snd_controls));
+                snd_soc_dapm_new_controls(&codec->dapm,
+                        rt5640_specific_dapm_widgets,
+                        ARRAY_SIZE(rt5640_specific_dapm_widgets));
+                snd_soc_dapm_add_routes(&codec->dapm,
+                        rt5640_specific_dapm_routes,
+                        ARRAY_SIZE(rt5640_specific_dapm_routes));
+                break;
+        case RT5640_ID_5639:
+                snd_soc_dapm_new_controls(&codec->dapm,
+                        rt5639_specific_dapm_widgets,
+                        ARRAY_SIZE(rt5639_specific_dapm_widgets));
+                snd_soc_dapm_add_routes(&codec->dapm,
+                        rt5639_specific_dapm_routes,
+                        ARRAY_SIZE(rt5639_specific_dapm_routes));
+                break;
+        default:
+                dev_err(codec->dev,
+                        "The driver is for RT5639 RT5640 or RT5642 only\n");
+                return -ENODEV;
+        }
+
         return 0;
 }
 
@@ -1979,6 +2059,9 @@ static int rt5640_resume(struct snd_soc_codec *codec)
                 msleep(400);
         }
 
+        regcache_cache_only(rt5640->regmap, false);
+        regcache_sync(rt5640->regmap);
+
         return 0;
 }
 #else
@@ -2044,6 +2127,7 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5640 = {
         .suspend = rt5640_suspend,
         .resume = rt5640_resume,
         .set_bias_level = rt5640_set_bias_level,
+        .idle_bias_off = true,
         .controls = rt5640_snd_controls,
         .num_controls = ARRAY_SIZE(rt5640_snd_controls),
         .dapm_widgets = rt5640_dapm_widgets,
@@ -2070,12 +2154,15 @@ static const struct regmap_config rt5640_regmap = {
 
 static const struct i2c_device_id rt5640_i2c_id[] = {
         { "rt5640", 0 },
+        { "rt5639", 0 },
+        { "rt5642", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id);
 
 #if defined(CONFIG_OF)
 static const struct of_device_id rt5640_of_match[] = {
+        { .compatible = "realtek,rt5639", },
         { .compatible = "realtek,rt5640", },
         {},
 };
@@ -2166,7 +2253,7 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,
         }
 
         regmap_read(rt5640->regmap, RT5640_VENDOR_ID2, &val);
-        if ((val != RT5640_DEVICE_ID)) {
+        if (val != RT5640_DEVICE_ID) {
                 dev_err(&i2c->dev,
                         "Device with ID register %x is not rt5640/39\n", val);
                 return -ENODEV;
@@ -2187,6 +2274,25 @@ static int rt5640_i2c_probe(struct i2c_client *i2c,
                 regmap_update_bits(rt5640->regmap, RT5640_IN3_IN4,
                                         RT5640_IN_DF2, RT5640_IN_DF2);
 
+        if (rt5640->pdata.dmic_en) {
+                regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
+                        RT5640_GP2_PIN_MASK, RT5640_GP2_PIN_DMIC1_SCL);
+
+                if (rt5640->pdata.dmic1_data_pin) {
+                        regmap_update_bits(rt5640->regmap, RT5640_DMIC,
+                                RT5640_DMIC_1_DP_MASK, RT5640_DMIC_1_DP_GPIO3);
+                        regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
+                                RT5640_GP3_PIN_MASK, RT5640_GP3_PIN_DMIC1_SDA);
+                }
+
+                if (rt5640->pdata.dmic2_data_pin) {
+                        regmap_update_bits(rt5640->regmap, RT5640_DMIC,
+                                RT5640_DMIC_2_DP_MASK, RT5640_DMIC_2_DP_GPIO4);
+                        regmap_update_bits(rt5640->regmap, RT5640_GPIO_CTRL1,
+                                RT5640_GP4_PIN_MASK, RT5640_GP4_PIN_DMIC2_SDA);
+                }
+        }
+
         rt5640->hp_mute = 1;
 
         ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5640,
@@ -2219,6 +2325,6 @@ static struct i2c_driver rt5640_i2c_driver = {
 };
 module_i2c_driver(rt5640_i2c_driver);
 
-MODULE_DESCRIPTION("ASoC RT5640 driver");
+MODULE_DESCRIPTION("ASoC RT5640/RT5639 driver");
 MODULE_AUTHOR("Johnny Hsu <johnnyhsu@realtek.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h
index 5e8df25a13f3..895ca149db2e 100644
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
@@ -192,6 +192,13 @@
 #define RT5640_R_VOL_MASK                       (0x3f)
 #define RT5640_R_VOL_SFT                        0
 
+/* SW Reset & Device ID (0x00) */
+#define RT5640_ID_MASK                          (0x3 << 1)
+#define RT5640_ID_5639                          (0x0 << 1)
+#define RT5640_ID_5640                          (0x2 << 1)
+#define RT5640_ID_5642                          (0x3 << 1)
+
+
 /* IN1 and IN2 Control (0x0d) */
 /* IN3 and IN4 Control (0x0e) */
 #define RT5640_BST_SFT1                         12
@@ -976,8 +983,6 @@
 #define RT5640_SCLK_SRC_SFT                     14
 #define RT5640_SCLK_SRC_MCLK                    (0x0 << 14)
 #define RT5640_SCLK_SRC_PLL1                    (0x1 << 14)
-#define RT5640_SCLK_SRC_PLL1T                   (0x2 << 14)
-#define RT5640_SCLK_SRC_RCCLK                   (0x3 << 14) /* 15MHz */
 #define RT5640_PLL1_SRC_MASK                    (0x3 << 12)
 #define RT5640_PLL1_SRC_SFT                     12
 #define RT5640_PLL1_SRC_MCLK                    (0x0 << 12)
@@ -2097,7 +2102,6 @@ struct rt5640_priv {
         int pll_in;
         int pll_out;
 
-        int dmic_en;
         bool hp_mute;
 };
 
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
new file mode 100644
index 000000000000..ab97d722e15d
--- /dev/null
+++ b/sound/soc/codecs/rt5645.c
@@ -0,0 +1,2475 @@
+/*
+ * rt5645.c  --  RT5645 ALSA SoC audio codec driver
+ *
+ * Copyright 2013 Realtek Semiconductor Corp.
+ * Author: Bard Liao <bardliao@realtek.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/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/i2c.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/jack.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+
+#include "rt5645.h"
+
+#define RT5645_DEVICE_ID 0x6308
+
+#define RT5645_PR_RANGE_BASE (0xff + 1)
+#define RT5645_PR_SPACING 0x100
+
+#define RT5645_PR_BASE (RT5645_PR_RANGE_BASE + (0 * RT5645_PR_SPACING))
+
+static const struct regmap_range_cfg rt5645_ranges[] = {
+        {
+                .name = "PR",
+                .range_min = RT5645_PR_BASE,
+                .range_max = RT5645_PR_BASE + 0xf8,
+                .selector_reg = RT5645_PRIV_INDEX,
+                .selector_mask = 0xff,
+                .selector_shift = 0x0,
+                .window_start = RT5645_PRIV_DATA,
+                .window_len = 0x1,
+        },
+};
+
+static const struct reg_default init_list[] = {
+        {RT5645_PR_BASE + 0x3d, 0x3600},
+        {RT5645_PR_BASE + 0x1c, 0xfd20},
+        {RT5645_PR_BASE + 0x20, 0x611f},
+        {RT5645_PR_BASE + 0x21, 0x4040},
+        {RT5645_PR_BASE + 0x23, 0x0004},
+};
+#define RT5645_INIT_REG_LEN ARRAY_SIZE(init_list)
+
+static const struct reg_default rt5645_reg[] = {
+        { 0x00, 0x0000 },
+        { 0x01, 0xc8c8 },
+        { 0x02, 0xc8c8 },
+        { 0x03, 0xc8c8 },
+        { 0x0a, 0x0002 },
+        { 0x0b, 0x2827 },
+        { 0x0c, 0xe000 },
+        { 0x0d, 0x0000 },
+        { 0x0e, 0x0000 },
+        { 0x0f, 0x0808 },
+        { 0x14, 0x3333 },
+        { 0x16, 0x4b00 },
+        { 0x18, 0x018b },
+        { 0x19, 0xafaf },
+        { 0x1a, 0xafaf },
+        { 0x1b, 0x0001 },
+        { 0x1c, 0x2f2f },
+        { 0x1d, 0x2f2f },
+        { 0x1e, 0x0000 },
+        { 0x20, 0x0000 },
+        { 0x27, 0x7060 },
+        { 0x28, 0x7070 },
+        { 0x29, 0x8080 },
+        { 0x2a, 0x5656 },
+        { 0x2b, 0x5454 },
+        { 0x2c, 0xaaa0 },
+        { 0x2f, 0x1002 },
+        { 0x31, 0x5000 },
+        { 0x32, 0x0000 },
+        { 0x33, 0x0000 },
+        { 0x34, 0x0000 },
+        { 0x35, 0x0000 },
+        { 0x3b, 0x0000 },
+        { 0x3c, 0x007f },
+        { 0x3d, 0x0000 },
+        { 0x3e, 0x007f },
+        { 0x3f, 0x0000 },
+        { 0x40, 0x001f },
+        { 0x41, 0x0000 },
+        { 0x42, 0x001f },
+        { 0x45, 0x6000 },
+        { 0x46, 0x003e },
+        { 0x47, 0x003e },
+        { 0x48, 0xf807 },
+        { 0x4a, 0x0004 },
+        { 0x4d, 0x0000 },
+        { 0x4e, 0x0000 },
+        { 0x4f, 0x01ff },
+        { 0x50, 0x0000 },
+        { 0x51, 0x0000 },
+        { 0x52, 0x01ff },
+        { 0x53, 0xf000 },
+        { 0x56, 0x0111 },
+        { 0x57, 0x0064 },
+        { 0x58, 0xef0e },
+        { 0x59, 0xf0f0 },
+        { 0x5a, 0xef0e },
+        { 0x5b, 0xf0f0 },
+        { 0x5c, 0xef0e },
+        { 0x5d, 0xf0f0 },
+        { 0x5e, 0xf000 },
+        { 0x5f, 0x0000 },
+        { 0x61, 0x0300 },
+        { 0x62, 0x0000 },
+        { 0x63, 0x00c2 },
+        { 0x64, 0x0000 },
+        { 0x65, 0x0000 },
+        { 0x66, 0x0000 },
+        { 0x6a, 0x0000 },
+        { 0x6c, 0x0aaa },
+        { 0x70, 0x8000 },
+        { 0x71, 0x8000 },
+        { 0x72, 0x8000 },
+        { 0x73, 0x7770 },
+        { 0x74, 0x3e00 },
+        { 0x75, 0x2409 },
+        { 0x76, 0x000a },
+        { 0x77, 0x0c00 },
+        { 0x78, 0x0000 },
+        { 0x80, 0x0000 },
+        { 0x81, 0x0000 },
+        { 0x82, 0x0000 },
+        { 0x83, 0x0000 },
+        { 0x84, 0x0000 },
+        { 0x85, 0x0000 },
+        { 0x8a, 0x0000 },
+        { 0x8e, 0x0004 },
+        { 0x8f, 0x1100 },
+        { 0x90, 0x0646 },
+        { 0x91, 0x0c06 },
+        { 0x93, 0x0000 },
+        { 0x94, 0x0200 },
+        { 0x95, 0x0000 },
+        { 0x9a, 0x2184 },
+        { 0x9b, 0x010a },
+        { 0x9c, 0x0aea },
+        { 0x9d, 0x000c },
+        { 0x9e, 0x0400 },
+        { 0xa0, 0xa0a8 },
+        { 0xa1, 0x0059 },
+        { 0xa2, 0x0001 },
+        { 0xae, 0x6000 },
+        { 0xaf, 0x0000 },
+        { 0xb0, 0x6000 },
+        { 0xb1, 0x0000 },
+        { 0xb2, 0x0000 },
+        { 0xb3, 0x001f },
+        { 0xb4, 0x020c },
+        { 0xb5, 0x1f00 },
+        { 0xb6, 0x0000 },
+        { 0xbb, 0x0000 },
+        { 0xbc, 0x0000 },
+        { 0xbd, 0x0000 },
+        { 0xbe, 0x0000 },
+        { 0xbf, 0x3100 },
+        { 0xc0, 0x0000 },
+        { 0xc1, 0x0000 },
+        { 0xc2, 0x0000 },
+        { 0xc3, 0x2000 },
+        { 0xcd, 0x0000 },
+        { 0xce, 0x0000 },
+        { 0xcf, 0x1813 },
+        { 0xd0, 0x0690 },
+        { 0xd1, 0x1c17 },
+        { 0xd3, 0xb320 },
+        { 0xd4, 0x0000 },
+        { 0xd6, 0x0400 },
+        { 0xd9, 0x0809 },
+        { 0xda, 0x0000 },
+        { 0xdb, 0x0003 },
+        { 0xdc, 0x0049 },
+        { 0xdd, 0x001b },
+        { 0xe6, 0x8000 },
+        { 0xe7, 0x0200 },
+        { 0xec, 0xb300 },
+        { 0xed, 0x0000 },
+        { 0xf0, 0x001f },
+        { 0xf1, 0x020c },
+        { 0xf2, 0x1f00 },
+        { 0xf3, 0x0000 },
+        { 0xf4, 0x4000 },
+        { 0xf8, 0x0000 },
+        { 0xf9, 0x0000 },
+        { 0xfa, 0x2060 },
+        { 0xfb, 0x4040 },
+        { 0xfc, 0x0000 },
+        { 0xfd, 0x0002 },
+        { 0xfe, 0x10ec },
+        { 0xff, 0x6308 },
+};
+
+static int rt5645_reset(struct snd_soc_codec *codec)
+{
+        return snd_soc_write(codec, RT5645_RESET, 0);
+}
+
+static bool rt5645_volatile_register(struct device *dev, unsigned int reg)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(rt5645_ranges); i++) {
+                if (reg >= rt5645_ranges[i].range_min &&
+                        reg <= rt5645_ranges[i].range_max) {
+                        return true;
+                }
+        }
+
+        switch (reg) {
+        case RT5645_RESET:
+        case RT5645_PRIV_DATA:
+        case RT5645_IN1_CTRL1:
+        case RT5645_IN1_CTRL2:
+        case RT5645_IN1_CTRL3:
+        case RT5645_A_JD_CTRL1:
+        case RT5645_ADC_EQ_CTRL1:
+        case RT5645_EQ_CTRL1:
+        case RT5645_ALC_CTRL_1:
+        case RT5645_IRQ_CTRL2:
+        case RT5645_IRQ_CTRL3:
+        case RT5645_INT_IRQ_ST:
+        case RT5645_IL_CMD:
+        case RT5645_VENDOR_ID:
+        case RT5645_VENDOR_ID1:
+        case RT5645_VENDOR_ID2:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static bool rt5645_readable_register(struct device *dev, unsigned int reg)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(rt5645_ranges); i++) {
+                if (reg >= rt5645_ranges[i].range_min &&
+                        reg <= rt5645_ranges[i].range_max) {
+                        return true;
+                }
+        }
+
+        switch (reg) {
+        case RT5645_RESET:
+        case RT5645_SPK_VOL:
+        case RT5645_HP_VOL:
+        case RT5645_LOUT1:
+        case RT5645_IN1_CTRL1:
+        case RT5645_IN1_CTRL2:
+        case RT5645_IN1_CTRL3:
+        case RT5645_IN2_CTRL:
+        case RT5645_INL1_INR1_VOL:
+        case RT5645_SPK_FUNC_LIM:
+        case RT5645_ADJ_HPF_CTRL:
+        case RT5645_DAC1_DIG_VOL:
+        case RT5645_DAC2_DIG_VOL:
+        case RT5645_DAC_CTRL:
+        case RT5645_STO1_ADC_DIG_VOL:
+        case RT5645_MONO_ADC_DIG_VOL:
+        case RT5645_ADC_BST_VOL1:
+        case RT5645_ADC_BST_VOL2:
+        case RT5645_STO1_ADC_MIXER:
+        case RT5645_MONO_ADC_MIXER:
+        case RT5645_AD_DA_MIXER:
+        case RT5645_STO_DAC_MIXER:
+        case RT5645_MONO_DAC_MIXER:
+        case RT5645_DIG_MIXER:
+        case RT5645_DIG_INF1_DATA:
+        case RT5645_PDM_OUT_CTRL:
+        case RT5645_REC_L1_MIXER:
+        case RT5645_REC_L2_MIXER:
+        case RT5645_REC_R1_MIXER:
+        case RT5645_REC_R2_MIXER:
+        case RT5645_HPMIXL_CTRL:
+        case RT5645_HPOMIXL_CTRL:
+        case RT5645_HPMIXR_CTRL:
+        case RT5645_HPOMIXR_CTRL:
+        case RT5645_HPO_MIXER:
+        case RT5645_SPK_L_MIXER:
+        case RT5645_SPK_R_MIXER:
+        case RT5645_SPO_MIXER:
+        case RT5645_SPO_CLSD_RATIO:
+        case RT5645_OUT_L1_MIXER:
+        case RT5645_OUT_R1_MIXER:
+        case RT5645_OUT_L_GAIN1:
+        case RT5645_OUT_L_GAIN2:
+        case RT5645_OUT_R_GAIN1:
+        case RT5645_OUT_R_GAIN2:
+        case RT5645_LOUT_MIXER:
+        case RT5645_HAPTIC_CTRL1:
+        case RT5645_HAPTIC_CTRL2:
+        case RT5645_HAPTIC_CTRL3:
+        case RT5645_HAPTIC_CTRL4:
+        case RT5645_HAPTIC_CTRL5:
+        case RT5645_HAPTIC_CTRL6:
+        case RT5645_HAPTIC_CTRL7:
+        case RT5645_HAPTIC_CTRL8:
+        case RT5645_HAPTIC_CTRL9:
+        case RT5645_HAPTIC_CTRL10:
+        case RT5645_PWR_DIG1:
+        case RT5645_PWR_DIG2:
+        case RT5645_PWR_ANLG1:
+        case RT5645_PWR_ANLG2:
+        case RT5645_PWR_MIXER:
+        case RT5645_PWR_VOL:
+        case RT5645_PRIV_INDEX:
+        case RT5645_PRIV_DATA:
+        case RT5645_I2S1_SDP:
+        case RT5645_I2S2_SDP:
+        case RT5645_ADDA_CLK1:
+        case RT5645_ADDA_CLK2:
+        case RT5645_DMIC_CTRL1:
+        case RT5645_DMIC_CTRL2:
+        case RT5645_TDM_CTRL_1:
+        case RT5645_TDM_CTRL_2:
+        case RT5645_GLB_CLK:
+        case RT5645_PLL_CTRL1:
+        case RT5645_PLL_CTRL2:
+        case RT5645_ASRC_1:
+        case RT5645_ASRC_2:
+        case RT5645_ASRC_3:
+        case RT5645_ASRC_4:
+        case RT5645_DEPOP_M1:
+        case RT5645_DEPOP_M2:
+        case RT5645_DEPOP_M3:
+        case RT5645_MICBIAS:
+        case RT5645_A_JD_CTRL1:
+        case RT5645_VAD_CTRL4:
+        case RT5645_CLSD_OUT_CTRL:
+        case RT5645_ADC_EQ_CTRL1:
+        case RT5645_ADC_EQ_CTRL2:
+        case RT5645_EQ_CTRL1:
+        case RT5645_EQ_CTRL2:
+        case RT5645_ALC_CTRL_1:
+        case RT5645_ALC_CTRL_2:
+        case RT5645_ALC_CTRL_3:
+        case RT5645_ALC_CTRL_4:
+        case RT5645_ALC_CTRL_5:
+        case RT5645_JD_CTRL:
+        case RT5645_IRQ_CTRL1:
+        case RT5645_IRQ_CTRL2:
+        case RT5645_IRQ_CTRL3:
+        case RT5645_INT_IRQ_ST:
+        case RT5645_GPIO_CTRL1:
+        case RT5645_GPIO_CTRL2:
+        case RT5645_GPIO_CTRL3:
+        case RT5645_BASS_BACK:
+        case RT5645_MP3_PLUS1:
+        case RT5645_MP3_PLUS2:
+        case RT5645_ADJ_HPF1:
+        case RT5645_ADJ_HPF2:
+        case RT5645_HP_CALIB_AMP_DET:
+        case RT5645_SV_ZCD1:
+        case RT5645_SV_ZCD2:
+        case RT5645_IL_CMD:
+        case RT5645_IL_CMD2:
+        case RT5645_IL_CMD3:
+        case RT5645_DRC1_HL_CTRL1:
+        case RT5645_DRC2_HL_CTRL1:
+        case RT5645_ADC_MONO_HP_CTRL1:
+        case RT5645_ADC_MONO_HP_CTRL2:
+        case RT5645_DRC2_CTRL1:
+        case RT5645_DRC2_CTRL2:
+        case RT5645_DRC2_CTRL3:
+        case RT5645_DRC2_CTRL4:
+        case RT5645_DRC2_CTRL5:
+        case RT5645_JD_CTRL3:
+        case RT5645_JD_CTRL4:
+        case RT5645_GEN_CTRL1:
+        case RT5645_GEN_CTRL2:
+        case RT5645_GEN_CTRL3:
+        case RT5645_VENDOR_ID:
+        case RT5645_VENDOR_ID1:
+        case RT5645_VENDOR_ID2:
+                return true;
+        default:
+                return false;
+        }
+}
+
+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);
+static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0);
+static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);
+
+/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */
+static unsigned int bst_tlv[] = {
+        TLV_DB_RANGE_HEAD(7),
+        0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
+        1, 1, TLV_DB_SCALE_ITEM(2000, 0, 0),
+        2, 2, TLV_DB_SCALE_ITEM(2400, 0, 0),
+        3, 5, TLV_DB_SCALE_ITEM(3000, 500, 0),
+        6, 6, TLV_DB_SCALE_ITEM(4400, 0, 0),
+        7, 7, TLV_DB_SCALE_ITEM(5000, 0, 0),
+        8, 8, TLV_DB_SCALE_ITEM(5200, 0, 0),
+};
+
+static const char * const rt5645_tdm_data_swap_select[] = {
+        "L/R", "R/L", "L/L", "R/R"
+};
+
+static SOC_ENUM_SINGLE_DECL(rt5645_tdm_adc_slot0_1_enum,
+        RT5645_TDM_CTRL_1, 6, rt5645_tdm_data_swap_select);
+
+static SOC_ENUM_SINGLE_DECL(rt5645_tdm_adc_slot2_3_enum,
+        RT5645_TDM_CTRL_1, 4, rt5645_tdm_data_swap_select);
+
+static SOC_ENUM_SINGLE_DECL(rt5645_tdm_adc_slot4_5_enum,
+        RT5645_TDM_CTRL_1, 2, rt5645_tdm_data_swap_select);
+
+static SOC_ENUM_SINGLE_DECL(rt5645_tdm_adc_slot6_7_enum,
+        RT5645_TDM_CTRL_1, 0, rt5645_tdm_data_swap_select);
+
+static const char * const rt5645_tdm_adc_data_select[] = {
+        "1/2/R", "2/1/R", "R/1/2", "R/2/1"
+};
+
+static SOC_ENUM_SINGLE_DECL(rt5645_tdm_adc_sel_enum,
+                                RT5645_TDM_CTRL_1, 8,
+                                rt5645_tdm_adc_data_select);
+
+static const struct snd_kcontrol_new rt5645_snd_controls[] = {
+        /* Speaker Output Volume */
+        SOC_DOUBLE("Speaker Channel Switch", RT5645_SPK_VOL,
+                RT5645_VOL_L_SFT, RT5645_VOL_R_SFT, 1, 1),
+        SOC_DOUBLE_TLV("Speaker Playback Volume", RT5645_SPK_VOL,
+                RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 39, 1, out_vol_tlv),
+
+        /* Headphone Output Volume */
+        SOC_DOUBLE("HP Channel Switch", RT5645_HP_VOL,
+                RT5645_VOL_L_SFT, RT5645_VOL_R_SFT, 1, 1),
+        SOC_DOUBLE_TLV("HP Playback Volume", RT5645_HP_VOL,
+                RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 39, 1, out_vol_tlv),
+
+        /* OUTPUT Control */
+        SOC_DOUBLE("OUT Playback Switch", RT5645_LOUT1,
+                RT5645_L_MUTE_SFT, RT5645_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE("OUT Channel Switch", RT5645_LOUT1,
+                RT5645_VOL_L_SFT, RT5645_VOL_R_SFT, 1, 1),
+        SOC_DOUBLE_TLV("OUT Playback Volume", RT5645_LOUT1,
+                RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 39, 1, out_vol_tlv),
+
+        /* DAC Digital Volume */
+        SOC_DOUBLE("DAC2 Playback Switch", RT5645_DAC_CTRL,
+                RT5645_M_DAC_L2_VOL_SFT, RT5645_M_DAC_R2_VOL_SFT, 1, 1),
+        SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5645_DAC1_DIG_VOL,
+                RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 175, 0, dac_vol_tlv),
+        SOC_DOUBLE_TLV("Mono DAC Playback Volume", RT5645_DAC2_DIG_VOL,
+                RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 175, 0, dac_vol_tlv),
+
+        /* IN1/IN2 Control */
+        SOC_SINGLE_TLV("IN1 Boost", RT5645_IN1_CTRL1,
+                RT5645_BST_SFT1, 8, 0, bst_tlv),
+        SOC_SINGLE_TLV("IN2 Boost", RT5645_IN2_CTRL,
+                RT5645_BST_SFT2, 8, 0, bst_tlv),
+
+        /* INL/INR Volume Control */
+        SOC_DOUBLE_TLV("IN Capture Volume", RT5645_INL1_INR1_VOL,
+                RT5645_INL_VOL_SFT, RT5645_INR_VOL_SFT, 31, 1, in_vol_tlv),
+
+        /* ADC Digital Volume Control */
+        SOC_DOUBLE("ADC Capture Switch", RT5645_STO1_ADC_DIG_VOL,
+                RT5645_L_MUTE_SFT, RT5645_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE_TLV("ADC Capture Volume", RT5645_STO1_ADC_DIG_VOL,
+                RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 127, 0, adc_vol_tlv),
+        SOC_DOUBLE("Mono ADC Capture Switch", RT5645_MONO_ADC_DIG_VOL,
+                RT5645_L_MUTE_SFT, RT5645_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5645_MONO_ADC_DIG_VOL,
+                RT5645_L_VOL_SFT, RT5645_R_VOL_SFT, 127, 0, adc_vol_tlv),
+
+        /* ADC Boost Volume Control */
+        SOC_DOUBLE_TLV("STO1 ADC Boost Gain", RT5645_ADC_BST_VOL1,
+                RT5645_STO1_ADC_L_BST_SFT, RT5645_STO1_ADC_R_BST_SFT, 3, 0,
+                adc_bst_tlv),
+        SOC_DOUBLE_TLV("STO2 ADC Boost Gain", RT5645_ADC_BST_VOL1,
+                RT5645_STO2_ADC_L_BST_SFT, RT5645_STO2_ADC_R_BST_SFT, 3, 0,
+                adc_bst_tlv),
+
+        /* I2S2 function select */
+        SOC_SINGLE("I2S2 Func Switch", RT5645_GPIO_CTRL1, RT5645_I2S2_SEL_SFT,
+                1, 1),
+
+        /* TDM */
+        SOC_ENUM("TDM Adc Slot0 1 Data", rt5645_tdm_adc_slot0_1_enum),
+        SOC_ENUM("TDM Adc Slot2 3 Data", rt5645_tdm_adc_slot2_3_enum),
+        SOC_ENUM("TDM Adc Slot4 5 Data", rt5645_tdm_adc_slot4_5_enum),
+        SOC_ENUM("TDM Adc Slot6 7 Data", rt5645_tdm_adc_slot6_7_enum),
+        SOC_ENUM("TDM IF1 ADC DATA Sel", rt5645_tdm_adc_sel_enum),
+        SOC_SINGLE("TDM IF1_DAC1_L Sel", RT5645_TDM_CTRL_3, 12, 7, 0),
+        SOC_SINGLE("TDM IF1_DAC1_R Sel", RT5645_TDM_CTRL_3, 8, 7, 0),
+        SOC_SINGLE("TDM IF1_DAC2_L Sel", RT5645_TDM_CTRL_3, 4, 7, 0),
+        SOC_SINGLE("TDM IF1_DAC2_R Sel", RT5645_TDM_CTRL_3, 0, 7, 0),
+};
+
+/**
+ * set_dmic_clk - Set parameter of dmic.
+ *
+ * @w: DAPM widget.
+ * @kcontrol: The kcontrol of this widget.
+ * @event: Event id.
+ *
+ * Choose dmic clock between 1MHz and 3MHz.
+ * It is better for clock to approximate 3MHz.
+ */
+static int set_dmic_clk(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+        int div[] = {2, 3, 4, 6, 8, 12};
+        int idx = -EINVAL, i;
+        int rate, red, bound, temp;
+
+        rate = rt5645->sysclk;
+        red = 3000000 * 12;
+        for (i = 0; i < ARRAY_SIZE(div); i++) {
+                bound = div[i] * 3000000;
+                if (rate > bound)
+                        continue;
+                temp = bound - rate;
+                if (temp < red) {
+                        red = temp;
+                        idx = i;
+                }
+        }
+
+        if (idx < 0)
+                dev_err(codec->dev, "Failed to set DMIC clock\n");
+        else
+                snd_soc_update_bits(codec, RT5645_DMIC_CTRL1,
+                        RT5645_DMIC_CLK_MASK, idx << RT5645_DMIC_CLK_SFT);
+        return idx;
+}
+
+static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *source,
+                         struct snd_soc_dapm_widget *sink)
+{
+        unsigned int val;
+
+        val = snd_soc_read(source->codec, RT5645_GLB_CLK);
+        val &= RT5645_SCLK_SRC_MASK;
+        if (val == RT5645_SCLK_SRC_PLL1)
+                return 1;
+        else
+                return 0;
+}
+
+/* Digital Mixer */
+static const struct snd_kcontrol_new rt5645_sto1_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5645_STO1_ADC_MIXER,
+                        RT5645_M_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5645_STO1_ADC_MIXER,
+                        RT5645_M_ADC_L2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_sto1_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5645_STO1_ADC_MIXER,
+                        RT5645_M_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5645_STO1_ADC_MIXER,
+                        RT5645_M_ADC_R2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_mono_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5645_MONO_ADC_MIXER,
+                        RT5645_M_MONO_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5645_MONO_ADC_MIXER,
+                        RT5645_M_MONO_ADC_L2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_mono_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5645_MONO_ADC_MIXER,
+                        RT5645_M_MONO_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5645_MONO_ADC_MIXER,
+                        RT5645_M_MONO_ADC_R2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("Stereo ADC Switch", RT5645_AD_DA_MIXER,
+                        RT5645_M_ADCMIX_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 Switch", RT5645_AD_DA_MIXER,
+                        RT5645_M_DAC1_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("Stereo ADC Switch", RT5645_AD_DA_MIXER,
+                        RT5645_M_ADCMIX_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC1 Switch", RT5645_AD_DA_MIXER,
+                        RT5645_M_DAC1_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_sto_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5645_STO_DAC_MIXER,
+                        RT5645_M_DAC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5645_STO_DAC_MIXER,
+                        RT5645_M_DAC_L2_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5645_STO_DAC_MIXER,
+                        RT5645_M_DAC_R1_STO_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_sto_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5645_STO_DAC_MIXER,
+                        RT5645_M_DAC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5645_STO_DAC_MIXER,
+                        RT5645_M_DAC_R2_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5645_STO_DAC_MIXER,
+                        RT5645_M_DAC_L1_STO_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_mono_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5645_MONO_DAC_MIXER,
+                        RT5645_M_DAC_L1_MONO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5645_MONO_DAC_MIXER,
+                        RT5645_M_DAC_L2_MONO_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5645_MONO_DAC_MIXER,
+                        RT5645_M_DAC_R2_MONO_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_mono_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5645_MONO_DAC_MIXER,
+                        RT5645_M_DAC_R1_MONO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5645_MONO_DAC_MIXER,
+                        RT5645_M_DAC_R2_MONO_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5645_MONO_DAC_MIXER,
+                        RT5645_M_DAC_L2_MONO_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_dig_l_mix[] = {
+        SOC_DAPM_SINGLE("Sto DAC Mix L Switch", RT5645_DIG_MIXER,
+                        RT5645_M_STO_L_DAC_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5645_DIG_MIXER,
+                        RT5645_M_DAC_L2_DAC_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5645_DIG_MIXER,
+                        RT5645_M_DAC_R2_DAC_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_dig_r_mix[] = {
+        SOC_DAPM_SINGLE("Sto DAC Mix R Switch", RT5645_DIG_MIXER,
+                        RT5645_M_STO_R_DAC_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5645_DIG_MIXER,
+                        RT5645_M_DAC_R2_DAC_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5645_DIG_MIXER,
+                        RT5645_M_DAC_L2_DAC_R_SFT, 1, 1),
+};
+
+/* Analog Input Mixer */
+static const struct snd_kcontrol_new rt5645_rec_l_mix[] = {
+        SOC_DAPM_SINGLE("HPOL Switch", RT5645_REC_L2_MIXER,
+                        RT5645_M_HP_L_RM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INL Switch", RT5645_REC_L2_MIXER,
+                        RT5645_M_IN_L_RM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5645_REC_L2_MIXER,
+                        RT5645_M_BST2_RM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5645_REC_L2_MIXER,
+                        RT5645_M_BST1_RM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("OUT MIXL Switch", RT5645_REC_L2_MIXER,
+                        RT5645_M_OM_L_RM_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_rec_r_mix[] = {
+        SOC_DAPM_SINGLE("HPOR Switch", RT5645_REC_R2_MIXER,
+                        RT5645_M_HP_R_RM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5645_REC_R2_MIXER,
+                        RT5645_M_IN_R_RM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5645_REC_R2_MIXER,
+                        RT5645_M_BST2_RM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5645_REC_R2_MIXER,
+                        RT5645_M_BST1_RM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("OUT MIXR Switch", RT5645_REC_R2_MIXER,
+                        RT5645_M_OM_R_RM_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_spk_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5645_SPK_L_MIXER,
+                        RT5645_M_DAC_L1_SM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5645_SPK_L_MIXER,
+                        RT5645_M_DAC_L2_SM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INL Switch", RT5645_SPK_L_MIXER,
+                        RT5645_M_IN_L_SM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5645_SPK_L_MIXER,
+                        RT5645_M_BST1_L_SM_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_spk_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5645_SPK_R_MIXER,
+                        RT5645_M_DAC_R1_SM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5645_SPK_R_MIXER,
+                        RT5645_M_DAC_R2_SM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5645_SPK_R_MIXER,
+                        RT5645_M_IN_R_SM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5645_SPK_R_MIXER,
+                        RT5645_M_BST2_R_SM_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_out_l_mix[] = {
+        SOC_DAPM_SINGLE("BST1 Switch", RT5645_OUT_L1_MIXER,
+                        RT5645_M_BST1_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INL Switch", RT5645_OUT_L1_MIXER,
+                        RT5645_M_IN_L_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5645_OUT_L1_MIXER,
+                        RT5645_M_DAC_L2_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5645_OUT_L1_MIXER,
+                        RT5645_M_DAC_L1_OM_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_out_r_mix[] = {
+        SOC_DAPM_SINGLE("BST2 Switch", RT5645_OUT_R1_MIXER,
+                        RT5645_M_BST2_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5645_OUT_R1_MIXER,
+                        RT5645_M_IN_R_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5645_OUT_R1_MIXER,
+                        RT5645_M_DAC_R2_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5645_OUT_R1_MIXER,
+                        RT5645_M_DAC_R1_OM_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_spo_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5645_SPO_MIXER,
+                        RT5645_M_DAC_R1_SPM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5645_SPO_MIXER,
+                        RT5645_M_DAC_L1_SPM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("SPKVOL R Switch", RT5645_SPO_MIXER,
+                        RT5645_M_SV_R_SPM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("SPKVOL L Switch", RT5645_SPO_MIXER,
+                        RT5645_M_SV_L_SPM_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_spo_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5645_SPO_MIXER,
+                        RT5645_M_DAC_R1_SPM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("SPKVOL R Switch", RT5645_SPO_MIXER,
+                        RT5645_M_SV_R_SPM_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_hpo_mix[] = {
+        SOC_DAPM_SINGLE("DAC1 Switch", RT5645_HPO_MIXER,
+                        RT5645_M_DAC1_HM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("HPVOL Switch", RT5645_HPO_MIXER,
+                        RT5645_M_HPVOL_HM_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_hpvoll_mix[] = {
+        SOC_DAPM_SINGLE("DAC1 Switch", RT5645_HPOMIXL_CTRL,
+                        RT5645_M_DAC1_HV_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC2 Switch", RT5645_HPOMIXL_CTRL,
+                        RT5645_M_DAC2_HV_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INL Switch", RT5645_HPOMIXL_CTRL,
+                        RT5645_M_IN_HV_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5645_HPOMIXL_CTRL,
+                        RT5645_M_BST1_HV_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_hpvolr_mix[] = {
+        SOC_DAPM_SINGLE("DAC1 Switch", RT5645_HPOMIXR_CTRL,
+                        RT5645_M_DAC1_HV_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC2 Switch", RT5645_HPOMIXR_CTRL,
+                        RT5645_M_DAC2_HV_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR Switch", RT5645_HPOMIXR_CTRL,
+                        RT5645_M_IN_HV_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5645_HPOMIXR_CTRL,
+                        RT5645_M_BST2_HV_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5645_lout_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5645_LOUT_MIXER,
+                        RT5645_M_DAC_L1_LM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5645_LOUT_MIXER,
+                        RT5645_M_DAC_R1_LM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("OUTMIX L Switch", RT5645_LOUT_MIXER,
+                        RT5645_M_OV_L_LM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("OUTMIX R Switch", RT5645_LOUT_MIXER,
+                        RT5645_M_OV_R_LM_SFT, 1, 1),
+};
+
+/*DAC1 L/R source*/ /* MX-29 [9:8] [11:10] */
+static const char * const rt5645_dac1_src[] = {
+        "IF1 DAC", "IF2 DAC", "IF3 DAC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_dac1l_enum, RT5645_AD_DA_MIXER,
+        RT5645_DAC1_L_SEL_SFT, rt5645_dac1_src);
+
+static const struct snd_kcontrol_new rt5645_dac1l_mux =
+        SOC_DAPM_ENUM("DAC1 L source", rt5645_dac1l_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_dac1r_enum, RT5645_AD_DA_MIXER,
+        RT5645_DAC1_R_SEL_SFT, rt5645_dac1_src);
+
+static const struct snd_kcontrol_new rt5645_dac1r_mux =
+        SOC_DAPM_ENUM("DAC1 R source", rt5645_dac1r_enum);
+
+/*DAC2 L/R source*/ /* MX-1B [6:4] [2:0] */
+static const char * const rt5645_dac12_src[] = {
+        "IF1 DAC", "IF2 DAC", "IF3 DAC", "Mono ADC", "VAD_ADC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_dac2l_enum, RT5645_DAC_CTRL,
+        RT5645_DAC2_L_SEL_SFT, rt5645_dac12_src);
+
+static const struct snd_kcontrol_new rt5645_dac_l2_mux =
+        SOC_DAPM_ENUM("DAC2 L source", rt5645_dac2l_enum);
+
+static const char * const rt5645_dacr2_src[] = {
+        "IF1 DAC", "IF2 DAC", "IF3 DAC", "Mono ADC", "Haptic"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_dac2r_enum, RT5645_DAC_CTRL,
+        RT5645_DAC2_R_SEL_SFT, rt5645_dacr2_src);
+
+static const struct snd_kcontrol_new rt5645_dac_r2_mux =
+        SOC_DAPM_ENUM("DAC2 R source", rt5645_dac2r_enum);
+
+
+/* INL/R source */
+static const char * const rt5645_inl_src[] = {
+        "IN2P", "MonoP"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_inl_enum, RT5645_INL1_INR1_VOL,
+        RT5645_INL_SEL_SFT, rt5645_inl_src);
+
+static const struct snd_kcontrol_new rt5645_inl_mux =
+        SOC_DAPM_ENUM("INL source", rt5645_inl_enum);
+
+static const char * const rt5645_inr_src[] = {
+        "IN2N", "MonoN"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_inr_enum, RT5645_INL1_INR1_VOL,
+        RT5645_INR_SEL_SFT, rt5645_inr_src);
+
+static const struct snd_kcontrol_new rt5645_inr_mux =
+        SOC_DAPM_ENUM("INR source", rt5645_inr_enum);
+
+/* Stereo1 ADC source */
+/* MX-27 [12] */
+static const char * const rt5645_stereo_adc1_src[] = {
+        "DAC MIX", "ADC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_stereo1_adc1_enum, RT5645_STO1_ADC_MIXER,
+        RT5645_ADC_1_SRC_SFT, rt5645_stereo_adc1_src);
+
+static const struct snd_kcontrol_new rt5645_sto_adc1_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC1 Mux", rt5645_stereo1_adc1_enum);
+
+/* MX-27 [11] */
+static const char * const rt5645_stereo_adc2_src[] = {
+        "DAC MIX", "DMIC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_stereo1_adc2_enum, RT5645_STO1_ADC_MIXER,
+        RT5645_ADC_2_SRC_SFT, rt5645_stereo_adc2_src);
+
+static const struct snd_kcontrol_new rt5645_sto_adc2_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC2 Mux", rt5645_stereo1_adc2_enum);
+
+/* MX-27 [8] */
+static const char * const rt5645_stereo_dmic_src[] = {
+        "DMIC1", "DMIC2"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_stereo1_dmic_enum, RT5645_STO1_ADC_MIXER,
+        RT5645_DMIC_SRC_SFT, rt5645_stereo_dmic_src);
+
+static const struct snd_kcontrol_new rt5645_sto1_dmic_mux =
+        SOC_DAPM_ENUM("Stereo1 DMIC source", rt5645_stereo1_dmic_enum);
+
+/* Mono ADC source */
+/* MX-28 [12] */
+static const char * const rt5645_mono_adc_l1_src[] = {
+        "Mono DAC MIXL", "ADC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_mono_adc_l1_enum, RT5645_MONO_ADC_MIXER,
+        RT5645_MONO_ADC_L1_SRC_SFT, rt5645_mono_adc_l1_src);
+
+static const struct snd_kcontrol_new rt5645_mono_adc_l1_mux =
+        SOC_DAPM_ENUM("Mono ADC1 left source", rt5645_mono_adc_l1_enum);
+/* MX-28 [11] */
+static const char * const rt5645_mono_adc_l2_src[] = {
+        "Mono DAC MIXL", "DMIC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_mono_adc_l2_enum, RT5645_MONO_ADC_MIXER,
+        RT5645_MONO_ADC_L2_SRC_SFT, rt5645_mono_adc_l2_src);
+
+static const struct snd_kcontrol_new rt5645_mono_adc_l2_mux =
+        SOC_DAPM_ENUM("Mono ADC2 left source", rt5645_mono_adc_l2_enum);
+
+/* MX-28 [8] */
+static const char * const rt5645_mono_dmic_src[] = {
+        "DMIC1", "DMIC2"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_mono_dmic_l_enum, RT5645_MONO_ADC_MIXER,
+        RT5645_MONO_DMIC_L_SRC_SFT, rt5645_mono_dmic_src);
+
+static const struct snd_kcontrol_new rt5645_mono_dmic_l_mux =
+        SOC_DAPM_ENUM("Mono DMIC left source", rt5645_mono_dmic_l_enum);
+/* MX-28 [1:0] */
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_mono_dmic_r_enum, RT5645_MONO_ADC_MIXER,
+        RT5645_MONO_DMIC_R_SRC_SFT, rt5645_mono_dmic_src);
+
+static const struct snd_kcontrol_new rt5645_mono_dmic_r_mux =
+        SOC_DAPM_ENUM("Mono DMIC Right source", rt5645_mono_dmic_r_enum);
+/* MX-28 [4] */
+static const char * const rt5645_mono_adc_r1_src[] = {
+        "Mono DAC MIXR", "ADC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_mono_adc_r1_enum, RT5645_MONO_ADC_MIXER,
+        RT5645_MONO_ADC_R1_SRC_SFT, rt5645_mono_adc_r1_src);
+
+static const struct snd_kcontrol_new rt5645_mono_adc_r1_mux =
+        SOC_DAPM_ENUM("Mono ADC1 right source", rt5645_mono_adc_r1_enum);
+/* MX-28 [3] */
+static const char * const rt5645_mono_adc_r2_src[] = {
+        "Mono DAC MIXR", "DMIC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_mono_adc_r2_enum, RT5645_MONO_ADC_MIXER,
+        RT5645_MONO_ADC_R2_SRC_SFT, rt5645_mono_adc_r2_src);
+
+static const struct snd_kcontrol_new rt5645_mono_adc_r2_mux =
+        SOC_DAPM_ENUM("Mono ADC2 right source", rt5645_mono_adc_r2_enum);
+
+/* MX-77 [9:8] */
+static const char * const rt5645_if1_adc_in_src[] = {
+        "IF_ADC1", "IF_ADC2", "VAD_ADC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_if1_adc_in_enum, RT5645_TDM_CTRL_1,
+        RT5645_IF1_ADC_IN_SFT, rt5645_if1_adc_in_src);
+
+static const struct snd_kcontrol_new rt5645_if1_adc_in_mux =
+        SOC_DAPM_ENUM("IF1 ADC IN source", rt5645_if1_adc_in_enum);
+
+/* MX-2F [13:12] */
+static const char * const rt5645_if2_adc_in_src[] = {
+        "IF_ADC1", "IF_ADC2", "VAD_ADC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_if2_adc_in_enum, RT5645_DIG_INF1_DATA,
+        RT5645_IF2_ADC_IN_SFT, rt5645_if2_adc_in_src);
+
+static const struct snd_kcontrol_new rt5645_if2_adc_in_mux =
+        SOC_DAPM_ENUM("IF2 ADC IN source", rt5645_if2_adc_in_enum);
+
+/* MX-2F [1:0] */
+static const char * const rt5645_if3_adc_in_src[] = {
+        "IF_ADC1", "IF_ADC2", "VAD_ADC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_if3_adc_in_enum, RT5645_DIG_INF1_DATA,
+        RT5645_IF3_ADC_IN_SFT, rt5645_if3_adc_in_src);
+
+static const struct snd_kcontrol_new rt5645_if3_adc_in_mux =
+        SOC_DAPM_ENUM("IF3 ADC IN source", rt5645_if3_adc_in_enum);
+
+/* MX-31 [15] [13] [11] [9] */
+static const char * const rt5645_pdm_src[] = {
+        "Mono DAC", "Stereo DAC"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_pdm1_l_enum, RT5645_PDM_OUT_CTRL,
+        RT5645_PDM1_L_SFT, rt5645_pdm_src);
+
+static const struct snd_kcontrol_new rt5645_pdm1_l_mux =
+        SOC_DAPM_ENUM("PDM1 L source", rt5645_pdm1_l_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_pdm1_r_enum, RT5645_PDM_OUT_CTRL,
+        RT5645_PDM1_R_SFT, rt5645_pdm_src);
+
+static const struct snd_kcontrol_new rt5645_pdm1_r_mux =
+        SOC_DAPM_ENUM("PDM1 R source", rt5645_pdm1_r_enum);
+
+/* MX-9D [9:8] */
+static const char * const rt5645_vad_adc_src[] = {
+        "Sto1 ADC L", "Mono ADC L", "Mono ADC R"
+};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5645_vad_adc_enum, RT5645_VAD_CTRL4,
+        RT5645_VAD_SEL_SFT, rt5645_vad_adc_src);
+
+static const struct snd_kcontrol_new rt5645_vad_adc_mux =
+        SOC_DAPM_ENUM("VAD ADC source", rt5645_vad_adc_enum);
+
+static const struct snd_kcontrol_new spk_l_vol_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5645_SPK_VOL,
+                RT5645_L_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new spk_r_vol_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5645_SPK_VOL,
+                RT5645_R_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new hp_l_vol_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5645_HP_VOL,
+                RT5645_L_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new hp_r_vol_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5645_HP_VOL,
+                RT5645_R_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new pdm1_l_vol_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5645_PDM_OUT_CTRL,
+                RT5645_M_PDM1_L, 1, 1);
+
+static const struct snd_kcontrol_new pdm1_r_vol_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5645_PDM_OUT_CTRL,
+                RT5645_M_PDM1_R, 1, 1);
+
+static void hp_amp_power(struct snd_soc_codec *codec, int on)
+{
+        static int hp_amp_power_count;
+        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+
+        if (on) {
+                if (hp_amp_power_count <= 0) {
+                        /* depop parameters */
+                        snd_soc_update_bits(codec, RT5645_DEPOP_M2,
+                                RT5645_DEPOP_MASK, RT5645_DEPOP_MAN);
+                        snd_soc_write(codec, RT5645_DEPOP_M1, 0x000d);
+                        regmap_write(rt5645->regmap, RT5645_PR_BASE +
+                                RT5645_HP_DCC_INT1, 0x9f01);
+                        mdelay(150);
+                        /* headphone amp power on */
+                        snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
+                                RT5645_PWR_FV1 | RT5645_PWR_FV2 , 0);
+                        snd_soc_update_bits(codec, RT5645_PWR_VOL,
+                                RT5645_PWR_HV_L | RT5645_PWR_HV_R,
+                                RT5645_PWR_HV_L | RT5645_PWR_HV_R);
+                        snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
+                                RT5645_PWR_HP_L | RT5645_PWR_HP_R |
+                                RT5645_PWR_HA,
+                                RT5645_PWR_HP_L | RT5645_PWR_HP_R |
+                                RT5645_PWR_HA);
+                        mdelay(5);
+                        snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
+                                RT5645_PWR_FV1 | RT5645_PWR_FV2,
+                                RT5645_PWR_FV1 | RT5645_PWR_FV2);
+
+                        snd_soc_update_bits(codec, RT5645_DEPOP_M1,
+                                RT5645_HP_CO_MASK | RT5645_HP_SG_MASK,
+                                RT5645_HP_CO_EN | RT5645_HP_SG_EN);
+                        regmap_write(rt5645->regmap, RT5645_PR_BASE +
+                                0x14, 0x1aaa);
+                        regmap_write(rt5645->regmap, RT5645_PR_BASE +
+                                0x24, 0x0430);
+                }
+                hp_amp_power_count++;
+        } else {
+                hp_amp_power_count--;
+                if (hp_amp_power_count <= 0) {
+                        snd_soc_update_bits(codec, RT5645_DEPOP_M1,
+                                RT5645_HP_SG_MASK | RT5645_HP_L_SMT_MASK |
+                                RT5645_HP_R_SMT_MASK, RT5645_HP_SG_DIS |
+                                RT5645_HP_L_SMT_DIS | RT5645_HP_R_SMT_DIS);
+                        /* headphone amp power down */
+                        snd_soc_write(codec, RT5645_DEPOP_M1, 0x0000);
+                        snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
+                                RT5645_PWR_HP_L | RT5645_PWR_HP_R |
+                                RT5645_PWR_HA, 0);
+                }
+        }
+}
+
+static int rt5645_hp_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                hp_amp_power(codec, 1);
+                /* headphone unmute sequence */
+                snd_soc_update_bits(codec, RT5645_DEPOP_M3, RT5645_CP_FQ1_MASK |
+                        RT5645_CP_FQ2_MASK | RT5645_CP_FQ3_MASK,
+                        (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ1_SFT) |
+                        (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
+                        (RT5645_CP_FQ_192_KHZ << RT5645_CP_FQ3_SFT));
+                regmap_write(rt5645->regmap,
+                        RT5645_PR_BASE + RT5645_MAMP_INT_REG2, 0xfc00);
+                snd_soc_update_bits(codec, RT5645_DEPOP_M1,
+                        RT5645_SMT_TRIG_MASK, RT5645_SMT_TRIG_EN);
+                snd_soc_update_bits(codec, RT5645_DEPOP_M1,
+                        RT5645_RSTN_MASK, RT5645_RSTN_EN);
+                snd_soc_update_bits(codec, RT5645_DEPOP_M1,
+                        RT5645_RSTN_MASK | RT5645_HP_L_SMT_MASK |
+                        RT5645_HP_R_SMT_MASK, RT5645_RSTN_DIS |
+                        RT5645_HP_L_SMT_EN | RT5645_HP_R_SMT_EN);
+                msleep(40);
+                snd_soc_update_bits(codec, RT5645_DEPOP_M1,
+                        RT5645_HP_SG_MASK | RT5645_HP_L_SMT_MASK |
+                        RT5645_HP_R_SMT_MASK, RT5645_HP_SG_DIS |
+                        RT5645_HP_L_SMT_DIS | RT5645_HP_R_SMT_DIS);
+                break;
+
+        case SND_SOC_DAPM_PRE_PMD:
+                /* headphone mute sequence */
+                snd_soc_update_bits(codec, RT5645_DEPOP_M3,
+                        RT5645_CP_FQ1_MASK | RT5645_CP_FQ2_MASK |
+                        RT5645_CP_FQ3_MASK,
+                        (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ1_SFT) |
+                        (RT5645_CP_FQ_12_KHZ << RT5645_CP_FQ2_SFT) |
+                        (RT5645_CP_FQ_96_KHZ << RT5645_CP_FQ3_SFT));
+                regmap_write(rt5645->regmap,
+                        RT5645_PR_BASE + RT5645_MAMP_INT_REG2, 0xfc00);
+                snd_soc_update_bits(codec, RT5645_DEPOP_M1,
+                        RT5645_HP_SG_MASK, RT5645_HP_SG_EN);
+                snd_soc_update_bits(codec, RT5645_DEPOP_M1,
+                        RT5645_RSTP_MASK, RT5645_RSTP_EN);
+                snd_soc_update_bits(codec, RT5645_DEPOP_M1,
+                        RT5645_RSTP_MASK | RT5645_HP_L_SMT_MASK |
+                        RT5645_HP_R_SMT_MASK, RT5645_RSTP_DIS |
+                        RT5645_HP_L_SMT_EN | RT5645_HP_R_SMT_EN);
+                msleep(30);
+                hp_amp_power(codec, 0);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt5645_spk_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_update_bits(codec, RT5645_PWR_DIG1,
+                        RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R |
+                        RT5645_PWR_CLS_D_L,
+                        RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R |
+                        RT5645_PWR_CLS_D_L);
+                break;
+
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_update_bits(codec, RT5645_PWR_DIG1,
+                        RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R |
+                        RT5645_PWR_CLS_D_L, 0);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt5645_lout_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                hp_amp_power(codec, 1);
+                snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
+                        RT5645_PWR_LM, RT5645_PWR_LM);
+                snd_soc_update_bits(codec, RT5645_LOUT1,
+                        RT5645_L_MUTE | RT5645_R_MUTE, 0);
+                break;
+
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_update_bits(codec, RT5645_LOUT1,
+                        RT5645_L_MUTE | RT5645_R_MUTE,
+                        RT5645_L_MUTE | RT5645_R_MUTE);
+                snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
+                        RT5645_PWR_LM, 0);
+                hp_amp_power(codec, 0);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt5645_bst2_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_update_bits(codec, RT5645_PWR_ANLG2,
+                        RT5645_PWR_BST2_P, RT5645_PWR_BST2_P);
+                break;
+
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_update_bits(codec, RT5645_PWR_ANLG2,
+                        RT5645_PWR_BST2_P, 0);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = {
+        SND_SOC_DAPM_SUPPLY("LDO2", RT5645_PWR_MIXER,
+                RT5645_PWR_LDO2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("PLL1", RT5645_PWR_ANLG2,
+                RT5645_PWR_PLL_BIT, 0, NULL, 0),
+
+        SND_SOC_DAPM_SUPPLY("JD Power", RT5645_PWR_ANLG2,
+                RT5645_PWR_JD1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Mic Det Power", RT5645_PWR_VOL,
+                RT5645_PWR_MIC_DET_BIT, 0, NULL, 0),
+
+        /* Input Side */
+        /* micbias */
+        SND_SOC_DAPM_MICBIAS("micbias1", RT5645_PWR_ANLG2,
+                        RT5645_PWR_MB1_BIT, 0),
+        SND_SOC_DAPM_MICBIAS("micbias2", RT5645_PWR_ANLG2,
+                        RT5645_PWR_MB2_BIT, 0),
+        /* Input Lines */
+        SND_SOC_DAPM_INPUT("DMIC L1"),
+        SND_SOC_DAPM_INPUT("DMIC R1"),
+        SND_SOC_DAPM_INPUT("DMIC L2"),
+        SND_SOC_DAPM_INPUT("DMIC R2"),
+
+        SND_SOC_DAPM_INPUT("IN1P"),
+        SND_SOC_DAPM_INPUT("IN1N"),
+        SND_SOC_DAPM_INPUT("IN2P"),
+        SND_SOC_DAPM_INPUT("IN2N"),
+
+        SND_SOC_DAPM_INPUT("Haptic Generator"),
+
+        SND_SOC_DAPM_PGA("DMIC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("DMIC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DMIC CLK", SND_SOC_NOPM, 0, 0,
+                set_dmic_clk, SND_SOC_DAPM_PRE_PMU),
+        SND_SOC_DAPM_SUPPLY("DMIC1 Power", RT5645_DMIC_CTRL1,
+                RT5645_DMIC_1_EN_SFT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DMIC2 Power", RT5645_DMIC_CTRL1,
+                RT5645_DMIC_2_EN_SFT, 0, NULL, 0),
+        /* Boost */
+        SND_SOC_DAPM_PGA("BST1", RT5645_PWR_ANLG2,
+                RT5645_PWR_BST1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA_E("BST2", RT5645_PWR_ANLG2,
+                RT5645_PWR_BST2_BIT, 0, NULL, 0, rt5645_bst2_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        /* Input Volume */
+        SND_SOC_DAPM_PGA("INL VOL", RT5645_PWR_VOL,
+                RT5645_PWR_IN_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("INR VOL", RT5645_PWR_VOL,
+                RT5645_PWR_IN_R_BIT, 0, NULL, 0),
+        /* REC Mixer */
+        SND_SOC_DAPM_MIXER("RECMIXL", RT5645_PWR_MIXER, RT5645_PWR_RM_L_BIT,
+                        0, rt5645_rec_l_mix, ARRAY_SIZE(rt5645_rec_l_mix)),
+        SND_SOC_DAPM_MIXER("RECMIXR", RT5645_PWR_MIXER, RT5645_PWR_RM_R_BIT,
+                        0, rt5645_rec_r_mix, ARRAY_SIZE(rt5645_rec_r_mix)),
+        /* ADCs */
+        SND_SOC_DAPM_ADC("ADC L", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC R", NULL, SND_SOC_NOPM, 0, 0),
+
+        SND_SOC_DAPM_SUPPLY("ADC L power", RT5645_PWR_DIG1,
+                RT5645_PWR_ADC_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC R power", RT5645_PWR_DIG1,
+                RT5645_PWR_ADC_R_BIT, 0, NULL, 0),
+
+        /* ADC Mux */
+        SND_SOC_DAPM_MUX("Stereo1 DMIC Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_sto1_dmic_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC L2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_sto_adc2_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC R2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_sto_adc2_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC L1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_sto_adc1_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC R1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_sto_adc1_mux),
+        SND_SOC_DAPM_MUX("Mono DMIC L Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_mono_dmic_l_mux),
+        SND_SOC_DAPM_MUX("Mono DMIC R Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_mono_dmic_r_mux),
+        SND_SOC_DAPM_MUX("Mono ADC L2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_mono_adc_l2_mux),
+        SND_SOC_DAPM_MUX("Mono ADC L1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_mono_adc_l1_mux),
+        SND_SOC_DAPM_MUX("Mono ADC R1 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_mono_adc_r1_mux),
+        SND_SOC_DAPM_MUX("Mono ADC R2 Mux", SND_SOC_NOPM, 0, 0,
+                &rt5645_mono_adc_r2_mux),
+        /* ADC Mixer */
+
+        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),
+        SND_SOC_DAPM_MIXER_E("Sto1 ADC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5645_sto1_adc_r_mix, ARRAY_SIZE(rt5645_sto1_adc_r_mix),
+                NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("adc mono left filter", 1, RT5645_PWR_DIG2,
+                RT5645_PWR_ADC_MF_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER_E("Mono ADC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5645_mono_adc_l_mix, ARRAY_SIZE(rt5645_mono_adc_l_mix),
+                NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("adc mono right filter", 1, RT5645_PWR_DIG2,
+                RT5645_PWR_ADC_MF_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER_E("Mono ADC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5645_mono_adc_r_mix, ARRAY_SIZE(rt5645_mono_adc_r_mix),
+                NULL, 0),
+
+        /* ADC PGA */
+        SND_SOC_DAPM_PGA("Stereo1 ADC MIXL", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Stereo1 ADC MIXR", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("Sto2 ADC LR MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("VAD_ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF_ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF_ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1_ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1_ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1_ADC3", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1_ADC4", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        /* IF1 2 Mux */
+        SND_SOC_DAPM_MUX("IF1 ADC Mux", SND_SOC_NOPM,
+                0, 0, &rt5645_if1_adc_in_mux),
+        SND_SOC_DAPM_MUX("IF2 ADC Mux", SND_SOC_NOPM,
+                0, 0, &rt5645_if2_adc_in_mux),
+
+        /* Digital Interface */
+        SND_SOC_DAPM_SUPPLY("I2S1", RT5645_PWR_DIG1,
+                RT5645_PWR_I2S1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC1 L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC1 R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC2 L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC2 R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 ADC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 ADC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("I2S2", RT5645_PWR_DIG1,
+                RT5645_PWR_I2S2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 ADC", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        /* Digital Interface Select */
+        SND_SOC_DAPM_MUX("VAD ADC Mux", SND_SOC_NOPM,
+                0, 0, &rt5645_vad_adc_mux),
+
+        /* Audio Interface */
+        SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("AIF2RX", "AIF2 Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF2TX", "AIF2 Capture", 0, SND_SOC_NOPM, 0, 0),
+
+        /* Output Side */
+        /* DAC mixer before sound effect  */
+        SND_SOC_DAPM_MIXER("DAC1 MIXL", SND_SOC_NOPM, 0, 0,
+                rt5645_dac_l_mix, ARRAY_SIZE(rt5645_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("DAC1 MIXR", SND_SOC_NOPM, 0, 0,
+                rt5645_dac_r_mix, ARRAY_SIZE(rt5645_dac_r_mix)),
+
+        /* DAC2 channel Mux */
+        SND_SOC_DAPM_MUX("DAC L2 Mux", SND_SOC_NOPM, 0, 0, &rt5645_dac_l2_mux),
+        SND_SOC_DAPM_MUX("DAC R2 Mux", SND_SOC_NOPM, 0, 0, &rt5645_dac_r2_mux),
+        SND_SOC_DAPM_PGA("DAC L2 Volume", RT5645_PWR_DIG1,
+                RT5645_PWR_DAC_L2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("DAC R2 Volume", RT5645_PWR_DIG1,
+                RT5645_PWR_DAC_R2_BIT, 0, NULL, 0),
+
+        SND_SOC_DAPM_MUX("DAC1 L Mux", SND_SOC_NOPM, 0, 0, &rt5645_dac1l_mux),
+        SND_SOC_DAPM_MUX("DAC1 R Mux", SND_SOC_NOPM, 0, 0, &rt5645_dac1r_mux),
+
+        /* DAC Mixer */
+        SND_SOC_DAPM_SUPPLY_S("dac stereo1 filter", 1, RT5645_PWR_DIG2,
+                RT5645_PWR_DAC_S1F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("dac mono left filter", 1, RT5645_PWR_DIG2,
+                RT5645_PWR_DAC_MF_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("dac mono right filter", 1, RT5645_PWR_DIG2,
+                RT5645_PWR_DAC_MF_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5645_sto_dac_l_mix, ARRAY_SIZE(rt5645_sto_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5645_sto_dac_r_mix, ARRAY_SIZE(rt5645_sto_dac_r_mix)),
+        SND_SOC_DAPM_MIXER("Mono DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5645_mono_dac_l_mix, ARRAY_SIZE(rt5645_mono_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Mono DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5645_mono_dac_r_mix, ARRAY_SIZE(rt5645_mono_dac_r_mix)),
+        SND_SOC_DAPM_MIXER("DAC MIXL", SND_SOC_NOPM, 0, 0,
+                rt5645_dig_l_mix, ARRAY_SIZE(rt5645_dig_l_mix)),
+        SND_SOC_DAPM_MIXER("DAC MIXR", SND_SOC_NOPM, 0, 0,
+                rt5645_dig_r_mix, ARRAY_SIZE(rt5645_dig_r_mix)),
+
+        /* DACs */
+        SND_SOC_DAPM_DAC("DAC L1", NULL, RT5645_PWR_DIG1, RT5645_PWR_DAC_L1_BIT,
+                0),
+        SND_SOC_DAPM_DAC("DAC L2", NULL, RT5645_PWR_DIG1, RT5645_PWR_DAC_L2_BIT,
+                0),
+        SND_SOC_DAPM_DAC("DAC R1", NULL, RT5645_PWR_DIG1, RT5645_PWR_DAC_R1_BIT,
+                0),
+        SND_SOC_DAPM_DAC("DAC R2", NULL, RT5645_PWR_DIG1, RT5645_PWR_DAC_R2_BIT,
+                0),
+        /* OUT Mixer */
+        SND_SOC_DAPM_MIXER("SPK MIXL", RT5645_PWR_MIXER, RT5645_PWR_SM_L_BIT,
+                0, rt5645_spk_l_mix, ARRAY_SIZE(rt5645_spk_l_mix)),
+        SND_SOC_DAPM_MIXER("SPK MIXR", RT5645_PWR_MIXER, RT5645_PWR_SM_R_BIT,
+                0, rt5645_spk_r_mix, ARRAY_SIZE(rt5645_spk_r_mix)),
+        SND_SOC_DAPM_MIXER("OUT MIXL", RT5645_PWR_MIXER, RT5645_PWR_OM_L_BIT,
+                0, rt5645_out_l_mix, ARRAY_SIZE(rt5645_out_l_mix)),
+        SND_SOC_DAPM_MIXER("OUT MIXR", RT5645_PWR_MIXER, RT5645_PWR_OM_R_BIT,
+                0, rt5645_out_r_mix, ARRAY_SIZE(rt5645_out_r_mix)),
+        /* Ouput Volume */
+        SND_SOC_DAPM_SWITCH("SPKVOL L", RT5645_PWR_VOL, RT5645_PWR_SV_L_BIT, 0,
+                &spk_l_vol_control),
+        SND_SOC_DAPM_SWITCH("SPKVOL R", RT5645_PWR_VOL, RT5645_PWR_SV_R_BIT, 0,
+                &spk_r_vol_control),
+        SND_SOC_DAPM_MIXER("HPOVOL MIXL", RT5645_PWR_VOL, RT5645_PWR_HV_L_BIT,
+                0, rt5645_hpvoll_mix, ARRAY_SIZE(rt5645_hpvoll_mix)),
+        SND_SOC_DAPM_MIXER("HPOVOL MIXR", RT5645_PWR_VOL, RT5645_PWR_HV_R_BIT,
+                0, rt5645_hpvolr_mix, ARRAY_SIZE(rt5645_hpvolr_mix)),
+        SND_SOC_DAPM_SUPPLY("HPOVOL MIXL Power", RT5645_PWR_MIXER,
+                RT5645_PWR_HM_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("HPOVOL MIXR Power", RT5645_PWR_MIXER,
+                RT5645_PWR_HM_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("DAC 1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("DAC 2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("HPOVOL", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SWITCH("HPOVOL L", SND_SOC_NOPM, 0, 0, &hp_l_vol_control),
+        SND_SOC_DAPM_SWITCH("HPOVOL R", SND_SOC_NOPM, 0, 0, &hp_r_vol_control),
+
+        /* HPO/LOUT/Mono Mixer */
+        SND_SOC_DAPM_MIXER("SPOL MIX", SND_SOC_NOPM, 0, 0, rt5645_spo_l_mix,
+                ARRAY_SIZE(rt5645_spo_l_mix)),
+        SND_SOC_DAPM_MIXER("SPOR MIX", SND_SOC_NOPM, 0, 0, rt5645_spo_r_mix,
+                ARRAY_SIZE(rt5645_spo_r_mix)),
+        SND_SOC_DAPM_MIXER("HPO MIX", SND_SOC_NOPM, 0, 0, rt5645_hpo_mix,
+                ARRAY_SIZE(rt5645_hpo_mix)),
+        SND_SOC_DAPM_MIXER("LOUT MIX", SND_SOC_NOPM, 0, 0, rt5645_lout_mix,
+                ARRAY_SIZE(rt5645_lout_mix)),
+
+        SND_SOC_DAPM_PGA_S("HP amp", 1, SND_SOC_NOPM, 0, 0, rt5645_hp_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_PGA_S("LOUT amp", 1, SND_SOC_NOPM, 0, 0, rt5645_lout_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_PGA_S("SPK amp", 2, SND_SOC_NOPM, 0, 0, rt5645_spk_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+
+        /* PDM */
+        SND_SOC_DAPM_SUPPLY("PDM1 Power", RT5645_PWR_DIG2, RT5645_PWR_PDM1_BIT,
+                0, NULL, 0),
+        SND_SOC_DAPM_MUX("PDM1 L Mux", SND_SOC_NOPM, 0, 0, &rt5645_pdm1_l_mux),
+        SND_SOC_DAPM_MUX("PDM1 R Mux", SND_SOC_NOPM, 0, 0, &rt5645_pdm1_r_mux),
+
+        SND_SOC_DAPM_SWITCH("PDM1 L", SND_SOC_NOPM, 0, 0, &pdm1_l_vol_control),
+        SND_SOC_DAPM_SWITCH("PDM1 R", SND_SOC_NOPM, 0, 0, &pdm1_r_vol_control),
+
+        /* Output Lines */
+        SND_SOC_DAPM_OUTPUT("HPOL"),
+        SND_SOC_DAPM_OUTPUT("HPOR"),
+        SND_SOC_DAPM_OUTPUT("LOUTL"),
+        SND_SOC_DAPM_OUTPUT("LOUTR"),
+        SND_SOC_DAPM_OUTPUT("PDM1L"),
+        SND_SOC_DAPM_OUTPUT("PDM1R"),
+        SND_SOC_DAPM_OUTPUT("SPOL"),
+        SND_SOC_DAPM_OUTPUT("SPOR"),
+};
+
+static const struct snd_soc_dapm_route rt5645_dapm_routes[] = {
+        { "IN1P", NULL, "LDO2" },
+        { "IN2P", NULL, "LDO2" },
+
+        { "DMIC1", NULL, "DMIC L1" },
+        { "DMIC1", NULL, "DMIC R1" },
+        { "DMIC2", NULL, "DMIC L2" },
+        { "DMIC2", NULL, "DMIC R2" },
+
+        { "BST1", NULL, "IN1P" },
+        { "BST1", NULL, "IN1N" },
+        { "BST1", NULL, "JD Power" },
+        { "BST1", NULL, "Mic Det Power" },
+        { "BST2", NULL, "IN2P" },
+        { "BST2", NULL, "IN2N" },
+
+        { "INL VOL", NULL, "IN2P" },
+        { "INR VOL", NULL, "IN2N" },
+
+        { "RECMIXL", "HPOL Switch", "HPOL" },
+        { "RECMIXL", "INL Switch", "INL VOL" },
+        { "RECMIXL", "BST2 Switch", "BST2" },
+        { "RECMIXL", "BST1 Switch", "BST1" },
+        { "RECMIXL", "OUT MIXL Switch", "OUT MIXL" },
+
+        { "RECMIXR", "HPOR Switch", "HPOR" },
+        { "RECMIXR", "INR Switch", "INR VOL" },
+        { "RECMIXR", "BST2 Switch", "BST2" },
+        { "RECMIXR", "BST1 Switch", "BST1" },
+        { "RECMIXR", "OUT MIXR Switch", "OUT MIXR" },
+
+        { "ADC L", NULL, "RECMIXL" },
+        { "ADC L", NULL, "ADC L power" },
+        { "ADC R", NULL, "RECMIXR" },
+        { "ADC R", NULL, "ADC R power" },
+
+        {"DMIC L1", NULL, "DMIC CLK"},
+        {"DMIC L1", NULL, "DMIC1 Power"},
+        {"DMIC R1", NULL, "DMIC CLK"},
+        {"DMIC R1", NULL, "DMIC1 Power"},
+        {"DMIC L2", NULL, "DMIC CLK"},
+        {"DMIC L2", NULL, "DMIC2 Power"},
+        {"DMIC R2", NULL, "DMIC CLK"},
+        {"DMIC R2", NULL, "DMIC2 Power"},
+
+        { "Stereo1 DMIC Mux", "DMIC1", "DMIC1" },
+        { "Stereo1 DMIC Mux", "DMIC2", "DMIC2" },
+
+        { "Mono DMIC L Mux", "DMIC1", "DMIC L1" },
+        { "Mono DMIC L Mux", "DMIC2", "DMIC L2" },
+
+        { "Mono DMIC R Mux", "DMIC1", "DMIC R1" },
+        { "Mono DMIC R Mux", "DMIC2", "DMIC R2" },
+
+        { "Stereo1 ADC L2 Mux", "DMIC", "Stereo1 DMIC Mux" },
+        { "Stereo1 ADC L2 Mux", "DAC MIX", "DAC MIXL" },
+        { "Stereo1 ADC L1 Mux", "ADC", "ADC L" },
+        { "Stereo1 ADC L1 Mux", "DAC MIX", "DAC MIXL" },
+
+        { "Stereo1 ADC R1 Mux", "ADC", "ADC R" },
+        { "Stereo1 ADC R1 Mux", "DAC MIX", "DAC MIXR" },
+        { "Stereo1 ADC R2 Mux", "DMIC", "Stereo1 DMIC Mux" },
+        { "Stereo1 ADC R2 Mux", "DAC MIX", "DAC MIXR" },
+
+        { "Mono ADC L2 Mux", "DMIC", "Mono DMIC L Mux" },
+        { "Mono ADC L2 Mux", "Mono DAC MIXL", "Mono DAC MIXL" },
+        { "Mono ADC L1 Mux", "Mono DAC MIXL", "Mono DAC MIXL" },
+        { "Mono ADC L1 Mux", "ADC", "ADC L" },
+
+        { "Mono ADC R1 Mux", "Mono DAC MIXR", "Mono DAC MIXR" },
+        { "Mono ADC R1 Mux", "ADC", "ADC R" },
+        { "Mono ADC R2 Mux", "DMIC", "Mono DMIC R Mux" },
+        { "Mono ADC R2 Mux", "Mono DAC MIXR", "Mono DAC MIXR" },
+
+        { "Sto1 ADC MIXL", "ADC1 Switch", "Stereo1 ADC L1 Mux" },
+        { "Sto1 ADC MIXL", "ADC2 Switch", "Stereo1 ADC L2 Mux" },
+        { "Sto1 ADC MIXR", "ADC1 Switch", "Stereo1 ADC R1 Mux" },
+        { "Sto1 ADC MIXR", "ADC2 Switch", "Stereo1 ADC R2 Mux" },
+
+        { "Stereo1 ADC MIXL", NULL, "Sto1 ADC MIXL" },
+        { "Stereo1 ADC MIXL", NULL, "adc stereo1 filter" },
+        { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
+
+        { "Stereo1 ADC MIXR", NULL, "Sto1 ADC MIXR" },
+        { "Stereo1 ADC MIXR", NULL, "adc stereo1 filter" },
+        { "adc stereo1 filter", NULL, "PLL1", is_sys_clk_from_pll },
+
+        { "Mono ADC MIXL", "ADC1 Switch", "Mono ADC L1 Mux" },
+        { "Mono ADC MIXL", "ADC2 Switch", "Mono ADC L2 Mux" },
+        { "Mono ADC MIXL", NULL, "adc mono left filter" },
+        { "adc mono left filter", NULL, "PLL1", is_sys_clk_from_pll },
+
+        { "Mono ADC MIXR", "ADC1 Switch", "Mono ADC R1 Mux" },
+        { "Mono ADC MIXR", "ADC2 Switch", "Mono ADC R2 Mux" },
+        { "Mono ADC MIXR", NULL, "adc mono right filter" },
+        { "adc mono right filter", NULL, "PLL1", is_sys_clk_from_pll },
+
+        { "VAD ADC Mux", "Sto1 ADC L", "Stereo1 ADC MIXL" },
+        { "VAD ADC Mux", "Mono ADC L", "Mono ADC MIXL" },
+        { "VAD ADC Mux", "Mono ADC R", "Mono ADC MIXR" },
+
+        { "IF_ADC1", NULL, "Stereo1 ADC MIXL" },
+        { "IF_ADC1", NULL, "Stereo1 ADC MIXR" },
+        { "IF_ADC2", NULL, "Mono ADC MIXL" },
+        { "IF_ADC2", NULL, "Mono ADC MIXR" },
+        { "VAD_ADC", NULL, "VAD ADC Mux" },
+
+        { "IF1 ADC Mux", "IF_ADC1", "IF_ADC1" },
+        { "IF1 ADC Mux", "IF_ADC2", "IF_ADC2" },
+        { "IF1 ADC Mux", "VAD_ADC", "VAD_ADC" },
+
+        { "IF2 ADC Mux", "IF_ADC1", "IF_ADC1" },
+        { "IF2 ADC Mux", "IF_ADC2", "IF_ADC2" },
+        { "IF2 ADC Mux", "VAD_ADC", "VAD_ADC" },
+
+        { "IF1 ADC", NULL, "I2S1" },
+        { "IF1 ADC", NULL, "IF1 ADC Mux" },
+        { "IF2 ADC", NULL, "I2S2" },
+        { "IF2 ADC", NULL, "IF2 ADC Mux" },
+
+        { "AIF1TX", NULL, "IF1 ADC" },
+        { "AIF1TX", NULL, "IF2 ADC" },
+        { "AIF2TX", NULL, "IF2 ADC" },
+
+        { "IF1 DAC1", NULL, "AIF1RX" },
+        { "IF1 DAC2", NULL, "AIF1RX" },
+        { "IF2 DAC", NULL, "AIF2RX" },
+
+        { "IF1 DAC1", NULL, "I2S1" },
+        { "IF1 DAC2", NULL, "I2S1" },
+        { "IF2 DAC", NULL, "I2S2" },
+
+        { "IF1 DAC2 L", NULL, "IF1 DAC2" },
+        { "IF1 DAC2 R", NULL, "IF1 DAC2" },
+        { "IF1 DAC1 L", NULL, "IF1 DAC1" },
+        { "IF1 DAC1 R", NULL, "IF1 DAC1" },
+        { "IF2 DAC L", NULL, "IF2 DAC" },
+        { "IF2 DAC R", NULL, "IF2 DAC" },
+
+        { "DAC1 L Mux", "IF1 DAC", "IF1 DAC1 L" },
+        { "DAC1 L Mux", "IF2 DAC", "IF2 DAC L" },
+
+        { "DAC1 R Mux", "IF1 DAC", "IF1 DAC1 R" },
+        { "DAC1 R Mux", "IF2 DAC", "IF2 DAC R" },
+
+        { "DAC1 MIXL", "Stereo ADC Switch", "Stereo1 ADC MIXL" },
+        { "DAC1 MIXL", "DAC1 Switch", "DAC1 L Mux" },
+        { "DAC1 MIXL", NULL, "dac stereo1 filter" },
+        { "DAC1 MIXR", "Stereo ADC Switch", "Stereo1 ADC MIXR" },
+        { "DAC1 MIXR", "DAC1 Switch", "DAC1 R Mux" },
+        { "DAC1 MIXR", NULL, "dac stereo1 filter" },
+
+        { "DAC L2 Mux", "IF1 DAC", "IF1 DAC2 L" },
+        { "DAC L2 Mux", "IF2 DAC", "IF2 DAC L" },
+        { "DAC L2 Mux", "Mono ADC", "Mono ADC MIXL" },
+        { "DAC L2 Mux", "VAD_ADC", "VAD_ADC" },
+        { "DAC L2 Volume", NULL, "DAC L2 Mux" },
+        { "DAC L2 Volume", NULL, "dac mono left filter" },
+
+        { "DAC R2 Mux", "IF1 DAC", "IF1 DAC2 R" },
+        { "DAC R2 Mux", "IF2 DAC", "IF2 DAC R" },
+        { "DAC R2 Mux", "Mono ADC", "Mono ADC MIXR" },
+        { "DAC R2 Mux", "Haptic", "Haptic Generator" },
+        { "DAC R2 Volume", NULL, "DAC R2 Mux" },
+        { "DAC R2 Volume", NULL, "dac mono right filter" },
+
+        { "Stereo DAC MIXL", "DAC L1 Switch", "DAC1 MIXL" },
+        { "Stereo DAC MIXL", "DAC R1 Switch", "DAC1 MIXR" },
+        { "Stereo DAC MIXL", "DAC L2 Switch", "DAC L2 Volume" },
+        { "Stereo DAC MIXL", NULL, "dac stereo1 filter" },
+        { "Stereo DAC MIXR", "DAC R1 Switch", "DAC1 MIXR" },
+        { "Stereo DAC MIXR", "DAC L1 Switch", "DAC1 MIXL" },
+        { "Stereo DAC MIXR", "DAC R2 Switch", "DAC R2 Volume" },
+        { "Stereo DAC MIXR", NULL, "dac stereo1 filter" },
+
+        { "Mono DAC MIXL", "DAC L1 Switch", "DAC1 MIXL" },
+        { "Mono DAC MIXL", "DAC L2 Switch", "DAC L2 Volume" },
+        { "Mono DAC MIXL", "DAC R2 Switch", "DAC R2 Volume" },
+        { "Mono DAC MIXL", NULL, "dac mono left filter" },
+        { "Mono DAC MIXR", "DAC R1 Switch", "DAC1 MIXR" },
+        { "Mono DAC MIXR", "DAC R2 Switch", "DAC R2 Volume" },
+        { "Mono DAC MIXR", "DAC L2 Switch", "DAC L2 Volume" },
+        { "Mono DAC MIXR", NULL, "dac mono right filter" },
+
+        { "DAC MIXL", "Sto DAC Mix L Switch", "Stereo DAC MIXL" },
+        { "DAC MIXL", "DAC L2 Switch", "DAC L2 Volume" },
+        { "DAC MIXL", "DAC R2 Switch", "DAC R2 Volume" },
+        { "DAC MIXR", "Sto DAC Mix R Switch", "Stereo DAC MIXR" },
+        { "DAC MIXR", "DAC R2 Switch", "DAC R2 Volume" },
+        { "DAC MIXR", "DAC L2 Switch", "DAC L2 Volume" },
+
+        { "DAC L1", NULL, "Stereo DAC MIXL" },
+        { "DAC L1", NULL, "PLL1", is_sys_clk_from_pll },
+        { "DAC R1", NULL, "Stereo DAC MIXR" },
+        { "DAC R1", NULL, "PLL1", is_sys_clk_from_pll },
+        { "DAC L2", NULL, "Mono DAC MIXL" },
+        { "DAC L2", NULL, "PLL1", is_sys_clk_from_pll },
+        { "DAC R2", NULL, "Mono DAC MIXR" },
+        { "DAC R2", NULL, "PLL1", is_sys_clk_from_pll },
+
+        { "SPK MIXL", "BST1 Switch", "BST1" },
+        { "SPK MIXL", "INL Switch", "INL VOL" },
+        { "SPK MIXL", "DAC L1 Switch", "DAC L1" },
+        { "SPK MIXL", "DAC L2 Switch", "DAC L2" },
+        { "SPK MIXR", "BST2 Switch", "BST2" },
+        { "SPK MIXR", "INR Switch", "INR VOL" },
+        { "SPK MIXR", "DAC R1 Switch", "DAC R1" },
+        { "SPK MIXR", "DAC R2 Switch", "DAC R2" },
+
+        { "OUT MIXL", "BST1 Switch", "BST1" },
+        { "OUT MIXL", "INL Switch", "INL VOL" },
+        { "OUT MIXL", "DAC L2 Switch", "DAC L2" },
+        { "OUT MIXL", "DAC L1 Switch", "DAC L1" },
+
+        { "OUT MIXR", "BST2 Switch", "BST2" },
+        { "OUT MIXR", "INR Switch", "INR VOL" },
+        { "OUT MIXR", "DAC R2 Switch", "DAC R2" },
+        { "OUT MIXR", "DAC R1 Switch", "DAC R1" },
+
+        { "HPOVOL MIXL", "DAC1 Switch", "DAC L1" },
+        { "HPOVOL MIXL", "DAC2 Switch", "DAC L2" },
+        { "HPOVOL MIXL", "INL Switch", "INL VOL" },
+        { "HPOVOL MIXL", "BST1 Switch", "BST1" },
+        { "HPOVOL MIXL", NULL, "HPOVOL MIXL Power" },
+        { "HPOVOL MIXR", "DAC1 Switch", "DAC R1" },
+        { "HPOVOL MIXR", "DAC2 Switch", "DAC R2" },
+        { "HPOVOL MIXR", "INR Switch", "INR VOL" },
+        { "HPOVOL MIXR", "BST2 Switch", "BST2" },
+        { "HPOVOL MIXR", NULL, "HPOVOL MIXR Power" },
+
+        { "DAC 2", NULL, "DAC L2" },
+        { "DAC 2", NULL, "DAC R2" },
+        { "DAC 1", NULL, "DAC L1" },
+        { "DAC 1", NULL, "DAC R1" },
+        { "HPOVOL L", "Switch", "HPOVOL MIXL" },
+        { "HPOVOL R", "Switch", "HPOVOL MIXR" },
+        { "HPOVOL", NULL, "HPOVOL L" },
+        { "HPOVOL", NULL, "HPOVOL R" },
+        { "HPO MIX", "DAC1 Switch", "DAC 1" },
+        { "HPO MIX", "HPVOL Switch", "HPOVOL" },
+
+        { "SPKVOL L", "Switch", "SPK MIXL" },
+        { "SPKVOL R", "Switch", "SPK MIXR" },
+
+        { "SPOL MIX", "DAC R1 Switch", "DAC R1" },
+        { "SPOL MIX", "DAC L1 Switch", "DAC L1" },
+        { "SPOL MIX", "SPKVOL R Switch", "SPKVOL R" },
+        { "SPOL MIX", "SPKVOL L Switch", "SPKVOL L" },
+        { "SPOR MIX", "DAC R1 Switch", "DAC R1" },
+        { "SPOR MIX", "SPKVOL R Switch", "SPKVOL R" },
+
+        { "LOUT MIX", "DAC L1 Switch", "DAC L1" },
+        { "LOUT MIX", "DAC R1 Switch", "DAC R1" },
+        { "LOUT MIX", "OUTMIX L Switch", "OUT MIXL" },
+        { "LOUT MIX", "OUTMIX R Switch", "OUT MIXR" },
+
+        { "PDM1 L Mux", "Stereo DAC", "Stereo DAC MIXL" },
+        { "PDM1 L Mux", "Mono DAC", "Mono DAC MIXL" },
+        { "PDM1 L Mux", NULL, "PDM1 Power" },
+        { "PDM1 R Mux", "Stereo DAC", "Stereo DAC MIXR" },
+        { "PDM1 R Mux", "Mono DAC", "Mono DAC MIXR" },
+        { "PDM1 R Mux", NULL, "PDM1 Power" },
+
+        { "HP amp", NULL, "HPO MIX" },
+        { "HP amp", NULL, "JD Power" },
+        { "HP amp", NULL, "Mic Det Power" },
+        { "HP amp", NULL, "LDO2" },
+        { "HPOL", NULL, "HP amp" },
+        { "HPOR", NULL, "HP amp" },
+
+        { "LOUT amp", NULL, "LOUT MIX" },
+        { "LOUTL", NULL, "LOUT amp" },
+        { "LOUTR", NULL, "LOUT amp" },
+
+        { "PDM1 L", "Switch", "PDM1 L Mux" },
+        { "PDM1 R", "Switch", "PDM1 R Mux" },
+
+        { "PDM1L", NULL, "PDM1 L" },
+        { "PDM1R", NULL, "PDM1 R" },
+
+        { "SPK amp", NULL, "SPOL MIX" },
+        { "SPK amp", NULL, "SPOR MIX" },
+        { "SPOL", NULL, "SPK amp" },
+        { "SPOR", NULL, "SPK amp" },
+};
+
+static int get_clk_info(int sclk, int rate)
+{
+        int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};
+
+        if (sclk <= 0 || rate <= 0)
+                return -EINVAL;
+
+        rate = rate << 8;
+        for (i = 0; i < ARRAY_SIZE(pd); i++)
+                if (sclk == rate * pd[i])
+                        return i;
+
+        return -EINVAL;
+}
+
+static int rt5645_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 rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+        unsigned int val_len = 0, val_clk, mask_clk;
+        int pre_div, bclk_ms, frame_size;
+
+        rt5645->lrck[dai->id] = params_rate(params);
+        pre_div = get_clk_info(rt5645->sysclk, rt5645->lrck[dai->id]);
+        if (pre_div < 0) {
+                dev_err(codec->dev, "Unsupported clock setting\n");
+                return -EINVAL;
+        }
+        frame_size = snd_soc_params_to_frame_size(params);
+        if (frame_size < 0) {
+                dev_err(codec->dev, "Unsupported frame size: %d\n", frame_size);
+                return -EINVAL;
+        }
+        bclk_ms = frame_size > 32;
+        rt5645->bclk[dai->id] = rt5645->lrck[dai->id] * (32 << bclk_ms);
+
+        dev_dbg(dai->dev, "bclk is %dHz and lrck is %dHz\n",
+                rt5645->bclk[dai->id], rt5645->lrck[dai->id]);
+        dev_dbg(dai->dev, "bclk_ms is %d and pre_div is %d for iis %d\n",
+                                bclk_ms, pre_div, dai->id);
+
+        switch (params_width(params)) {
+        case 16:
+                break;
+        case 20:
+                val_len |= RT5645_I2S_DL_20;
+                break;
+        case 24:
+                val_len |= RT5645_I2S_DL_24;
+                break;
+        case 8:
+                val_len |= RT5645_I2S_DL_8;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (dai->id) {
+        case RT5645_AIF1:
+                mask_clk = RT5645_I2S_BCLK_MS1_MASK | RT5645_I2S_PD1_MASK;
+                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);
+                snd_soc_update_bits(codec, RT5645_ADDA_CLK1, mask_clk, val_clk);
+                break;
+        case  RT5645_AIF2:
+                mask_clk = RT5645_I2S_BCLK_MS2_MASK | RT5645_I2S_PD2_MASK;
+                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);
+                snd_soc_update_bits(codec, RT5645_ADDA_CLK1, mask_clk, val_clk);
+                break;
+        default:
+                dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+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;
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                rt5645->master[dai->id] = 1;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                reg_val |= RT5645_I2S_MS_S;
+                rt5645->master[dai->id] = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                break;
+        case SND_SOC_DAIFMT_IB_NF:
+                reg_val |= RT5645_I2S_BP_INV;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                reg_val |= RT5645_I2S_DF_LEFT;
+                break;
+        case SND_SOC_DAIFMT_DSP_A:
+                reg_val |= RT5645_I2S_DF_PCM_A;
+                break;
+        case SND_SOC_DAIFMT_DSP_B:
+                reg_val |= RT5645_I2S_DF_PCM_B;
+                break;
+        default:
+                return -EINVAL;
+        }
+        switch (dai->id) {
+        case RT5645_AIF1:
+                snd_soc_update_bits(codec, RT5645_I2S1_SDP,
+                        RT5645_I2S_MS_MASK | RT5645_I2S_BP_MASK |
+                        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_DF_MASK, reg_val);
+                break;
+        default:
+                dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int rt5645_set_dai_sysclk(struct snd_soc_dai *dai,
+                int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+        unsigned int reg_val = 0;
+
+        if (freq == rt5645->sysclk && clk_id == rt5645->sysclk_src)
+                return 0;
+
+        switch (clk_id) {
+        case RT5645_SCLK_S_MCLK:
+                reg_val |= RT5645_SCLK_SRC_MCLK;
+                break;
+        case RT5645_SCLK_S_PLL1:
+                reg_val |= RT5645_SCLK_SRC_PLL1;
+                break;
+        case RT5645_SCLK_S_RCCLK:
+                reg_val |= RT5645_SCLK_SRC_RCCLK;
+                break;
+        default:
+                dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id);
+                return -EINVAL;
+        }
+        snd_soc_update_bits(codec, RT5645_GLB_CLK,
+                RT5645_SCLK_SRC_MASK, reg_val);
+        rt5645->sysclk = freq;
+        rt5645->sysclk_src = clk_id;
+
+        dev_dbg(dai->dev, "Sysclk is %dHz and clock id is %d\n", freq, clk_id);
+
+        return 0;
+}
+
+/**
+ * rt5645_pll_calc - Calcualte PLL M/N/K code.
+ * @freq_in: external clock provided to codec.
+ * @freq_out: target clock which codec works on.
+ * @pll_code: Pointer to structure with M, N, K and bypass flag.
+ *
+ * Calcualte M/N/K code to configure PLL for codec. And K is assigned to 2
+ * which make calculation more efficiently.
+ *
+ * Returns 0 for success or negative error code.
+ */
+static int rt5645_pll_calc(const unsigned int freq_in,
+        const unsigned int freq_out, struct rt5645_pll_code *pll_code)
+{
+        int max_n = RT5645_PLL_N_MAX, max_m = RT5645_PLL_M_MAX;
+        int k, n = 0, m = 0, red, n_t, m_t, pll_out, in_t, out_t;
+        int red_t = abs(freq_out - freq_in);
+        bool bypass = false;
+
+        if (RT5645_PLL_INP_MAX < freq_in || RT5645_PLL_INP_MIN > freq_in)
+                return -EINVAL;
+
+        k = 100000000 / freq_out - 2;
+        if (k > RT5645_PLL_K_MAX)
+                k = RT5645_PLL_K_MAX;
+        for (n_t = 0; n_t <= max_n; n_t++) {
+                in_t = freq_in / (k + 2);
+                pll_out = freq_out / (n_t + 2);
+                if (in_t < 0)
+                        continue;
+                if (in_t == pll_out) {
+                        bypass = true;
+                        n = n_t;
+                        goto code_find;
+                }
+                red = abs(in_t - pll_out);
+                if (red < red_t) {
+                        bypass = true;
+                        n = n_t;
+                        m = m_t;
+                        if (red == 0)
+                                goto code_find;
+                        red_t = red;
+                }
+                for (m_t = 0; m_t <= max_m; m_t++) {
+                        out_t = in_t / (m_t + 2);
+                        red = abs(out_t - pll_out);
+                        if (red < red_t) {
+                                bypass = false;
+                                n = n_t;
+                                m = m_t;
+                                if (red == 0)
+                                        goto code_find;
+                                red_t = red;
+                        }
+                }
+        }
+        pr_debug("Only get approximation about PLL\n");
+
+code_find:
+
+        pll_code->m_bp = bypass;
+        pll_code->m_code = m;
+        pll_code->n_code = n;
+        pll_code->k_code = k;
+        return 0;
+}
+
+static int rt5645_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
+                        unsigned int freq_in, unsigned int freq_out)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+        struct rt5645_pll_code pll_code;
+        int ret;
+
+        if (source == rt5645->pll_src && freq_in == rt5645->pll_in &&
+            freq_out == rt5645->pll_out)
+                return 0;
+
+        if (!freq_in || !freq_out) {
+                dev_dbg(codec->dev, "PLL disabled\n");
+
+                rt5645->pll_in = 0;
+                rt5645->pll_out = 0;
+                snd_soc_update_bits(codec, RT5645_GLB_CLK,
+                        RT5645_SCLK_SRC_MASK, RT5645_SCLK_SRC_MCLK);
+                return 0;
+        }
+
+        switch (source) {
+        case RT5645_PLL1_S_MCLK:
+                snd_soc_update_bits(codec, RT5645_GLB_CLK,
+                        RT5645_PLL1_SRC_MASK, RT5645_PLL1_SRC_MCLK);
+                break;
+        case RT5645_PLL1_S_BCLK1:
+        case RT5645_PLL1_S_BCLK2:
+                switch (dai->id) {
+                case RT5645_AIF1:
+                        snd_soc_update_bits(codec, RT5645_GLB_CLK,
+                                RT5645_PLL1_SRC_MASK, RT5645_PLL1_SRC_BCLK1);
+                        break;
+                case  RT5645_AIF2:
+                        snd_soc_update_bits(codec, RT5645_GLB_CLK,
+                                RT5645_PLL1_SRC_MASK, RT5645_PLL1_SRC_BCLK2);
+                        break;
+                default:
+                        dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id);
+                        return -EINVAL;
+                }
+                break;
+        default:
+                dev_err(codec->dev, "Unknown PLL source %d\n", source);
+                return -EINVAL;
+        }
+
+        ret = rt5645_pll_calc(freq_in, freq_out, &pll_code);
+        if (ret < 0) {
+                dev_err(codec->dev, "Unsupport input clock %d\n", freq_in);
+                return ret;
+        }
+
+        dev_dbg(codec->dev, "bypass=%d m=%d n=%d k=%d\n",
+                pll_code.m_bp, (pll_code.m_bp ? 0 : pll_code.m_code),
+                pll_code.n_code, pll_code.k_code);
+
+        snd_soc_write(codec, RT5645_PLL_CTRL1,
+                pll_code.n_code << RT5645_PLL_N_SFT | pll_code.k_code);
+        snd_soc_write(codec, RT5645_PLL_CTRL2,
+                (pll_code.m_bp ? 0 : pll_code.m_code) << RT5645_PLL_M_SFT |
+                pll_code.m_bp << RT5645_PLL_M_BP_SFT);
+
+        rt5645->pll_in = freq_in;
+        rt5645->pll_out = freq_out;
+        rt5645->pll_src = source;
+
+        return 0;
+}
+
+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;
+
+        if (rx_mask || tx_mask)
+                val |= (1 << 14);
+
+        switch (slots) {
+        case 4:
+                val |= (1 << 12);
+                break;
+        case 6:
+                val |= (2 << 12);
+                break;
+        case 8:
+                val |= (3 << 12);
+                break;
+        case 2:
+        default:
+                break;
+        }
+
+        switch (slot_width) {
+        case 20:
+                val |= (1 << 10);
+                break;
+        case 24:
+                val |= (2 << 10);
+                break;
+        case 32:
+                val |= (3 << 10);
+                break;
+        case 16:
+        default:
+                break;
+        }
+
+        snd_soc_update_bits(codec, RT5645_TDM_CTRL_1, 0x7c00, val);
+
+        return 0;
+}
+
+static int rt5645_set_bias_level(struct snd_soc_codec *codec,
+                        enum snd_soc_bias_level level)
+{
+        switch (level) {
+        case SND_SOC_BIAS_STANDBY:
+                if (SND_SOC_BIAS_OFF == codec->dapm.bias_level) {
+                        snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
+                                RT5645_PWR_VREF1 | RT5645_PWR_MB |
+                                RT5645_PWR_BG | RT5645_PWR_VREF2,
+                                RT5645_PWR_VREF1 | RT5645_PWR_MB |
+                                RT5645_PWR_BG | RT5645_PWR_VREF2);
+                        mdelay(10);
+                        snd_soc_update_bits(codec, RT5645_PWR_ANLG1,
+                                RT5645_PWR_FV1 | RT5645_PWR_FV2,
+                                RT5645_PWR_FV1 | RT5645_PWR_FV2);
+                        snd_soc_update_bits(codec, RT5645_GEN_CTRL1,
+                                RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL);
+                }
+                break;
+
+        case SND_SOC_BIAS_OFF:
+                snd_soc_write(codec, RT5645_DEPOP_M2, 0x1100);
+                snd_soc_write(codec, RT5645_GEN_CTRL1, 0x0128);
+                snd_soc_write(codec, RT5645_PWR_DIG1, 0x0000);
+                snd_soc_write(codec, RT5645_PWR_DIG2, 0x0000);
+                snd_soc_write(codec, RT5645_PWR_VOL, 0x0000);
+                snd_soc_write(codec, RT5645_PWR_MIXER, 0x0000);
+                snd_soc_write(codec, RT5645_PWR_ANLG1, 0x0000);
+                snd_soc_write(codec, RT5645_PWR_ANLG2, 0x0000);
+                break;
+
+        default:
+                break;
+        }
+        codec->dapm.bias_level = level;
+
+        return 0;
+}
+
+static int rt5645_probe(struct snd_soc_codec *codec)
+{
+        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+
+        rt5645->codec = codec;
+
+        rt5645_set_bias_level(codec, SND_SOC_BIAS_OFF);
+
+        snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200);
+
+        return 0;
+}
+
+static int rt5645_remove(struct snd_soc_codec *codec)
+{
+        rt5645_reset(codec);
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int rt5645_suspend(struct snd_soc_codec *codec)
+{
+        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+
+        regcache_cache_only(rt5645->regmap, true);
+        regcache_mark_dirty(rt5645->regmap);
+
+        return 0;
+}
+
+static int rt5645_resume(struct snd_soc_codec *codec)
+{
+        struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
+
+        regcache_cache_only(rt5645->regmap, false);
+        regcache_sync(rt5645->regmap);
+
+        return 0;
+}
+#else
+#define rt5645_suspend NULL
+#define rt5645_resume NULL
+#endif
+
+#define RT5645_STEREO_RATES SNDRV_PCM_RATE_8000_96000
+#define RT5645_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
+                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8)
+
+static struct snd_soc_dai_ops rt5645_aif_dai_ops = {
+        .hw_params = rt5645_hw_params,
+        .set_fmt = rt5645_set_dai_fmt,
+        .set_sysclk = rt5645_set_dai_sysclk,
+        .set_tdm_slot = rt5645_set_tdm_slot,
+        .set_pll = rt5645_set_dai_pll,
+};
+
+static struct snd_soc_dai_driver rt5645_dai[] = {
+        {
+                .name = "rt5645-aif1",
+                .id = RT5645_AIF1,
+                .playback = {
+                        .stream_name = "AIF1 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5645_STEREO_RATES,
+                        .formats = RT5645_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF1 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5645_STEREO_RATES,
+                        .formats = RT5645_FORMATS,
+                },
+                .ops = &rt5645_aif_dai_ops,
+        },
+        {
+                .name = "rt5645-aif2",
+                .id = RT5645_AIF2,
+                .playback = {
+                        .stream_name = "AIF2 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5645_STEREO_RATES,
+                        .formats = RT5645_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF2 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5645_STEREO_RATES,
+                        .formats = RT5645_FORMATS,
+                },
+                .ops = &rt5645_aif_dai_ops,
+        },
+};
+
+static struct snd_soc_codec_driver soc_codec_dev_rt5645 = {
+        .probe = rt5645_probe,
+        .remove = rt5645_remove,
+        .suspend = rt5645_suspend,
+        .resume = rt5645_resume,
+        .set_bias_level = rt5645_set_bias_level,
+        .idle_bias_off = true,
+        .controls = rt5645_snd_controls,
+        .num_controls = ARRAY_SIZE(rt5645_snd_controls),
+        .dapm_widgets = rt5645_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(rt5645_dapm_widgets),
+        .dapm_routes = rt5645_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(rt5645_dapm_routes),
+};
+
+static const struct regmap_config rt5645_regmap = {
+        .reg_bits = 8,
+        .val_bits = 16,
+
+        .max_register = RT5645_VENDOR_ID2 + 1 + (ARRAY_SIZE(rt5645_ranges) *
+                                               RT5645_PR_SPACING),
+        .volatile_reg = rt5645_volatile_register,
+        .readable_reg = rt5645_readable_register,
+
+        .cache_type = REGCACHE_RBTREE,
+        .reg_defaults = rt5645_reg,
+        .num_reg_defaults = ARRAY_SIZE(rt5645_reg),
+        .ranges = rt5645_ranges,
+        .num_ranges = ARRAY_SIZE(rt5645_ranges),
+};
+
+static const struct i2c_device_id rt5645_i2c_id[] = {
+        { "rt5645", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id);
+
+static int rt5645_i2c_probe(struct i2c_client *i2c,
+                    const struct i2c_device_id *id)
+{
+        struct rt5645_platform_data *pdata = dev_get_platdata(&i2c->dev);
+        struct rt5645_priv *rt5645;
+        int ret;
+        unsigned int val;
+
+        rt5645 = devm_kzalloc(&i2c->dev, sizeof(struct rt5645_priv),
+                                GFP_KERNEL);
+        if (rt5645 == NULL)
+                return -ENOMEM;
+
+        i2c_set_clientdata(i2c, rt5645);
+
+        if (pdata)
+                rt5645->pdata = *pdata;
+
+        rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap);
+        if (IS_ERR(rt5645->regmap)) {
+                ret = PTR_ERR(rt5645->regmap);
+                dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
+                        ret);
+                return ret;
+        }
+
+        regmap_read(rt5645->regmap, RT5645_VENDOR_ID2, &val);
+        if (val != RT5645_DEVICE_ID) {
+                dev_err(&i2c->dev,
+                        "Device with ID register %x is not rt5645\n", val);
+                return -ENODEV;
+        }
+
+        regmap_write(rt5645->regmap, RT5645_RESET, 0);
+
+        ret = regmap_register_patch(rt5645->regmap, init_list,
+                                    ARRAY_SIZE(init_list));
+        if (ret != 0)
+                dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
+
+        if (rt5645->pdata.in2_diff)
+                regmap_update_bits(rt5645->regmap, RT5645_IN2_CTRL,
+                                        RT5645_IN_DF2, RT5645_IN_DF2);
+
+        if (rt5645->pdata.dmic_en) {
+                regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,
+                        RT5645_GP2_PIN_MASK, RT5645_GP2_PIN_DMIC1_SCL);
+
+                switch (rt5645->pdata.dmic1_data_pin) {
+                case RT5645_DMIC_DATA_IN2N:
+                        regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,
+                                RT5645_DMIC_1_DP_MASK, RT5645_DMIC_1_DP_IN2N);
+                        break;
+
+                case RT5645_DMIC_DATA_GPIO5:
+                        regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,
+                                RT5645_DMIC_1_DP_MASK, RT5645_DMIC_1_DP_GPIO5);
+                        regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,
+                                RT5645_GP5_PIN_MASK, RT5645_GP5_PIN_DMIC1_SDA);
+                        break;
+
+                case RT5645_DMIC_DATA_GPIO11:
+                        regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,
+                                RT5645_DMIC_1_DP_MASK, RT5645_DMIC_1_DP_GPIO11);
+                        regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,
+                                RT5645_GP11_PIN_MASK,
+                                RT5645_GP11_PIN_DMIC1_SDA);
+                        break;
+
+                default:
+                        break;
+                }
+
+                switch (rt5645->pdata.dmic2_data_pin) {
+                case RT5645_DMIC_DATA_IN2P:
+                        regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,
+                                RT5645_DMIC_2_DP_MASK, RT5645_DMIC_2_DP_IN2P);
+                        break;
+
+                case RT5645_DMIC_DATA_GPIO6:
+                        regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,
+                                RT5645_DMIC_2_DP_MASK, RT5645_DMIC_2_DP_GPIO6);
+                        regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,
+                                RT5645_GP6_PIN_MASK, RT5645_GP6_PIN_DMIC2_SDA);
+                        break;
+
+                case RT5645_DMIC_DATA_GPIO10:
+                        regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,
+                                RT5645_DMIC_2_DP_MASK, RT5645_DMIC_2_DP_GPIO10);
+                        regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,
+                                RT5645_GP10_PIN_MASK,
+                                RT5645_GP10_PIN_DMIC2_SDA);
+                        break;
+
+                case RT5645_DMIC_DATA_GPIO12:
+                        regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,
+                                RT5645_DMIC_1_DP_MASK, RT5645_DMIC_2_DP_GPIO12);
+                        regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,
+                                RT5645_GP12_PIN_MASK,
+                                RT5645_GP12_PIN_DMIC2_SDA);
+                        break;
+
+                default:
+                        break;
+                }
+
+        }
+
+        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5645,
+                        rt5645_dai, ARRAY_SIZE(rt5645_dai));
+        if (ret < 0)
+                goto err;
+
+        return 0;
+err:
+        return ret;
+}
+
+static int rt5645_i2c_remove(struct i2c_client *i2c)
+{
+        snd_soc_unregister_codec(&i2c->dev);
+
+        return 0;
+}
+
+static struct i2c_driver rt5645_i2c_driver = {
+        .driver = {
+                .name = "rt5645",
+                .owner = THIS_MODULE,
+        },
+        .probe = rt5645_i2c_probe,
+        .remove   = rt5645_i2c_remove,
+        .id_table = rt5645_i2c_id,
+};
+module_i2c_driver(rt5645_i2c_driver);
+
+MODULE_DESCRIPTION("ASoC RT5645 driver");
+MODULE_AUTHOR("Bard Liao <bardliao@realtek.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h
new file mode 100644
index 000000000000..345aa3f5d14f
--- /dev/null
+++ b/sound/soc/codecs/rt5645.h
@@ -0,0 +1,2188 @@
+/*
+ * rt5645.h  --  RT5645 ALSA SoC audio driver
+ *
+ * Copyright 2013 Realtek Microelectronics
+ * Author: Bard Liao <bardliao@realtek.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.
+ */
+
+#ifndef __RT5645_H__
+#define __RT5645_H__
+
+#include <sound/rt5645.h>
+
+/* Info */
+#define RT5645_RESET                            0x00
+#define RT5645_VENDOR_ID                        0xfd
+#define RT5645_VENDOR_ID1                       0xfe
+#define RT5645_VENDOR_ID2                       0xff
+/*  I/O - Output */
+#define RT5645_SPK_VOL                          0x01
+#define RT5645_HP_VOL                           0x02
+#define RT5645_LOUT1                            0x03
+#define RT5645_LOUT_CTRL                        0x05
+/* I/O - Input */
+#define RT5645_IN1_CTRL1                        0x0a
+#define RT5645_IN1_CTRL2                        0x0b
+#define RT5645_IN1_CTRL3                        0x0c
+#define RT5645_IN2_CTRL                         0x0d
+#define RT5645_INL1_INR1_VOL                    0x0f
+#define RT5645_SPK_FUNC_LIM                     0x14
+#define RT5645_ADJ_HPF_CTRL                     0x16
+/* I/O - ADC/DAC/DMIC */
+#define RT5645_DAC1_DIG_VOL                     0x19
+#define RT5645_DAC2_DIG_VOL                     0x1a
+#define RT5645_DAC_CTRL                         0x1b
+#define RT5645_STO1_ADC_DIG_VOL                 0x1c
+#define RT5645_MONO_ADC_DIG_VOL                 0x1d
+#define RT5645_ADC_BST_VOL1                     0x1e
+/* Mixer - D-D */
+#define RT5645_ADC_BST_VOL2                     0x20
+#define RT5645_STO1_ADC_MIXER                   0x27
+#define RT5645_MONO_ADC_MIXER                   0x28
+#define RT5645_AD_DA_MIXER                      0x29
+#define RT5645_STO_DAC_MIXER                    0x2a
+#define RT5645_MONO_DAC_MIXER                   0x2b
+#define RT5645_DIG_MIXER                        0x2c
+#define RT5645_DIG_INF1_DATA                    0x2f
+/* Mixer - PDM */
+#define RT5645_PDM_OUT_CTRL                     0x31
+/* Mixer - ADC */
+#define RT5645_REC_L1_MIXER                     0x3b
+#define RT5645_REC_L2_MIXER                     0x3c
+#define RT5645_REC_R1_MIXER                     0x3d
+#define RT5645_REC_R2_MIXER                     0x3e
+/* Mixer - DAC */
+#define RT5645_HPMIXL_CTRL                      0x3f
+#define RT5645_HPOMIXL_CTRL                     0x40
+#define RT5645_HPMIXR_CTRL                      0x41
+#define RT5645_HPOMIXR_CTRL                     0x42
+#define RT5645_HPO_MIXER                        0x45
+#define RT5645_SPK_L_MIXER                      0x46
+#define RT5645_SPK_R_MIXER                      0x47
+#define RT5645_SPO_MIXER                        0x48
+#define RT5645_SPO_CLSD_RATIO                   0x4a
+#define RT5645_OUT_L_GAIN1                      0x4d
+#define RT5645_OUT_L_GAIN2                      0x4e
+#define RT5645_OUT_L1_MIXER                     0x4f
+#define RT5645_OUT_R_GAIN1                      0x50
+#define RT5645_OUT_R_GAIN2                      0x51
+#define RT5645_OUT_R1_MIXER                     0x52
+#define RT5645_LOUT_MIXER                       0x53
+/* Haptic */
+#define RT5645_HAPTIC_CTRL1                     0x56
+#define RT5645_HAPTIC_CTRL2                     0x57
+#define RT5645_HAPTIC_CTRL3                     0x58
+#define RT5645_HAPTIC_CTRL4                     0x59
+#define RT5645_HAPTIC_CTRL5                     0x5a
+#define RT5645_HAPTIC_CTRL6                     0x5b
+#define RT5645_HAPTIC_CTRL7                     0x5c
+#define RT5645_HAPTIC_CTRL8                     0x5d
+#define RT5645_HAPTIC_CTRL9                     0x5e
+#define RT5645_HAPTIC_CTRL10                    0x5f
+/* Power */
+#define RT5645_PWR_DIG1                         0x61
+#define RT5645_PWR_DIG2                         0x62
+#define RT5645_PWR_ANLG1                        0x63
+#define RT5645_PWR_ANLG2                        0x64
+#define RT5645_PWR_MIXER                        0x65
+#define RT5645_PWR_VOL                          0x66
+/* Private Register Control */
+#define RT5645_PRIV_INDEX                       0x6a
+#define RT5645_PRIV_DATA                        0x6c
+/* Format - ADC/DAC */
+#define RT5645_I2S1_SDP                         0x70
+#define RT5645_I2S2_SDP                         0x71
+#define RT5645_ADDA_CLK1                        0x73
+#define RT5645_ADDA_CLK2                        0x74
+#define RT5645_DMIC_CTRL1                       0x75
+#define RT5645_DMIC_CTRL2                       0x76
+/* Format - TDM Control */
+#define RT5645_TDM_CTRL_1                       0x77
+#define RT5645_TDM_CTRL_2                       0x78
+#define RT5645_TDM_CTRL_3                       0x79
+
+/* Function - Analog */
+#define RT5645_GLB_CLK                          0x80
+#define RT5645_PLL_CTRL1                        0x81
+#define RT5645_PLL_CTRL2                        0x82
+#define RT5645_ASRC_1                           0x83
+#define RT5645_ASRC_2                           0x84
+#define RT5645_ASRC_3                           0x85
+#define RT5645_ASRC_4                           0x8a
+#define RT5645_DEPOP_M1                         0x8e
+#define RT5645_DEPOP_M2                         0x8f
+#define RT5645_DEPOP_M3                         0x90
+#define RT5645_CHARGE_PUMP                      0x91
+#define RT5645_MICBIAS                          0x93
+#define RT5645_A_JD_CTRL1                       0x94
+#define RT5645_VAD_CTRL4                        0x9d
+#define RT5645_CLSD_OUT_CTRL                    0xa0
+/* Function - Digital */
+#define RT5645_ADC_EQ_CTRL1                     0xae
+#define RT5645_ADC_EQ_CTRL2                     0xaf
+#define RT5645_EQ_CTRL1                         0xb0
+#define RT5645_EQ_CTRL2                         0xb1
+#define RT5645_ALC_CTRL_1                       0xb3
+#define RT5645_ALC_CTRL_2                       0xb4
+#define RT5645_ALC_CTRL_3                       0xb5
+#define RT5645_ALC_CTRL_4                       0xb6
+#define RT5645_ALC_CTRL_5                       0xb7
+#define RT5645_JD_CTRL                          0xbb
+#define RT5645_IRQ_CTRL1                        0xbc
+#define RT5645_IRQ_CTRL2                        0xbd
+#define RT5645_IRQ_CTRL3                        0xbe
+#define RT5645_INT_IRQ_ST                       0xbf
+#define RT5645_GPIO_CTRL1                       0xc0
+#define RT5645_GPIO_CTRL2                       0xc1
+#define RT5645_GPIO_CTRL3                       0xc2
+#define RT5645_BASS_BACK                        0xcf
+#define RT5645_MP3_PLUS1                        0xd0
+#define RT5645_MP3_PLUS2                        0xd1
+#define RT5645_ADJ_HPF1                         0xd3
+#define RT5645_ADJ_HPF2                         0xd4
+#define RT5645_HP_CALIB_AMP_DET                 0xd6
+#define RT5645_SV_ZCD1                          0xd9
+#define RT5645_SV_ZCD2                          0xda
+#define RT5645_IL_CMD                           0xdb
+#define RT5645_IL_CMD2                          0xdc
+#define RT5645_IL_CMD3                          0xdd
+#define RT5645_DRC1_HL_CTRL1                    0xe7
+#define RT5645_DRC2_HL_CTRL1                    0xe9
+#define RT5645_MUTI_DRC_CTRL1                   0xea
+#define RT5645_ADC_MONO_HP_CTRL1                0xec
+#define RT5645_ADC_MONO_HP_CTRL2                0xed
+#define RT5645_DRC2_CTRL1                       0xf0
+#define RT5645_DRC2_CTRL2                       0xf1
+#define RT5645_DRC2_CTRL3                       0xf2
+#define RT5645_DRC2_CTRL4                       0xf3
+#define RT5645_DRC2_CTRL5                       0xf4
+#define RT5645_JD_CTRL3                         0xf8
+#define RT5645_JD_CTRL4                         0xf9
+/* General Control */
+#define RT5645_GEN_CTRL1                        0xfa
+#define RT5645_GEN_CTRL2                        0xfb
+#define RT5645_GEN_CTRL3                        0xfc
+
+
+/* Index of Codec Private Register definition */
+#define RT5645_DIG_VOL                          0x00
+#define RT5645_PR_ALC_CTRL_1                    0x01
+#define RT5645_PR_ALC_CTRL_2                    0x02
+#define RT5645_PR_ALC_CTRL_3                    0x03
+#define RT5645_PR_ALC_CTRL_4                    0x04
+#define RT5645_PR_ALC_CTRL_5                    0x05
+#define RT5645_PR_ALC_CTRL_6                    0x06
+#define RT5645_BIAS_CUR1                        0x12
+#define RT5645_BIAS_CUR3                        0x14
+#define RT5645_CLSD_INT_REG1                    0x1c
+#define RT5645_MAMP_INT_REG2                    0x37
+#define RT5645_CHOP_DAC_ADC                     0x3d
+#define RT5645_MIXER_INT_REG                    0x3f
+#define RT5645_3D_SPK                           0x63
+#define RT5645_WND_1                            0x6c
+#define RT5645_WND_2                            0x6d
+#define RT5645_WND_3                            0x6e
+#define RT5645_WND_4                            0x6f
+#define RT5645_WND_5                            0x70
+#define RT5645_WND_8                            0x73
+#define RT5645_DIP_SPK_INF                      0x75
+#define RT5645_HP_DCC_INT1                      0x77
+#define RT5645_EQ_BW_LOP                        0xa0
+#define RT5645_EQ_GN_LOP                        0xa1
+#define RT5645_EQ_FC_BP1                        0xa2
+#define RT5645_EQ_BW_BP1                        0xa3
+#define RT5645_EQ_GN_BP1                        0xa4
+#define RT5645_EQ_FC_BP2                        0xa5
+#define RT5645_EQ_BW_BP2                        0xa6
+#define RT5645_EQ_GN_BP2                        0xa7
+#define RT5645_EQ_FC_BP3                        0xa8
+#define RT5645_EQ_BW_BP3                        0xa9
+#define RT5645_EQ_GN_BP3                        0xaa
+#define RT5645_EQ_FC_BP4                        0xab
+#define RT5645_EQ_BW_BP4                        0xac
+#define RT5645_EQ_GN_BP4                        0xad
+#define RT5645_EQ_FC_HIP1                       0xae
+#define RT5645_EQ_GN_HIP1                       0xaf
+#define RT5645_EQ_FC_HIP2                       0xb0
+#define RT5645_EQ_BW_HIP2                       0xb1
+#define RT5645_EQ_GN_HIP2                       0xb2
+#define RT5645_EQ_PRE_VOL                       0xb3
+#define RT5645_EQ_PST_VOL                       0xb4
+
+
+/* global definition */
+#define RT5645_L_MUTE                           (0x1 << 15)
+#define RT5645_L_MUTE_SFT                       15
+#define RT5645_VOL_L_MUTE                       (0x1 << 14)
+#define RT5645_VOL_L_SFT                        14
+#define RT5645_R_MUTE                           (0x1 << 7)
+#define RT5645_R_MUTE_SFT                       7
+#define RT5645_VOL_R_MUTE                       (0x1 << 6)
+#define RT5645_VOL_R_SFT                        6
+#define RT5645_L_VOL_MASK                       (0x3f << 8)
+#define RT5645_L_VOL_SFT                        8
+#define RT5645_R_VOL_MASK                       (0x3f)
+#define RT5645_R_VOL_SFT                        0
+
+/* IN1 Control 1 (0x0a) */
+#define RT5645_CBJ_BST1_MASK                    (0xf << 12)
+#define RT5645_CBJ_BST1_SFT                     (12)
+#define RT5645_CBJ_JD_HP_EN                     (0x1 << 9)
+#define RT5645_CBJ_JD_MIC_EN                    (0x1 << 8)
+#define RT5645_CBJ_JD_MIC_SW_EN                 (0x1 << 7)
+#define RT5645_CBJ_MIC_SEL_R                    (0x1 << 6)
+#define RT5645_CBJ_MIC_SEL_L                    (0x1 << 5)
+#define RT5645_CBJ_MIC_SW                       (0x1 << 4)
+#define RT5645_CBJ_BST1_EN                      (0x1 << 2)
+
+/* IN1 Control 2 (0x0b) */
+#define RT5645_CBJ_MN_JD                        (0x1 << 12)
+#define RT5645_CAPLESS_EN                       (0x1 << 11)
+#define RT5645_CBJ_DET_MODE                     (0x1 << 7)
+
+/* IN1 Control 3 (0x0c) */
+#define RT5645_CBJ_TIE_G_L                      (0x1 << 15)
+#define RT5645_CBJ_TIE_G_R                      (0x1 << 14)
+
+/* IN2 Control (0x0d) */
+#define RT5645_BST_MASK1                        (0xf<<12)
+#define RT5645_BST_SFT1                         12
+#define RT5645_BST_MASK2                        (0xf<<8)
+#define RT5645_BST_SFT2                         8
+#define RT5645_IN_DF2                           (0x1 << 6)
+#define RT5645_IN_SFT2                          6
+
+/* INL and INR Volume Control (0x0f) */
+#define RT5645_INL_SEL_MASK                     (0x1 << 15)
+#define RT5645_INL_SEL_SFT                      15
+#define RT5645_INL_SEL_IN4P                     (0x0 << 15)
+#define RT5645_INL_SEL_MONOP                    (0x1 << 15)
+#define RT5645_INL_VOL_MASK                     (0x1f << 8)
+#define RT5645_INL_VOL_SFT                      8
+#define RT5645_INR_SEL_MASK                     (0x1 << 7)
+#define RT5645_INR_SEL_SFT                      7
+#define RT5645_INR_SEL_IN4N                     (0x0 << 7)
+#define RT5645_INR_SEL_MONON                    (0x1 << 7)
+#define RT5645_INR_VOL_MASK                     (0x1f)
+#define RT5645_INR_VOL_SFT                      0
+
+/* DAC1 Digital Volume (0x19) */
+#define RT5645_DAC_L1_VOL_MASK                  (0xff << 8)
+#define RT5645_DAC_L1_VOL_SFT                   8
+#define RT5645_DAC_R1_VOL_MASK                  (0xff)
+#define RT5645_DAC_R1_VOL_SFT                   0
+
+/* DAC2 Digital Volume (0x1a) */
+#define RT5645_DAC_L2_VOL_MASK                  (0xff << 8)
+#define RT5645_DAC_L2_VOL_SFT                   8
+#define RT5645_DAC_R2_VOL_MASK                  (0xff)
+#define RT5645_DAC_R2_VOL_SFT                   0
+
+/* DAC2 Control (0x1b) */
+#define RT5645_M_DAC_L2_VOL                     (0x1 << 13)
+#define RT5645_M_DAC_L2_VOL_SFT                 13
+#define RT5645_M_DAC_R2_VOL                     (0x1 << 12)
+#define RT5645_M_DAC_R2_VOL_SFT                 12
+#define RT5645_DAC2_L_SEL_MASK                  (0x7 << 4)
+#define RT5645_DAC2_L_SEL_SFT                   4
+#define RT5645_DAC2_R_SEL_MASK                  (0x7 << 0)
+#define RT5645_DAC2_R_SEL_SFT                   0
+
+/* ADC Digital Volume Control (0x1c) */
+#define RT5645_ADC_L_VOL_MASK                   (0x7f << 8)
+#define RT5645_ADC_L_VOL_SFT                    8
+#define RT5645_ADC_R_VOL_MASK                   (0x7f)
+#define RT5645_ADC_R_VOL_SFT                    0
+
+/* Mono ADC Digital Volume Control (0x1d) */
+#define RT5645_MONO_ADC_L_VOL_MASK              (0x7f << 8)
+#define RT5645_MONO_ADC_L_VOL_SFT               8
+#define RT5645_MONO_ADC_R_VOL_MASK              (0x7f)
+#define RT5645_MONO_ADC_R_VOL_SFT               0
+
+/* ADC Boost Volume Control (0x1e) */
+#define RT5645_STO1_ADC_L_BST_MASK              (0x3 << 14)
+#define RT5645_STO1_ADC_L_BST_SFT               14
+#define RT5645_STO1_ADC_R_BST_MASK              (0x3 << 12)
+#define RT5645_STO1_ADC_R_BST_SFT               12
+#define RT5645_STO1_ADC_COMP_MASK               (0x3 << 10)
+#define RT5645_STO1_ADC_COMP_SFT                10
+#define RT5645_STO2_ADC_L_BST_MASK              (0x3 << 8)
+#define RT5645_STO2_ADC_L_BST_SFT               8
+#define RT5645_STO2_ADC_R_BST_MASK              (0x3 << 6)
+#define RT5645_STO2_ADC_R_BST_SFT               6
+#define RT5645_STO2_ADC_COMP_MASK               (0x3 << 4)
+#define RT5645_STO2_ADC_COMP_SFT                4
+
+/* Stereo2 ADC Mixer Control (0x26) */
+#define RT5645_STO2_ADC_SRC_MASK                (0x1 << 15)
+#define RT5645_STO2_ADC_SRC_SFT                 15
+
+/* Stereo ADC Mixer Control (0x27) */
+#define RT5645_M_ADC_L1                         (0x1 << 14)
+#define RT5645_M_ADC_L1_SFT                     14
+#define RT5645_M_ADC_L2                         (0x1 << 13)
+#define RT5645_M_ADC_L2_SFT                     13
+#define RT5645_ADC_1_SRC_MASK                   (0x1 << 12)
+#define RT5645_ADC_1_SRC_SFT                    12
+#define RT5645_ADC_1_SRC_ADC                    (0x1 << 12)
+#define RT5645_ADC_1_SRC_DACMIX                 (0x0 << 12)
+#define RT5645_ADC_2_SRC_MASK                   (0x1 << 11)
+#define RT5645_ADC_2_SRC_SFT                    11
+#define RT5645_DMIC_SRC_MASK                    (0x1 << 8)
+#define RT5645_DMIC_SRC_SFT                     8
+#define RT5645_M_ADC_R1                         (0x1 << 6)
+#define RT5645_M_ADC_R1_SFT                     6
+#define RT5645_M_ADC_R2                         (0x1 << 5)
+#define RT5645_M_ADC_R2_SFT                     5
+#define RT5645_DMIC3_SRC_MASK                   (0x1 << 1)
+#define RT5645_DMIC3_SRC_SFT                    0
+
+/* Mono ADC Mixer Control (0x28) */
+#define RT5645_M_MONO_ADC_L1                    (0x1 << 14)
+#define RT5645_M_MONO_ADC_L1_SFT                14
+#define RT5645_M_MONO_ADC_L2                    (0x1 << 13)
+#define RT5645_M_MONO_ADC_L2_SFT                13
+#define RT5645_MONO_ADC_L1_SRC_MASK             (0x1 << 12)
+#define RT5645_MONO_ADC_L1_SRC_SFT              12
+#define RT5645_MONO_ADC_L1_SRC_DACMIXL          (0x0 << 12)
+#define RT5645_MONO_ADC_L1_SRC_ADCL             (0x1 << 12)
+#define RT5645_MONO_ADC_L2_SRC_MASK             (0x1 << 11)
+#define RT5645_MONO_ADC_L2_SRC_SFT              11
+#define RT5645_MONO_DMIC_L_SRC_MASK             (0x1 << 8)
+#define RT5645_MONO_DMIC_L_SRC_SFT              8
+#define RT5645_M_MONO_ADC_R1                    (0x1 << 6)
+#define RT5645_M_MONO_ADC_R1_SFT                6
+#define RT5645_M_MONO_ADC_R2                    (0x1 << 5)
+#define RT5645_M_MONO_ADC_R2_SFT                5
+#define RT5645_MONO_ADC_R1_SRC_MASK             (0x1 << 4)
+#define RT5645_MONO_ADC_R1_SRC_SFT              4
+#define RT5645_MONO_ADC_R1_SRC_ADCR             (0x1 << 4)
+#define RT5645_MONO_ADC_R1_SRC_DACMIXR          (0x0 << 4)
+#define RT5645_MONO_ADC_R2_SRC_MASK             (0x1 << 3)
+#define RT5645_MONO_ADC_R2_SRC_SFT              3
+#define RT5645_MONO_DMIC_R_SRC_MASK             (0x3)
+#define RT5645_MONO_DMIC_R_SRC_SFT              0
+
+/* ADC Mixer to DAC Mixer Control (0x29) */
+#define RT5645_M_ADCMIX_L                       (0x1 << 15)
+#define RT5645_M_ADCMIX_L_SFT                   15
+#define RT5645_M_DAC1_L                         (0x1 << 14)
+#define RT5645_M_DAC1_L_SFT                     14
+#define RT5645_DAC1_R_SEL_MASK                  (0x3 << 10)
+#define RT5645_DAC1_R_SEL_SFT                   10
+#define RT5645_DAC1_R_SEL_IF1                   (0x0 << 10)
+#define RT5645_DAC1_R_SEL_IF2                   (0x1 << 10)
+#define RT5645_DAC1_R_SEL_IF3                   (0x2 << 10)
+#define RT5645_DAC1_R_SEL_IF4                   (0x3 << 10)
+#define RT5645_DAC1_L_SEL_MASK                  (0x3 << 8)
+#define RT5645_DAC1_L_SEL_SFT                   8
+#define RT5645_DAC1_L_SEL_IF1                   (0x0 << 8)
+#define RT5645_DAC1_L_SEL_IF2                   (0x1 << 8)
+#define RT5645_DAC1_L_SEL_IF3                   (0x2 << 8)
+#define RT5645_DAC1_L_SEL_IF4                   (0x3 << 8)
+#define RT5645_M_ADCMIX_R                       (0x1 << 7)
+#define RT5645_M_ADCMIX_R_SFT                   7
+#define RT5645_M_DAC1_R                         (0x1 << 6)
+#define RT5645_M_DAC1_R_SFT                     6
+
+/* Stereo DAC Mixer Control (0x2a) */
+#define RT5645_M_DAC_L1                         (0x1 << 14)
+#define RT5645_M_DAC_L1_SFT                     14
+#define RT5645_DAC_L1_STO_L_VOL_MASK            (0x1 << 13)
+#define RT5645_DAC_L1_STO_L_VOL_SFT             13
+#define RT5645_M_DAC_L2                         (0x1 << 12)
+#define RT5645_M_DAC_L2_SFT                     12
+#define RT5645_DAC_L2_STO_L_VOL_MASK            (0x1 << 11)
+#define RT5645_DAC_L2_STO_L_VOL_SFT             11
+#define RT5645_M_ANC_DAC_L                      (0x1 << 10)
+#define RT5645_M_ANC_DAC_L_SFT                  10
+#define RT5645_M_DAC_R1_STO_L                   (0x1 << 9)
+#define RT5645_M_DAC_R1_STO_L_SFT                       9
+#define RT5645_DAC_R1_STO_L_VOL_MASK            (0x1 << 8)
+#define RT5645_DAC_R1_STO_L_VOL_SFT             8
+#define RT5645_M_DAC_R1                         (0x1 << 6)
+#define RT5645_M_DAC_R1_SFT                     6
+#define RT5645_DAC_R1_STO_R_VOL_MASK            (0x1 << 5)
+#define RT5645_DAC_R1_STO_R_VOL_SFT             5
+#define RT5645_M_DAC_R2                         (0x1 << 4)
+#define RT5645_M_DAC_R2_SFT                     4
+#define RT5645_DAC_R2_STO_R_VOL_MASK            (0x1 << 3)
+#define RT5645_DAC_R2_STO_R_VOL_SFT             3
+#define RT5645_M_ANC_DAC_R                      (0x1 << 2)
+#define RT5645_M_ANC_DAC_R_SFT                  2
+#define RT5645_M_DAC_L1_STO_R                   (0x1 << 1)
+#define RT5645_M_DAC_L1_STO_R_SFT                       1
+#define RT5645_DAC_L1_STO_R_VOL_MASK            (0x1)
+#define RT5645_DAC_L1_STO_R_VOL_SFT             0
+
+/* Mono DAC Mixer Control (0x2b) */
+#define RT5645_M_DAC_L1_MONO_L                  (0x1 << 14)
+#define RT5645_M_DAC_L1_MONO_L_SFT              14
+#define RT5645_DAC_L1_MONO_L_VOL_MASK           (0x1 << 13)
+#define RT5645_DAC_L1_MONO_L_VOL_SFT            13
+#define RT5645_M_DAC_L2_MONO_L                  (0x1 << 12)
+#define RT5645_M_DAC_L2_MONO_L_SFT              12
+#define RT5645_DAC_L2_MONO_L_VOL_MASK           (0x1 << 11)
+#define RT5645_DAC_L2_MONO_L_VOL_SFT            11
+#define RT5645_M_DAC_R2_MONO_L                  (0x1 << 10)
+#define RT5645_M_DAC_R2_MONO_L_SFT              10
+#define RT5645_DAC_R2_MONO_L_VOL_MASK           (0x1 << 9)
+#define RT5645_DAC_R2_MONO_L_VOL_SFT            9
+#define RT5645_M_DAC_R1_MONO_R                  (0x1 << 6)
+#define RT5645_M_DAC_R1_MONO_R_SFT              6
+#define RT5645_DAC_R1_MONO_R_VOL_MASK           (0x1 << 5)
+#define RT5645_DAC_R1_MONO_R_VOL_SFT            5
+#define RT5645_M_DAC_R2_MONO_R                  (0x1 << 4)
+#define RT5645_M_DAC_R2_MONO_R_SFT              4
+#define RT5645_DAC_R2_MONO_R_VOL_MASK           (0x1 << 3)
+#define RT5645_DAC_R2_MONO_R_VOL_SFT            3
+#define RT5645_M_DAC_L2_MONO_R                  (0x1 << 2)
+#define RT5645_M_DAC_L2_MONO_R_SFT              2
+#define RT5645_DAC_L2_MONO_R_VOL_MASK           (0x1 << 1)
+#define RT5645_DAC_L2_MONO_R_VOL_SFT            1
+
+/* Digital Mixer Control (0x2c) */
+#define RT5645_M_STO_L_DAC_L                    (0x1 << 15)
+#define RT5645_M_STO_L_DAC_L_SFT                15
+#define RT5645_STO_L_DAC_L_VOL_MASK             (0x1 << 14)
+#define RT5645_STO_L_DAC_L_VOL_SFT              14
+#define RT5645_M_DAC_L2_DAC_L                   (0x1 << 13)
+#define RT5645_M_DAC_L2_DAC_L_SFT               13
+#define RT5645_DAC_L2_DAC_L_VOL_MASK            (0x1 << 12)
+#define RT5645_DAC_L2_DAC_L_VOL_SFT             12
+#define RT5645_M_STO_R_DAC_R                    (0x1 << 11)
+#define RT5645_M_STO_R_DAC_R_SFT                11
+#define RT5645_STO_R_DAC_R_VOL_MASK             (0x1 << 10)
+#define RT5645_STO_R_DAC_R_VOL_SFT              10
+#define RT5645_M_DAC_R2_DAC_R                   (0x1 << 9)
+#define RT5645_M_DAC_R2_DAC_R_SFT               9
+#define RT5645_DAC_R2_DAC_R_VOL_MASK            (0x1 << 8)
+#define RT5645_DAC_R2_DAC_R_VOL_SFT             8
+#define RT5645_M_DAC_R2_DAC_L                   (0x1 << 7)
+#define RT5645_M_DAC_R2_DAC_L_SFT               7
+#define RT5645_DAC_R2_DAC_L_VOL_MASK            (0x1 << 6)
+#define RT5645_DAC_R2_DAC_L_VOL_SFT             6
+#define RT5645_M_DAC_L2_DAC_R                   (0x1 << 5)
+#define RT5645_M_DAC_L2_DAC_R_SFT               5
+#define RT5645_DAC_L2_DAC_R_VOL_MASK            (0x1 << 4)
+#define RT5645_DAC_L2_DAC_R_VOL_SFT             4
+
+/* Digital Interface Data Control (0x2f) */
+#define RT5645_IF1_ADC2_IN_SEL                  (0x1 << 15)
+#define RT5645_IF1_ADC2_IN_SFT                  15
+#define RT5645_IF2_ADC_IN_MASK                  (0x7 << 12)
+#define RT5645_IF2_ADC_IN_SFT                   12
+#define RT5645_IF2_DAC_SEL_MASK                 (0x3 << 10)
+#define RT5645_IF2_DAC_SEL_SFT                  10
+#define RT5645_IF2_ADC_SEL_MASK                 (0x3 << 8)
+#define RT5645_IF2_ADC_SEL_SFT                  8
+#define RT5645_IF3_DAC_SEL_MASK                 (0x3 << 6)
+#define RT5645_IF3_DAC_SEL_SFT                  6
+#define RT5645_IF3_ADC_SEL_MASK                 (0x3 << 4)
+#define RT5645_IF3_ADC_SEL_SFT                  4
+#define RT5645_IF3_ADC_IN_MASK                  (0x7)
+#define RT5645_IF3_ADC_IN_SFT                   0
+
+/* PDM Output Control (0x31) */
+#define RT5645_PDM1_L_MASK                      (0x1 << 15)
+#define RT5645_PDM1_L_SFT                       15
+#define RT5645_M_PDM1_L                         (0x1 << 14)
+#define RT5645_M_PDM1_L_SFT                     14
+#define RT5645_PDM1_R_MASK                      (0x1 << 13)
+#define RT5645_PDM1_R_SFT                       13
+#define RT5645_M_PDM1_R                         (0x1 << 12)
+#define RT5645_M_PDM1_R_SFT                     12
+#define RT5645_PDM2_L_MASK                      (0x1 << 11)
+#define RT5645_PDM2_L_SFT                       11
+#define RT5645_M_PDM2_L                         (0x1 << 10)
+#define RT5645_M_PDM2_L_SFT                     10
+#define RT5645_PDM2_R_MASK                      (0x1 << 9)
+#define RT5645_PDM2_R_SFT                       9
+#define RT5645_M_PDM2_R                         (0x1 << 8)
+#define RT5645_M_PDM2_R_SFT                     8
+#define RT5645_PDM2_BUSY                        (0x1 << 7)
+#define RT5645_PDM1_BUSY                        (0x1 << 6)
+#define RT5645_PDM_PATTERN                      (0x1 << 5)
+#define RT5645_PDM_GAIN                         (0x1 << 4)
+#define RT5645_PDM_DIV_MASK                     (0x3)
+
+/* REC Left Mixer Control 1 (0x3b) */
+#define RT5645_G_HP_L_RM_L_MASK                 (0x7 << 13)
+#define RT5645_G_HP_L_RM_L_SFT                  13
+#define RT5645_G_IN_L_RM_L_MASK                 (0x7 << 10)
+#define RT5645_G_IN_L_RM_L_SFT                  10
+#define RT5645_G_BST4_RM_L_MASK                 (0x7 << 7)
+#define RT5645_G_BST4_RM_L_SFT                  7
+#define RT5645_G_BST3_RM_L_MASK                 (0x7 << 4)
+#define RT5645_G_BST3_RM_L_SFT                  4
+#define RT5645_G_BST2_RM_L_MASK                 (0x7 << 1)
+#define RT5645_G_BST2_RM_L_SFT                  1
+
+/* REC Left Mixer Control 2 (0x3c) */
+#define RT5645_G_BST1_RM_L_MASK                 (0x7 << 13)
+#define RT5645_G_BST1_RM_L_SFT                  13
+#define RT5645_G_OM_L_RM_L_MASK                 (0x7 << 10)
+#define RT5645_G_OM_L_RM_L_SFT                  10
+#define RT5645_M_MM_L_RM_L                      (0x1 << 6)
+#define RT5645_M_MM_L_RM_L_SFT                  6
+#define RT5645_M_IN_L_RM_L                      (0x1 << 5)
+#define RT5645_M_IN_L_RM_L_SFT                  5
+#define RT5645_M_HP_L_RM_L                      (0x1 << 4)
+#define RT5645_M_HP_L_RM_L_SFT                  4
+#define RT5645_M_BST3_RM_L                      (0x1 << 3)
+#define RT5645_M_BST3_RM_L_SFT                  3
+#define RT5645_M_BST2_RM_L                      (0x1 << 2)
+#define RT5645_M_BST2_RM_L_SFT                  2
+#define RT5645_M_BST1_RM_L                      (0x1 << 1)
+#define RT5645_M_BST1_RM_L_SFT                  1
+#define RT5645_M_OM_L_RM_L                      (0x1)
+#define RT5645_M_OM_L_RM_L_SFT                  0
+
+/* REC Right Mixer Control 1 (0x3d) */
+#define RT5645_G_HP_R_RM_R_MASK                 (0x7 << 13)
+#define RT5645_G_HP_R_RM_R_SFT                  13
+#define RT5645_G_IN_R_RM_R_MASK                 (0x7 << 10)
+#define RT5645_G_IN_R_RM_R_SFT                  10
+#define RT5645_G_BST4_RM_R_MASK                 (0x7 << 7)
+#define RT5645_G_BST4_RM_R_SFT                  7
+#define RT5645_G_BST3_RM_R_MASK                 (0x7 << 4)
+#define RT5645_G_BST3_RM_R_SFT                  4
+#define RT5645_G_BST2_RM_R_MASK                 (0x7 << 1)
+#define RT5645_G_BST2_RM_R_SFT                  1
+
+/* REC Right Mixer Control 2 (0x3e) */
+#define RT5645_G_BST1_RM_R_MASK                 (0x7 << 13)
+#define RT5645_G_BST1_RM_R_SFT                  13
+#define RT5645_G_OM_R_RM_R_MASK                 (0x7 << 10)
+#define RT5645_G_OM_R_RM_R_SFT                  10
+#define RT5645_M_MM_R_RM_R                      (0x1 << 6)
+#define RT5645_M_MM_R_RM_R_SFT                  6
+#define RT5645_M_IN_R_RM_R                      (0x1 << 5)
+#define RT5645_M_IN_R_RM_R_SFT                  5
+#define RT5645_M_HP_R_RM_R                      (0x1 << 4)
+#define RT5645_M_HP_R_RM_R_SFT                  4
+#define RT5645_M_BST3_RM_R                      (0x1 << 3)
+#define RT5645_M_BST3_RM_R_SFT                  3
+#define RT5645_M_BST2_RM_R                      (0x1 << 2)
+#define RT5645_M_BST2_RM_R_SFT                  2
+#define RT5645_M_BST1_RM_R                      (0x1 << 1)
+#define RT5645_M_BST1_RM_R_SFT                  1
+#define RT5645_M_OM_R_RM_R                      (0x1)
+#define RT5645_M_OM_R_RM_R_SFT                  0
+
+/* HPOMIX Control (0x40) (0x42) */
+#define RT5645_M_BST1_HV                        (0x1 << 4)
+#define RT5645_M_BST1_HV_SFT                    4
+#define RT5645_M_BST2_HV                        (0x1 << 4)
+#define RT5645_M_BST2_HV_SFT                    4
+#define RT5645_M_BST3_HV                        (0x1 << 3)
+#define RT5645_M_BST3_HV_SFT                    3
+#define RT5645_M_IN_HV                          (0x1 << 2)
+#define RT5645_M_IN_HV_SFT                      2
+#define RT5645_M_DAC2_HV                        (0x1 << 1)
+#define RT5645_M_DAC2_HV_SFT                    1
+#define RT5645_M_DAC1_HV                        (0x1 << 0)
+#define RT5645_M_DAC1_HV_SFT                    0
+
+/* HPMIX Control (0x45) */
+#define RT5645_M_DAC1_HM                        (0x1 << 14)
+#define RT5645_M_DAC1_HM_SFT                    14
+#define RT5645_M_HPVOL_HM                       (0x1 << 13)
+#define RT5645_M_HPVOL_HM_SFT                   13
+
+/* SPK Left Mixer Control (0x46) */
+#define RT5645_G_RM_L_SM_L_MASK                 (0x3 << 14)
+#define RT5645_G_RM_L_SM_L_SFT                  14
+#define RT5645_G_IN_L_SM_L_MASK                 (0x3 << 12)
+#define RT5645_G_IN_L_SM_L_SFT                  12
+#define RT5645_G_DAC_L1_SM_L_MASK               (0x3 << 10)
+#define RT5645_G_DAC_L1_SM_L_SFT                10
+#define RT5645_G_DAC_L2_SM_L_MASK               (0x3 << 8)
+#define RT5645_G_DAC_L2_SM_L_SFT                8
+#define RT5645_G_OM_L_SM_L_MASK                 (0x3 << 6)
+#define RT5645_G_OM_L_SM_L_SFT                  6
+#define RT5645_M_BST1_L_SM_L                    (0x1 << 5)
+#define RT5645_M_BST1_L_SM_L_SFT                5
+#define RT5645_M_IN_L_SM_L                      (0x1 << 3)
+#define RT5645_M_IN_L_SM_L_SFT                  3
+#define RT5645_M_DAC_L1_SM_L                    (0x1 << 1)
+#define RT5645_M_DAC_L1_SM_L_SFT                1
+#define RT5645_M_DAC_L2_SM_L                    (0x1 << 2)
+#define RT5645_M_DAC_L2_SM_L_SFT                2
+#define RT5645_M_BST3_L_SM_L                    (0x1 << 4)
+#define RT5645_M_BST3_L_SM_L_SFT                4
+
+/* SPK Right Mixer Control (0x47) */
+#define RT5645_G_RM_R_SM_R_MASK                 (0x3 << 14)
+#define RT5645_G_RM_R_SM_R_SFT                  14
+#define RT5645_G_IN_R_SM_R_MASK                 (0x3 << 12)
+#define RT5645_G_IN_R_SM_R_SFT                  12
+#define RT5645_G_DAC_R1_SM_R_MASK               (0x3 << 10)
+#define RT5645_G_DAC_R1_SM_R_SFT                10
+#define RT5645_G_DAC_R2_SM_R_MASK               (0x3 << 8)
+#define RT5645_G_DAC_R2_SM_R_SFT                8
+#define RT5645_G_OM_R_SM_R_MASK                 (0x3 << 6)
+#define RT5645_G_OM_R_SM_R_SFT                  6
+#define RT5645_M_BST2_R_SM_R                    (0x1 << 5)
+#define RT5645_M_BST2_R_SM_R_SFT                5
+#define RT5645_M_IN_R_SM_R                      (0x1 << 3)
+#define RT5645_M_IN_R_SM_R_SFT                  3
+#define RT5645_M_DAC_R1_SM_R                    (0x1 << 1)
+#define RT5645_M_DAC_R1_SM_R_SFT                1
+#define RT5645_M_DAC_R2_SM_R                    (0x1 << 2)
+#define RT5645_M_DAC_R2_SM_R_SFT                2
+#define RT5645_M_BST3_R_SM_R                    (0x1 << 4)
+#define RT5645_M_BST3_R_SM_R_SFT                4
+
+/* SPOLMIX Control (0x48) */
+#define RT5645_M_DAC_L1_SPM_L                   (0x1 << 15)
+#define RT5645_M_DAC_L1_SPM_L_SFT               15
+#define RT5645_M_DAC_R1_SPM_L                   (0x1 << 14)
+#define RT5645_M_DAC_R1_SPM_L_SFT               14
+#define RT5645_M_SV_L_SPM_L                     (0x1 << 13)
+#define RT5645_M_SV_L_SPM_L_SFT                 13
+#define RT5645_M_SV_R_SPM_L                     (0x1 << 12)
+#define RT5645_M_SV_R_SPM_L_SFT                 12
+#define RT5645_M_BST3_SPM_L                     (0x1 << 11)
+#define RT5645_M_BST3_SPM_L_SFT                 11
+#define RT5645_M_DAC_R1_SPM_R                   (0x1 << 2)
+#define RT5645_M_DAC_R1_SPM_R_SFT               2
+#define RT5645_M_BST3_SPM_R                     (0x1 << 1)
+#define RT5645_M_BST3_SPM_R_SFT                 1
+#define RT5645_M_SV_R_SPM_R                     (0x1 << 0)
+#define RT5645_M_SV_R_SPM_R_SFT                 0
+
+/* Mono Output Mixer Control (0x4c) */
+#define RT5645_M_OV_L_MM                        (0x1 << 9)
+#define RT5645_M_OV_L_MM_SFT                    9
+#define RT5645_M_DAC_L2_MA                      (0x1 << 8)
+#define RT5645_M_DAC_L2_MA_SFT                  8
+#define RT5645_G_MONOMIX_MASK                   (0x1 << 10)
+#define RT5645_G_MONOMIX_SFT                    10
+#define RT5645_M_BST2_MM                        (0x1 << 4)
+#define RT5645_M_BST2_MM_SFT                    4
+#define RT5645_M_DAC_R1_MM                      (0x1 << 3)
+#define RT5645_M_DAC_R1_MM_SFT                  3
+#define RT5645_M_DAC_R2_MM                      (0x1 << 2)
+#define RT5645_M_DAC_R2_MM_SFT                  2
+#define RT5645_M_DAC_L2_MM                      (0x1 << 1)
+#define RT5645_M_DAC_L2_MM_SFT                  1
+#define RT5645_M_BST3_MM                        (0x1 << 0)
+#define RT5645_M_BST3_MM_SFT                    0
+
+/* Output Left Mixer Control 1 (0x4d) */
+#define RT5645_G_BST3_OM_L_MASK                 (0x7 << 13)
+#define RT5645_G_BST3_OM_L_SFT                  13
+#define RT5645_G_BST2_OM_L_MASK                 (0x7 << 10)
+#define RT5645_G_BST2_OM_L_SFT                  10
+#define RT5645_G_BST1_OM_L_MASK                 (0x7 << 7)
+#define RT5645_G_BST1_OM_L_SFT                  7
+#define RT5645_G_IN_L_OM_L_MASK                 (0x7 << 4)
+#define RT5645_G_IN_L_OM_L_SFT                  4
+#define RT5645_G_RM_L_OM_L_MASK                 (0x7 << 1)
+#define RT5645_G_RM_L_OM_L_SFT                  1
+
+/* Output Left Mixer Control 2 (0x4e) */
+#define RT5645_G_DAC_R2_OM_L_MASK               (0x7 << 13)
+#define RT5645_G_DAC_R2_OM_L_SFT                13
+#define RT5645_G_DAC_L2_OM_L_MASK               (0x7 << 10)
+#define RT5645_G_DAC_L2_OM_L_SFT                10
+#define RT5645_G_DAC_L1_OM_L_MASK               (0x7 << 7)
+#define RT5645_G_DAC_L1_OM_L_SFT                7
+
+/* Output Left Mixer Control 3 (0x4f) */
+#define RT5645_M_BST3_OM_L                      (0x1 << 4)
+#define RT5645_M_BST3_OM_L_SFT                  4
+#define RT5645_M_BST1_OM_L                      (0x1 << 3)
+#define RT5645_M_BST1_OM_L_SFT                  3
+#define RT5645_M_IN_L_OM_L                      (0x1 << 2)
+#define RT5645_M_IN_L_OM_L_SFT                  2
+#define RT5645_M_DAC_L2_OM_L                    (0x1 << 1)
+#define RT5645_M_DAC_L2_OM_L_SFT                1
+#define RT5645_M_DAC_L1_OM_L                    (0x1)
+#define RT5645_M_DAC_L1_OM_L_SFT                0
+
+/* Output Right Mixer Control 1 (0x50) */
+#define RT5645_G_BST4_OM_R_MASK                 (0x7 << 13)
+#define RT5645_G_BST4_OM_R_SFT                  13
+#define RT5645_G_BST2_OM_R_MASK                 (0x7 << 10)
+#define RT5645_G_BST2_OM_R_SFT                  10
+#define RT5645_G_BST1_OM_R_MASK                 (0x7 << 7)
+#define RT5645_G_BST1_OM_R_SFT                  7
+#define RT5645_G_IN_R_OM_R_MASK                 (0x7 << 4)
+#define RT5645_G_IN_R_OM_R_SFT                  4
+#define RT5645_G_RM_R_OM_R_MASK                 (0x7 << 1)
+#define RT5645_G_RM_R_OM_R_SFT                  1
+
+/* Output Right Mixer Control 2 (0x51) */
+#define RT5645_G_DAC_L2_OM_R_MASK               (0x7 << 13)
+#define RT5645_G_DAC_L2_OM_R_SFT                13
+#define RT5645_G_DAC_R2_OM_R_MASK               (0x7 << 10)
+#define RT5645_G_DAC_R2_OM_R_SFT                10
+#define RT5645_G_DAC_R1_OM_R_MASK               (0x7 << 7)
+#define RT5645_G_DAC_R1_OM_R_SFT                7
+
+/* Output Right Mixer Control 3 (0x52) */
+#define RT5645_M_BST3_OM_R                      (0x1 << 4)
+#define RT5645_M_BST3_OM_R_SFT                  4
+#define RT5645_M_BST2_OM_R                      (0x1 << 3)
+#define RT5645_M_BST2_OM_R_SFT                  3
+#define RT5645_M_IN_R_OM_R                      (0x1 << 2)
+#define RT5645_M_IN_R_OM_R_SFT                  2
+#define RT5645_M_DAC_R2_OM_R                    (0x1 << 1)
+#define RT5645_M_DAC_R2_OM_R_SFT                1
+#define RT5645_M_DAC_R1_OM_R                    (0x1)
+#define RT5645_M_DAC_R1_OM_R_SFT                0
+
+/* LOUT Mixer Control (0x53) */
+#define RT5645_M_DAC_L1_LM                      (0x1 << 15)
+#define RT5645_M_DAC_L1_LM_SFT                  15
+#define RT5645_M_DAC_R1_LM                      (0x1 << 14)
+#define RT5645_M_DAC_R1_LM_SFT                  14
+#define RT5645_M_OV_L_LM                        (0x1 << 13)
+#define RT5645_M_OV_L_LM_SFT                    13
+#define RT5645_M_OV_R_LM                        (0x1 << 12)
+#define RT5645_M_OV_R_LM_SFT                    12
+#define RT5645_G_LOUTMIX_MASK                   (0x1 << 11)
+#define RT5645_G_LOUTMIX_SFT                    11
+
+/* Power Management for Digital 1 (0x61) */
+#define RT5645_PWR_I2S1                         (0x1 << 15)
+#define RT5645_PWR_I2S1_BIT                     15
+#define RT5645_PWR_I2S2                         (0x1 << 14)
+#define RT5645_PWR_I2S2_BIT                     14
+#define RT5645_PWR_I2S3                         (0x1 << 13)
+#define RT5645_PWR_I2S3_BIT                     13
+#define RT5645_PWR_DAC_L1                       (0x1 << 12)
+#define RT5645_PWR_DAC_L1_BIT                   12
+#define RT5645_PWR_DAC_R1                       (0x1 << 11)
+#define RT5645_PWR_DAC_R1_BIT                   11
+#define RT5645_PWR_CLS_D_R                      (0x1 << 9)
+#define RT5645_PWR_CLS_D_R_BIT                  9
+#define RT5645_PWR_CLS_D_L                      (0x1 << 8)
+#define RT5645_PWR_CLS_D_L_BIT                  8
+#define RT5645_PWR_ADC_R                        (0x1 << 1)
+#define RT5645_PWR_ADC_R_BIT                    1
+#define RT5645_PWR_DAC_L2                       (0x1 << 7)
+#define RT5645_PWR_DAC_L2_BIT                   7
+#define RT5645_PWR_DAC_R2                       (0x1 << 6)
+#define RT5645_PWR_DAC_R2_BIT                   6
+#define RT5645_PWR_ADC_L                        (0x1 << 2)
+#define RT5645_PWR_ADC_L_BIT                    2
+#define RT5645_PWR_ADC_R                        (0x1 << 1)
+#define RT5645_PWR_ADC_R_BIT                    1
+#define RT5645_PWR_CLS_D                        (0x1)
+#define RT5645_PWR_CLS_D_BIT                    0
+
+/* Power Management for Digital 2 (0x62) */
+#define RT5645_PWR_ADC_S1F                      (0x1 << 15)
+#define RT5645_PWR_ADC_S1F_BIT                  15
+#define RT5645_PWR_ADC_MF_L                     (0x1 << 14)
+#define RT5645_PWR_ADC_MF_L_BIT                 14
+#define RT5645_PWR_ADC_MF_R                     (0x1 << 13)
+#define RT5645_PWR_ADC_MF_R_BIT                 13
+#define RT5645_PWR_I2S_DSP                      (0x1 << 12)
+#define RT5645_PWR_I2S_DSP_BIT                  12
+#define RT5645_PWR_DAC_S1F                      (0x1 << 11)
+#define RT5645_PWR_DAC_S1F_BIT                  11
+#define RT5645_PWR_DAC_MF_L                     (0x1 << 10)
+#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)
+#define RT5645_PWR_PDM2_BIT                     6
+#define RT5645_PWR_IPTV                         (0x1 << 1)
+#define RT5645_PWR_IPTV_BIT                     1
+#define RT5645_PWR_PAD                          (0x1)
+#define RT5645_PWR_PAD_BIT                      0
+
+/* Power Management for Analog 1 (0x63) */
+#define RT5645_PWR_VREF1                        (0x1 << 15)
+#define RT5645_PWR_VREF1_BIT                    15
+#define RT5645_PWR_FV1                          (0x1 << 14)
+#define RT5645_PWR_FV1_BIT                      14
+#define RT5645_PWR_MB                           (0x1 << 13)
+#define RT5645_PWR_MB_BIT                       13
+#define RT5645_PWR_LM                           (0x1 << 12)
+#define RT5645_PWR_LM_BIT                       12
+#define RT5645_PWR_BG                           (0x1 << 11)
+#define RT5645_PWR_BG_BIT                       11
+#define RT5645_PWR_MA                           (0x1 << 10)
+#define RT5645_PWR_MA_BIT                       10
+#define RT5645_PWR_HP_L                         (0x1 << 7)
+#define RT5645_PWR_HP_L_BIT                     7
+#define RT5645_PWR_HP_R                         (0x1 << 6)
+#define RT5645_PWR_HP_R_BIT                     6
+#define RT5645_PWR_HA                           (0x1 << 5)
+#define RT5645_PWR_HA_BIT                       5
+#define RT5645_PWR_VREF2                        (0x1 << 4)
+#define RT5645_PWR_VREF2_BIT                    4
+#define RT5645_PWR_FV2                          (0x1 << 3)
+#define RT5645_PWR_FV2_BIT                      3
+#define RT5645_LDO_SEL_MASK                     (0x3)
+#define RT5645_LDO_SEL_SFT                      0
+
+/* Power Management for Analog 2 (0x64) */
+#define RT5645_PWR_BST1                         (0x1 << 15)
+#define RT5645_PWR_BST1_BIT                     15
+#define RT5645_PWR_BST2                         (0x1 << 14)
+#define RT5645_PWR_BST2_BIT                     14
+#define RT5645_PWR_BST3                         (0x1 << 13)
+#define RT5645_PWR_BST3_BIT                     13
+#define RT5645_PWR_BST4                         (0x1 << 12)
+#define RT5645_PWR_BST4_BIT                     12
+#define RT5645_PWR_MB1                          (0x1 << 11)
+#define RT5645_PWR_MB1_BIT                      11
+#define RT5645_PWR_MB2                          (0x1 << 10)
+#define RT5645_PWR_MB2_BIT                      10
+#define RT5645_PWR_PLL                          (0x1 << 9)
+#define RT5645_PWR_PLL_BIT                      9
+#define RT5645_PWR_BST2_P                       (0x1 << 5)
+#define RT5645_PWR_BST2_P_BIT                   5
+#define RT5645_PWR_BST3_P                       (0x1 << 4)
+#define RT5645_PWR_BST3_P_BIT                   4
+#define RT5645_PWR_BST4_P                       (0x1 << 3)
+#define RT5645_PWR_BST4_P_BIT                   3
+#define RT5645_PWR_JD1                          (0x1 << 2)
+#define RT5645_PWR_JD1_BIT                      2
+#define RT5645_PWR_JD                           (0x1 << 1)
+#define RT5645_PWR_JD_BIT                       1
+
+/* Power Management for Mixer (0x65) */
+#define RT5645_PWR_OM_L                         (0x1 << 15)
+#define RT5645_PWR_OM_L_BIT                     15
+#define RT5645_PWR_OM_R                         (0x1 << 14)
+#define RT5645_PWR_OM_R_BIT                     14
+#define RT5645_PWR_SM_L                         (0x1 << 13)
+#define RT5645_PWR_SM_L_BIT                     13
+#define RT5645_PWR_SM_R                         (0x1 << 12)
+#define RT5645_PWR_SM_R_BIT                     12
+#define RT5645_PWR_RM_L                         (0x1 << 11)
+#define RT5645_PWR_RM_L_BIT                     11
+#define RT5645_PWR_RM_R                         (0x1 << 10)
+#define RT5645_PWR_RM_R_BIT                     10
+#define RT5645_PWR_MM                           (0x1 << 8)
+#define RT5645_PWR_MM_BIT                       8
+#define RT5645_PWR_HM_L                         (0x1 << 7)
+#define RT5645_PWR_HM_L_BIT                     7
+#define RT5645_PWR_HM_R                         (0x1 << 6)
+#define RT5645_PWR_HM_R_BIT                     6
+#define RT5645_PWR_LDO2                         (0x1 << 1)
+#define RT5645_PWR_LDO2_BIT                     1
+
+/* Power Management for Volume (0x66) */
+#define RT5645_PWR_SV_L                         (0x1 << 15)
+#define RT5645_PWR_SV_L_BIT                     15
+#define RT5645_PWR_SV_R                         (0x1 << 14)
+#define RT5645_PWR_SV_R_BIT                     14
+#define RT5645_PWR_HV_L                         (0x1 << 11)
+#define RT5645_PWR_HV_L_BIT                     11
+#define RT5645_PWR_HV_R                         (0x1 << 10)
+#define RT5645_PWR_HV_R_BIT                     10
+#define RT5645_PWR_IN_L                         (0x1 << 9)
+#define RT5645_PWR_IN_L_BIT                     9
+#define RT5645_PWR_IN_R                         (0x1 << 8)
+#define RT5645_PWR_IN_R_BIT                     8
+#define RT5645_PWR_MIC_DET                      (0x1 << 5)
+#define RT5645_PWR_MIC_DET_BIT                  5
+
+/* I2S1/2 Audio Serial Data Port Control (0x70 0x71) */
+#define RT5645_I2S_MS_MASK                      (0x1 << 15)
+#define RT5645_I2S_MS_SFT                       15
+#define RT5645_I2S_MS_M                         (0x0 << 15)
+#define RT5645_I2S_MS_S                         (0x1 << 15)
+#define RT5645_I2S_O_CP_MASK                    (0x3 << 10)
+#define RT5645_I2S_O_CP_SFT                     10
+#define RT5645_I2S_O_CP_OFF                     (0x0 << 10)
+#define RT5645_I2S_O_CP_U_LAW                   (0x1 << 10)
+#define RT5645_I2S_O_CP_A_LAW                   (0x2 << 10)
+#define RT5645_I2S_I_CP_MASK                    (0x3 << 8)
+#define RT5645_I2S_I_CP_SFT                     8
+#define RT5645_I2S_I_CP_OFF                     (0x0 << 8)
+#define RT5645_I2S_I_CP_U_LAW                   (0x1 << 8)
+#define RT5645_I2S_I_CP_A_LAW                   (0x2 << 8)
+#define RT5645_I2S_BP_MASK                      (0x1 << 7)
+#define RT5645_I2S_BP_SFT                       7
+#define RT5645_I2S_BP_NOR                       (0x0 << 7)
+#define RT5645_I2S_BP_INV                       (0x1 << 7)
+#define RT5645_I2S_DL_MASK                      (0x3 << 2)
+#define RT5645_I2S_DL_SFT                       2
+#define RT5645_I2S_DL_16                        (0x0 << 2)
+#define RT5645_I2S_DL_20                        (0x1 << 2)
+#define RT5645_I2S_DL_24                        (0x2 << 2)
+#define RT5645_I2S_DL_8                         (0x3 << 2)
+#define RT5645_I2S_DF_MASK                      (0x3)
+#define RT5645_I2S_DF_SFT                       0
+#define RT5645_I2S_DF_I2S                       (0x0)
+#define RT5645_I2S_DF_LEFT                      (0x1)
+#define RT5645_I2S_DF_PCM_A                     (0x2)
+#define RT5645_I2S_DF_PCM_B                     (0x3)
+
+/* I2S2 Audio Serial Data Port Control (0x71) */
+#define RT5645_I2S2_SDI_MASK                    (0x1 << 6)
+#define RT5645_I2S2_SDI_SFT                     6
+#define RT5645_I2S2_SDI_I2S1                    (0x0 << 6)
+#define RT5645_I2S2_SDI_I2S2                    (0x1 << 6)
+
+/* ADC/DAC Clock Control 1 (0x73) */
+#define RT5645_I2S_BCLK_MS1_MASK                (0x1 << 15)
+#define RT5645_I2S_BCLK_MS1_SFT                 15
+#define RT5645_I2S_BCLK_MS1_32                  (0x0 << 15)
+#define RT5645_I2S_BCLK_MS1_64                  (0x1 << 15)
+#define RT5645_I2S_PD1_MASK                     (0x7 << 12)
+#define RT5645_I2S_PD1_SFT                      12
+#define RT5645_I2S_PD1_1                        (0x0 << 12)
+#define RT5645_I2S_PD1_2                        (0x1 << 12)
+#define RT5645_I2S_PD1_3                        (0x2 << 12)
+#define RT5645_I2S_PD1_4                        (0x3 << 12)
+#define RT5645_I2S_PD1_6                        (0x4 << 12)
+#define RT5645_I2S_PD1_8                        (0x5 << 12)
+#define RT5645_I2S_PD1_12                       (0x6 << 12)
+#define RT5645_I2S_PD1_16                       (0x7 << 12)
+#define RT5645_I2S_BCLK_MS2_MASK                (0x1 << 11)
+#define RT5645_I2S_BCLK_MS2_SFT                 11
+#define RT5645_I2S_BCLK_MS2_32                  (0x0 << 11)
+#define RT5645_I2S_BCLK_MS2_64                  (0x1 << 11)
+#define RT5645_I2S_PD2_MASK                     (0x7 << 8)
+#define RT5645_I2S_PD2_SFT                      8
+#define RT5645_I2S_PD2_1                        (0x0 << 8)
+#define RT5645_I2S_PD2_2                        (0x1 << 8)
+#define RT5645_I2S_PD2_3                        (0x2 << 8)
+#define RT5645_I2S_PD2_4                        (0x3 << 8)
+#define RT5645_I2S_PD2_6                        (0x4 << 8)
+#define RT5645_I2S_PD2_8                        (0x5 << 8)
+#define RT5645_I2S_PD2_12                       (0x6 << 8)
+#define RT5645_I2S_PD2_16                       (0x7 << 8)
+#define RT5645_I2S_BCLK_MS3_MASK                (0x1 << 7)
+#define RT5645_I2S_BCLK_MS3_SFT                 7
+#define RT5645_I2S_BCLK_MS3_32                  (0x0 << 7)
+#define RT5645_I2S_BCLK_MS3_64                  (0x1 << 7)
+#define RT5645_I2S_PD3_MASK                     (0x7 << 4)
+#define RT5645_I2S_PD3_SFT                      4
+#define RT5645_I2S_PD3_1                        (0x0 << 4)
+#define RT5645_I2S_PD3_2                        (0x1 << 4)
+#define RT5645_I2S_PD3_3                        (0x2 << 4)
+#define RT5645_I2S_PD3_4                        (0x3 << 4)
+#define RT5645_I2S_PD3_6                        (0x4 << 4)
+#define RT5645_I2S_PD3_8                        (0x5 << 4)
+#define RT5645_I2S_PD3_12                       (0x6 << 4)
+#define RT5645_I2S_PD3_16                       (0x7 << 4)
+#define RT5645_DAC_OSR_MASK                     (0x3 << 2)
+#define RT5645_DAC_OSR_SFT                      2
+#define RT5645_DAC_OSR_128                      (0x0 << 2)
+#define RT5645_DAC_OSR_64                       (0x1 << 2)
+#define RT5645_DAC_OSR_32                       (0x2 << 2)
+#define RT5645_DAC_OSR_16                       (0x3 << 2)
+#define RT5645_ADC_OSR_MASK                     (0x3)
+#define RT5645_ADC_OSR_SFT                      0
+#define RT5645_ADC_OSR_128                      (0x0)
+#define RT5645_ADC_OSR_64                       (0x1)
+#define RT5645_ADC_OSR_32                       (0x2)
+#define RT5645_ADC_OSR_16                       (0x3)
+
+/* ADC/DAC Clock Control 2 (0x74) */
+#define RT5645_DAC_L_OSR_MASK                   (0x3 << 14)
+#define RT5645_DAC_L_OSR_SFT                    14
+#define RT5645_DAC_L_OSR_128                    (0x0 << 14)
+#define RT5645_DAC_L_OSR_64                     (0x1 << 14)
+#define RT5645_DAC_L_OSR_32                     (0x2 << 14)
+#define RT5645_DAC_L_OSR_16                     (0x3 << 14)
+#define RT5645_ADC_R_OSR_MASK                   (0x3 << 12)
+#define RT5645_ADC_R_OSR_SFT                    12
+#define RT5645_ADC_R_OSR_128                    (0x0 << 12)
+#define RT5645_ADC_R_OSR_64                     (0x1 << 12)
+#define RT5645_ADC_R_OSR_32                     (0x2 << 12)
+#define RT5645_ADC_R_OSR_16                     (0x3 << 12)
+#define RT5645_DAHPF_EN                         (0x1 << 11)
+#define RT5645_DAHPF_EN_SFT                     11
+#define RT5645_ADHPF_EN                         (0x1 << 10)
+#define RT5645_ADHPF_EN_SFT                     10
+
+/* Digital Microphone Control (0x75) */
+#define RT5645_DMIC_1_EN_MASK                   (0x1 << 15)
+#define RT5645_DMIC_1_EN_SFT                    15
+#define RT5645_DMIC_1_DIS                       (0x0 << 15)
+#define RT5645_DMIC_1_EN                        (0x1 << 15)
+#define RT5645_DMIC_2_EN_MASK                   (0x1 << 14)
+#define RT5645_DMIC_2_EN_SFT                    14
+#define RT5645_DMIC_2_DIS                       (0x0 << 14)
+#define RT5645_DMIC_2_EN                        (0x1 << 14)
+#define RT5645_DMIC_1L_LH_MASK                  (0x1 << 13)
+#define RT5645_DMIC_1L_LH_SFT                   13
+#define RT5645_DMIC_1L_LH_FALLING               (0x0 << 13)
+#define RT5645_DMIC_1L_LH_RISING                (0x1 << 13)
+#define RT5645_DMIC_1R_LH_MASK                  (0x1 << 12)
+#define RT5645_DMIC_1R_LH_SFT                   12
+#define RT5645_DMIC_1R_LH_FALLING               (0x0 << 12)
+#define RT5645_DMIC_1R_LH_RISING                (0x1 << 12)
+#define RT5645_DMIC_2_DP_MASK                   (0x3 << 10)
+#define RT5645_DMIC_2_DP_SFT                    10
+#define RT5645_DMIC_2_DP_GPIO6                  (0x0 << 10)
+#define RT5645_DMIC_2_DP_GPIO10                 (0x1 << 10)
+#define RT5645_DMIC_2_DP_GPIO12                 (0x2 << 10)
+#define RT5645_DMIC_2_DP_IN2P                   (0x3 << 10)
+#define RT5645_DMIC_2L_LH_MASK                  (0x1 << 9)
+#define RT5645_DMIC_2L_LH_SFT                   9
+#define RT5645_DMIC_2L_LH_FALLING               (0x0 << 9)
+#define RT5645_DMIC_2L_LH_RISING                (0x1 << 9)
+#define RT5645_DMIC_2R_LH_MASK                  (0x1 << 8)
+#define RT5645_DMIC_2R_LH_SFT                   8
+#define RT5645_DMIC_2R_LH_FALLING               (0x0 << 8)
+#define RT5645_DMIC_2R_LH_RISING                (0x1 << 8)
+#define RT5645_DMIC_CLK_MASK                    (0x7 << 5)
+#define RT5645_DMIC_CLK_SFT                     5
+#define RT5645_DMIC_3_EN_MASK                   (0x1 << 4)
+#define RT5645_DMIC_3_EN_SFT                    4
+#define RT5645_DMIC_3_DIS                       (0x0 << 4)
+#define RT5645_DMIC_3_EN                        (0x1 << 4)
+#define RT5645_DMIC_1_DP_MASK                   (0x3 << 0)
+#define RT5645_DMIC_1_DP_SFT                    0
+#define RT5645_DMIC_1_DP_GPIO5                  (0x0 << 0)
+#define RT5645_DMIC_1_DP_IN2N                   (0x1 << 0)
+#define RT5645_DMIC_1_DP_GPIO11                 (0x2 << 0)
+
+/* TDM Control 1 (0x77) */
+#define RT5645_IF1_ADC_IN_MASK                  (0x3 << 8)
+#define RT5645_IF1_ADC_IN_SFT                   8
+
+/* Global Clock Control (0x80) */
+#define RT5645_SCLK_SRC_MASK                    (0x3 << 14)
+#define RT5645_SCLK_SRC_SFT                     14
+#define RT5645_SCLK_SRC_MCLK                    (0x0 << 14)
+#define RT5645_SCLK_SRC_PLL1                    (0x1 << 14)
+#define RT5645_SCLK_SRC_RCCLK                   (0x2 << 14) /* 15MHz */
+#define RT5645_PLL1_SRC_MASK                    (0x3 << 12)
+#define RT5645_PLL1_SRC_SFT                     12
+#define RT5645_PLL1_SRC_MCLK                    (0x0 << 12)
+#define RT5645_PLL1_SRC_BCLK1                   (0x1 << 12)
+#define RT5645_PLL1_SRC_BCLK2                   (0x2 << 12)
+#define RT5645_PLL1_SRC_BCLK3                   (0x3 << 12)
+#define RT5645_PLL1_PD_MASK                     (0x1 << 3)
+#define RT5645_PLL1_PD_SFT                      3
+#define RT5645_PLL1_PD_1                        (0x0 << 3)
+#define RT5645_PLL1_PD_2                        (0x1 << 3)
+
+#define RT5645_PLL_INP_MAX                      40000000
+#define RT5645_PLL_INP_MIN                      256000
+/* PLL M/N/K Code Control 1 (0x81) */
+#define RT5645_PLL_N_MAX                        0x1ff
+#define RT5645_PLL_N_MASK                       (RT5645_PLL_N_MAX << 7)
+#define RT5645_PLL_N_SFT                        7
+#define RT5645_PLL_K_MAX                        0x1f
+#define RT5645_PLL_K_MASK                       (RT5645_PLL_K_MAX)
+#define RT5645_PLL_K_SFT                        0
+
+/* PLL M/N/K Code Control 2 (0x82) */
+#define RT5645_PLL_M_MAX                        0xf
+#define RT5645_PLL_M_MASK                       (RT5645_PLL_M_MAX << 12)
+#define RT5645_PLL_M_SFT                        12
+#define RT5645_PLL_M_BP                         (0x1 << 11)
+#define RT5645_PLL_M_BP_SFT                     11
+
+/* ASRC Control 1 (0x83) */
+#define RT5645_STO_T_MASK                       (0x1 << 15)
+#define RT5645_STO_T_SFT                        15
+#define RT5645_STO_T_SCLK                       (0x0 << 15)
+#define RT5645_STO_T_LRCK1                      (0x1 << 15)
+#define RT5645_M1_T_MASK                        (0x1 << 14)
+#define RT5645_M1_T_SFT                         14
+#define RT5645_M1_T_I2S2                        (0x0 << 14)
+#define RT5645_M1_T_I2S2_D3                     (0x1 << 14)
+#define RT5645_I2S2_F_MASK                      (0x1 << 12)
+#define RT5645_I2S2_F_SFT                       12
+#define RT5645_I2S2_F_I2S2_D2                   (0x0 << 12)
+#define RT5645_I2S2_F_I2S1_TCLK                 (0x1 << 12)
+#define RT5645_DMIC_1_M_MASK                    (0x1 << 9)
+#define RT5645_DMIC_1_M_SFT                     9
+#define RT5645_DMIC_1_M_NOR                     (0x0 << 9)
+#define RT5645_DMIC_1_M_ASYN                    (0x1 << 9)
+#define RT5645_DMIC_2_M_MASK                    (0x1 << 8)
+#define RT5645_DMIC_2_M_SFT                     8
+#define RT5645_DMIC_2_M_NOR                     (0x0 << 8)
+#define RT5645_DMIC_2_M_ASYN                    (0x1 << 8)
+
+/* ASRC Control 2 (0x84) */
+#define RT5645_MDA_L_M_MASK                     (0x1 << 15)
+#define RT5645_MDA_L_M_SFT                      15
+#define RT5645_MDA_L_M_NOR                      (0x0 << 15)
+#define RT5645_MDA_L_M_ASYN                     (0x1 << 15)
+#define RT5645_MDA_R_M_MASK                     (0x1 << 14)
+#define RT5645_MDA_R_M_SFT                      14
+#define RT5645_MDA_R_M_NOR                      (0x0 << 14)
+#define RT5645_MDA_R_M_ASYN                     (0x1 << 14)
+#define RT5645_MAD_L_M_MASK                     (0x1 << 13)
+#define RT5645_MAD_L_M_SFT                      13
+#define RT5645_MAD_L_M_NOR                      (0x0 << 13)
+#define RT5645_MAD_L_M_ASYN                     (0x1 << 13)
+#define RT5645_MAD_R_M_MASK                     (0x1 << 12)
+#define RT5645_MAD_R_M_SFT                      12
+#define RT5645_MAD_R_M_NOR                      (0x0 << 12)
+#define RT5645_MAD_R_M_ASYN                     (0x1 << 12)
+#define RT5645_ADC_M_MASK                       (0x1 << 11)
+#define RT5645_ADC_M_SFT                        11
+#define RT5645_ADC_M_NOR                        (0x0 << 11)
+#define RT5645_ADC_M_ASYN                       (0x1 << 11)
+#define RT5645_STO_DAC_M_MASK                   (0x1 << 5)
+#define RT5645_STO_DAC_M_SFT                    5
+#define RT5645_STO_DAC_M_NOR                    (0x0 << 5)
+#define RT5645_STO_DAC_M_ASYN                   (0x1 << 5)
+#define RT5645_I2S1_R_D_MASK                    (0x1 << 4)
+#define RT5645_I2S1_R_D_SFT                     4
+#define RT5645_I2S1_R_D_DIS                     (0x0 << 4)
+#define RT5645_I2S1_R_D_EN                      (0x1 << 4)
+#define RT5645_I2S2_R_D_MASK                    (0x1 << 3)
+#define RT5645_I2S2_R_D_SFT                     3
+#define RT5645_I2S2_R_D_DIS                     (0x0 << 3)
+#define RT5645_I2S2_R_D_EN                      (0x1 << 3)
+#define RT5645_PRE_SCLK_MASK                    (0x3)
+#define RT5645_PRE_SCLK_SFT                     0
+#define RT5645_PRE_SCLK_512                     (0x0)
+#define RT5645_PRE_SCLK_1024                    (0x1)
+#define RT5645_PRE_SCLK_2048                    (0x2)
+
+/* ASRC Control 3 (0x85) */
+#define RT5645_I2S1_RATE_MASK                   (0xf << 12)
+#define RT5645_I2S1_RATE_SFT                    12
+#define RT5645_I2S2_RATE_MASK                   (0xf << 8)
+#define RT5645_I2S2_RATE_SFT                    8
+
+/* ASRC Control 4 (0x89) */
+#define RT5645_I2S1_PD_MASK                     (0x7 << 12)
+#define RT5645_I2S1_PD_SFT                      12
+#define RT5645_I2S2_PD_MASK                     (0x7 << 8)
+#define RT5645_I2S2_PD_SFT                      8
+
+/* HPOUT Over Current Detection (0x8b) */
+#define RT5645_HP_OVCD_MASK                     (0x1 << 10)
+#define RT5645_HP_OVCD_SFT                      10
+#define RT5645_HP_OVCD_DIS                      (0x0 << 10)
+#define RT5645_HP_OVCD_EN                       (0x1 << 10)
+#define RT5645_HP_OC_TH_MASK                    (0x3 << 8)
+#define RT5645_HP_OC_TH_SFT                     8
+#define RT5645_HP_OC_TH_90                      (0x0 << 8)
+#define RT5645_HP_OC_TH_105                     (0x1 << 8)
+#define RT5645_HP_OC_TH_120                     (0x2 << 8)
+#define RT5645_HP_OC_TH_135                     (0x3 << 8)
+
+/* Class D Over Current Control (0x8c) */
+#define RT5645_CLSD_OC_MASK                     (0x1 << 9)
+#define RT5645_CLSD_OC_SFT                      9
+#define RT5645_CLSD_OC_PU                       (0x0 << 9)
+#define RT5645_CLSD_OC_PD                       (0x1 << 9)
+#define RT5645_AUTO_PD_MASK                     (0x1 << 8)
+#define RT5645_AUTO_PD_SFT                      8
+#define RT5645_AUTO_PD_DIS                      (0x0 << 8)
+#define RT5645_AUTO_PD_EN                       (0x1 << 8)
+#define RT5645_CLSD_OC_TH_MASK                  (0x3f)
+#define RT5645_CLSD_OC_TH_SFT                   0
+
+/* Class D Output Control (0x8d) */
+#define RT5645_CLSD_RATIO_MASK                  (0xf << 12)
+#define RT5645_CLSD_RATIO_SFT                   12
+#define RT5645_CLSD_OM_MASK                     (0x1 << 11)
+#define RT5645_CLSD_OM_SFT                      11
+#define RT5645_CLSD_OM_MONO                     (0x0 << 11)
+#define RT5645_CLSD_OM_STO                      (0x1 << 11)
+#define RT5645_CLSD_SCH_MASK                    (0x1 << 10)
+#define RT5645_CLSD_SCH_SFT                     10
+#define RT5645_CLSD_SCH_L                       (0x0 << 10)
+#define RT5645_CLSD_SCH_S                       (0x1 << 10)
+
+/* Depop Mode Control 1 (0x8e) */
+#define RT5645_SMT_TRIG_MASK                    (0x1 << 15)
+#define RT5645_SMT_TRIG_SFT                     15
+#define RT5645_SMT_TRIG_DIS                     (0x0 << 15)
+#define RT5645_SMT_TRIG_EN                      (0x1 << 15)
+#define RT5645_HP_L_SMT_MASK                    (0x1 << 9)
+#define RT5645_HP_L_SMT_SFT                     9
+#define RT5645_HP_L_SMT_DIS                     (0x0 << 9)
+#define RT5645_HP_L_SMT_EN                      (0x1 << 9)
+#define RT5645_HP_R_SMT_MASK                    (0x1 << 8)
+#define RT5645_HP_R_SMT_SFT                     8
+#define RT5645_HP_R_SMT_DIS                     (0x0 << 8)
+#define RT5645_HP_R_SMT_EN                      (0x1 << 8)
+#define RT5645_HP_CD_PD_MASK                    (0x1 << 7)
+#define RT5645_HP_CD_PD_SFT                     7
+#define RT5645_HP_CD_PD_DIS                     (0x0 << 7)
+#define RT5645_HP_CD_PD_EN                      (0x1 << 7)
+#define RT5645_RSTN_MASK                        (0x1 << 6)
+#define RT5645_RSTN_SFT                         6
+#define RT5645_RSTN_DIS                         (0x0 << 6)
+#define RT5645_RSTN_EN                          (0x1 << 6)
+#define RT5645_RSTP_MASK                        (0x1 << 5)
+#define RT5645_RSTP_SFT                         5
+#define RT5645_RSTP_DIS                         (0x0 << 5)
+#define RT5645_RSTP_EN                          (0x1 << 5)
+#define RT5645_HP_CO_MASK                       (0x1 << 4)
+#define RT5645_HP_CO_SFT                        4
+#define RT5645_HP_CO_DIS                        (0x0 << 4)
+#define RT5645_HP_CO_EN                         (0x1 << 4)
+#define RT5645_HP_CP_MASK                       (0x1 << 3)
+#define RT5645_HP_CP_SFT                        3
+#define RT5645_HP_CP_PD                         (0x0 << 3)
+#define RT5645_HP_CP_PU                         (0x1 << 3)
+#define RT5645_HP_SG_MASK                       (0x1 << 2)
+#define RT5645_HP_SG_SFT                        2
+#define RT5645_HP_SG_DIS                        (0x0 << 2)
+#define RT5645_HP_SG_EN                         (0x1 << 2)
+#define RT5645_HP_DP_MASK                       (0x1 << 1)
+#define RT5645_HP_DP_SFT                        1
+#define RT5645_HP_DP_PD                         (0x0 << 1)
+#define RT5645_HP_DP_PU                         (0x1 << 1)
+#define RT5645_HP_CB_MASK                       (0x1)
+#define RT5645_HP_CB_SFT                        0
+#define RT5645_HP_CB_PD                         (0x0)
+#define RT5645_HP_CB_PU                         (0x1)
+
+/* Depop Mode Control 2 (0x8f) */
+#define RT5645_DEPOP_MASK                       (0x1 << 13)
+#define RT5645_DEPOP_SFT                        13
+#define RT5645_DEPOP_AUTO                       (0x0 << 13)
+#define RT5645_DEPOP_MAN                        (0x1 << 13)
+#define RT5645_RAMP_MASK                        (0x1 << 12)
+#define RT5645_RAMP_SFT                         12
+#define RT5645_RAMP_DIS                         (0x0 << 12)
+#define RT5645_RAMP_EN                          (0x1 << 12)
+#define RT5645_BPS_MASK                         (0x1 << 11)
+#define RT5645_BPS_SFT                          11
+#define RT5645_BPS_DIS                          (0x0 << 11)
+#define RT5645_BPS_EN                           (0x1 << 11)
+#define RT5645_FAST_UPDN_MASK                   (0x1 << 10)
+#define RT5645_FAST_UPDN_SFT                    10
+#define RT5645_FAST_UPDN_DIS                    (0x0 << 10)
+#define RT5645_FAST_UPDN_EN                     (0x1 << 10)
+#define RT5645_MRES_MASK                        (0x3 << 8)
+#define RT5645_MRES_SFT                         8
+#define RT5645_MRES_15MO                        (0x0 << 8)
+#define RT5645_MRES_25MO                        (0x1 << 8)
+#define RT5645_MRES_35MO                        (0x2 << 8)
+#define RT5645_MRES_45MO                        (0x3 << 8)
+#define RT5645_VLO_MASK                         (0x1 << 7)
+#define RT5645_VLO_SFT                          7
+#define RT5645_VLO_3V                           (0x0 << 7)
+#define RT5645_VLO_32V                          (0x1 << 7)
+#define RT5645_DIG_DP_MASK                      (0x1 << 6)
+#define RT5645_DIG_DP_SFT                       6
+#define RT5645_DIG_DP_DIS                       (0x0 << 6)
+#define RT5645_DIG_DP_EN                        (0x1 << 6)
+#define RT5645_DP_TH_MASK                       (0x3 << 4)
+#define RT5645_DP_TH_SFT                        4
+
+/* Depop Mode Control 3 (0x90) */
+#define RT5645_CP_SYS_MASK                      (0x7 << 12)
+#define RT5645_CP_SYS_SFT                       12
+#define RT5645_CP_FQ1_MASK                      (0x7 << 8)
+#define RT5645_CP_FQ1_SFT                       8
+#define RT5645_CP_FQ2_MASK                      (0x7 << 4)
+#define RT5645_CP_FQ2_SFT                       4
+#define RT5645_CP_FQ3_MASK                      (0x7)
+#define RT5645_CP_FQ3_SFT                       0
+#define RT5645_CP_FQ_1_5_KHZ                    0
+#define RT5645_CP_FQ_3_KHZ                      1
+#define RT5645_CP_FQ_6_KHZ                      2
+#define RT5645_CP_FQ_12_KHZ                     3
+#define RT5645_CP_FQ_24_KHZ                     4
+#define RT5645_CP_FQ_48_KHZ                     5
+#define RT5645_CP_FQ_96_KHZ                     6
+#define RT5645_CP_FQ_192_KHZ                    7
+
+/* PV detection and SPK gain control (0x92) */
+#define RT5645_PVDD_DET_MASK                    (0x1 << 15)
+#define RT5645_PVDD_DET_SFT                     15
+#define RT5645_PVDD_DET_DIS                     (0x0 << 15)
+#define RT5645_PVDD_DET_EN                      (0x1 << 15)
+#define RT5645_SPK_AG_MASK                      (0x1 << 14)
+#define RT5645_SPK_AG_SFT                       14
+#define RT5645_SPK_AG_DIS                       (0x0 << 14)
+#define RT5645_SPK_AG_EN                        (0x1 << 14)
+
+/* Micbias Control (0x93) */
+#define RT5645_MIC1_BS_MASK                     (0x1 << 15)
+#define RT5645_MIC1_BS_SFT                      15
+#define RT5645_MIC1_BS_9AV                      (0x0 << 15)
+#define RT5645_MIC1_BS_75AV                     (0x1 << 15)
+#define RT5645_MIC2_BS_MASK                     (0x1 << 14)
+#define RT5645_MIC2_BS_SFT                      14
+#define RT5645_MIC2_BS_9AV                      (0x0 << 14)
+#define RT5645_MIC2_BS_75AV                     (0x1 << 14)
+#define RT5645_MIC1_CLK_MASK                    (0x1 << 13)
+#define RT5645_MIC1_CLK_SFT                     13
+#define RT5645_MIC1_CLK_DIS                     (0x0 << 13)
+#define RT5645_MIC1_CLK_EN                      (0x1 << 13)
+#define RT5645_MIC2_CLK_MASK                    (0x1 << 12)
+#define RT5645_MIC2_CLK_SFT                     12
+#define RT5645_MIC2_CLK_DIS                     (0x0 << 12)
+#define RT5645_MIC2_CLK_EN                      (0x1 << 12)
+#define RT5645_MIC1_OVCD_MASK                   (0x1 << 11)
+#define RT5645_MIC1_OVCD_SFT                    11
+#define RT5645_MIC1_OVCD_DIS                    (0x0 << 11)
+#define RT5645_MIC1_OVCD_EN                     (0x1 << 11)
+#define RT5645_MIC1_OVTH_MASK                   (0x3 << 9)
+#define RT5645_MIC1_OVTH_SFT                    9
+#define RT5645_MIC1_OVTH_600UA                  (0x0 << 9)
+#define RT5645_MIC1_OVTH_1500UA                 (0x1 << 9)
+#define RT5645_MIC1_OVTH_2000UA                 (0x2 << 9)
+#define RT5645_MIC2_OVCD_MASK                   (0x1 << 8)
+#define RT5645_MIC2_OVCD_SFT                    8
+#define RT5645_MIC2_OVCD_DIS                    (0x0 << 8)
+#define RT5645_MIC2_OVCD_EN                     (0x1 << 8)
+#define RT5645_MIC2_OVTH_MASK                   (0x3 << 6)
+#define RT5645_MIC2_OVTH_SFT                    6
+#define RT5645_MIC2_OVTH_600UA                  (0x0 << 6)
+#define RT5645_MIC2_OVTH_1500UA                 (0x1 << 6)
+#define RT5645_MIC2_OVTH_2000UA                 (0x2 << 6)
+#define RT5645_PWR_MB_MASK                      (0x1 << 5)
+#define RT5645_PWR_MB_SFT                       5
+#define RT5645_PWR_MB_PD                        (0x0 << 5)
+#define RT5645_PWR_MB_PU                        (0x1 << 5)
+#define RT5645_PWR_CLK25M_MASK                  (0x1 << 4)
+#define RT5645_PWR_CLK25M_SFT                   4
+#define RT5645_PWR_CLK25M_PD                    (0x0 << 4)
+#define RT5645_PWR_CLK25M_PU                    (0x1 << 4)
+
+/* VAD Control 4 (0x9d) */
+#define RT5645_VAD_SEL_MASK                     (0x3 << 8)
+#define RT5645_VAD_SEL_SFT                      8
+
+/* EQ Control 1 (0xb0) */
+#define RT5645_EQ_SRC_MASK                      (0x1 << 15)
+#define RT5645_EQ_SRC_SFT                       15
+#define RT5645_EQ_SRC_DAC                       (0x0 << 15)
+#define RT5645_EQ_SRC_ADC                       (0x1 << 15)
+#define RT5645_EQ_UPD                           (0x1 << 14)
+#define RT5645_EQ_UPD_BIT                       14
+#define RT5645_EQ_CD_MASK                       (0x1 << 13)
+#define RT5645_EQ_CD_SFT                        13
+#define RT5645_EQ_CD_DIS                        (0x0 << 13)
+#define RT5645_EQ_CD_EN                         (0x1 << 13)
+#define RT5645_EQ_DITH_MASK                     (0x3 << 8)
+#define RT5645_EQ_DITH_SFT                      8
+#define RT5645_EQ_DITH_NOR                      (0x0 << 8)
+#define RT5645_EQ_DITH_LSB                      (0x1 << 8)
+#define RT5645_EQ_DITH_LSB_1                    (0x2 << 8)
+#define RT5645_EQ_DITH_LSB_2                    (0x3 << 8)
+
+/* EQ Control 2 (0xb1) */
+#define RT5645_EQ_HPF1_M_MASK                   (0x1 << 8)
+#define RT5645_EQ_HPF1_M_SFT                    8
+#define RT5645_EQ_HPF1_M_HI                     (0x0 << 8)
+#define RT5645_EQ_HPF1_M_1ST                    (0x1 << 8)
+#define RT5645_EQ_LPF1_M_MASK                   (0x1 << 7)
+#define RT5645_EQ_LPF1_M_SFT                    7
+#define RT5645_EQ_LPF1_M_LO                     (0x0 << 7)
+#define RT5645_EQ_LPF1_M_1ST                    (0x1 << 7)
+#define RT5645_EQ_HPF2_MASK                     (0x1 << 6)
+#define RT5645_EQ_HPF2_SFT                      6
+#define RT5645_EQ_HPF2_DIS                      (0x0 << 6)
+#define RT5645_EQ_HPF2_EN                       (0x1 << 6)
+#define RT5645_EQ_HPF1_MASK                     (0x1 << 5)
+#define RT5645_EQ_HPF1_SFT                      5
+#define RT5645_EQ_HPF1_DIS                      (0x0 << 5)
+#define RT5645_EQ_HPF1_EN                       (0x1 << 5)
+#define RT5645_EQ_BPF4_MASK                     (0x1 << 4)
+#define RT5645_EQ_BPF4_SFT                      4
+#define RT5645_EQ_BPF4_DIS                      (0x0 << 4)
+#define RT5645_EQ_BPF4_EN                       (0x1 << 4)
+#define RT5645_EQ_BPF3_MASK                     (0x1 << 3)
+#define RT5645_EQ_BPF3_SFT                      3
+#define RT5645_EQ_BPF3_DIS                      (0x0 << 3)
+#define RT5645_EQ_BPF3_EN                       (0x1 << 3)
+#define RT5645_EQ_BPF2_MASK                     (0x1 << 2)
+#define RT5645_EQ_BPF2_SFT                      2
+#define RT5645_EQ_BPF2_DIS                      (0x0 << 2)
+#define RT5645_EQ_BPF2_EN                       (0x1 << 2)
+#define RT5645_EQ_BPF1_MASK                     (0x1 << 1)
+#define RT5645_EQ_BPF1_SFT                      1
+#define RT5645_EQ_BPF1_DIS                      (0x0 << 1)
+#define RT5645_EQ_BPF1_EN                       (0x1 << 1)
+#define RT5645_EQ_LPF_MASK                      (0x1)
+#define RT5645_EQ_LPF_SFT                       0
+#define RT5645_EQ_LPF_DIS                       (0x0)
+#define RT5645_EQ_LPF_EN                        (0x1)
+#define RT5645_EQ_CTRL_MASK                     (0x7f)
+
+/* Memory Test (0xb2) */
+#define RT5645_MT_MASK                          (0x1 << 15)
+#define RT5645_MT_SFT                           15
+#define RT5645_MT_DIS                           (0x0 << 15)
+#define RT5645_MT_EN                            (0x1 << 15)
+
+/* DRC/AGC Control 1 (0xb4) */
+#define RT5645_DRC_AGC_P_MASK                   (0x1 << 15)
+#define RT5645_DRC_AGC_P_SFT                    15
+#define RT5645_DRC_AGC_P_DAC                    (0x0 << 15)
+#define RT5645_DRC_AGC_P_ADC                    (0x1 << 15)
+#define RT5645_DRC_AGC_MASK                     (0x1 << 14)
+#define RT5645_DRC_AGC_SFT                      14
+#define RT5645_DRC_AGC_DIS                      (0x0 << 14)
+#define RT5645_DRC_AGC_EN                       (0x1 << 14)
+#define RT5645_DRC_AGC_UPD                      (0x1 << 13)
+#define RT5645_DRC_AGC_UPD_BIT                  13
+#define RT5645_DRC_AGC_AR_MASK                  (0x1f << 8)
+#define RT5645_DRC_AGC_AR_SFT                   8
+#define RT5645_DRC_AGC_R_MASK                   (0x7 << 5)
+#define RT5645_DRC_AGC_R_SFT                    5
+#define RT5645_DRC_AGC_R_48K                    (0x1 << 5)
+#define RT5645_DRC_AGC_R_96K                    (0x2 << 5)
+#define RT5645_DRC_AGC_R_192K                   (0x3 << 5)
+#define RT5645_DRC_AGC_R_441K                   (0x5 << 5)
+#define RT5645_DRC_AGC_R_882K                   (0x6 << 5)
+#define RT5645_DRC_AGC_R_1764K                  (0x7 << 5)
+#define RT5645_DRC_AGC_RC_MASK                  (0x1f)
+#define RT5645_DRC_AGC_RC_SFT                   0
+
+/* DRC/AGC Control 2 (0xb5) */
+#define RT5645_DRC_AGC_POB_MASK                 (0x3f << 8)
+#define RT5645_DRC_AGC_POB_SFT                  8
+#define RT5645_DRC_AGC_CP_MASK                  (0x1 << 7)
+#define RT5645_DRC_AGC_CP_SFT                   7
+#define RT5645_DRC_AGC_CP_DIS                   (0x0 << 7)
+#define RT5645_DRC_AGC_CP_EN                    (0x1 << 7)
+#define RT5645_DRC_AGC_CPR_MASK                 (0x3 << 5)
+#define RT5645_DRC_AGC_CPR_SFT                  5
+#define RT5645_DRC_AGC_CPR_1_1                  (0x0 << 5)
+#define RT5645_DRC_AGC_CPR_1_2                  (0x1 << 5)
+#define RT5645_DRC_AGC_CPR_1_3                  (0x2 << 5)
+#define RT5645_DRC_AGC_CPR_1_4                  (0x3 << 5)
+#define RT5645_DRC_AGC_PRB_MASK                 (0x1f)
+#define RT5645_DRC_AGC_PRB_SFT                  0
+
+/* DRC/AGC Control 3 (0xb6) */
+#define RT5645_DRC_AGC_NGB_MASK                 (0xf << 12)
+#define RT5645_DRC_AGC_NGB_SFT                  12
+#define RT5645_DRC_AGC_TAR_MASK                 (0x1f << 7)
+#define RT5645_DRC_AGC_TAR_SFT                  7
+#define RT5645_DRC_AGC_NG_MASK                  (0x1 << 6)
+#define RT5645_DRC_AGC_NG_SFT                   6
+#define RT5645_DRC_AGC_NG_DIS                   (0x0 << 6)
+#define RT5645_DRC_AGC_NG_EN                    (0x1 << 6)
+#define RT5645_DRC_AGC_NGH_MASK                 (0x1 << 5)
+#define RT5645_DRC_AGC_NGH_SFT                  5
+#define RT5645_DRC_AGC_NGH_DIS                  (0x0 << 5)
+#define RT5645_DRC_AGC_NGH_EN                   (0x1 << 5)
+#define RT5645_DRC_AGC_NGT_MASK                 (0x1f)
+#define RT5645_DRC_AGC_NGT_SFT                  0
+
+/* ANC Control 1 (0xb8) */
+#define RT5645_ANC_M_MASK                       (0x1 << 15)
+#define RT5645_ANC_M_SFT                        15
+#define RT5645_ANC_M_NOR                        (0x0 << 15)
+#define RT5645_ANC_M_REV                        (0x1 << 15)
+#define RT5645_ANC_MASK                         (0x1 << 14)
+#define RT5645_ANC_SFT                          14
+#define RT5645_ANC_DIS                          (0x0 << 14)
+#define RT5645_ANC_EN                           (0x1 << 14)
+#define RT5645_ANC_MD_MASK                      (0x3 << 12)
+#define RT5645_ANC_MD_SFT                       12
+#define RT5645_ANC_MD_DIS                       (0x0 << 12)
+#define RT5645_ANC_MD_67MS                      (0x1 << 12)
+#define RT5645_ANC_MD_267MS                     (0x2 << 12)
+#define RT5645_ANC_MD_1067MS                    (0x3 << 12)
+#define RT5645_ANC_SN_MASK                      (0x1 << 11)
+#define RT5645_ANC_SN_SFT                       11
+#define RT5645_ANC_SN_DIS                       (0x0 << 11)
+#define RT5645_ANC_SN_EN                        (0x1 << 11)
+#define RT5645_ANC_CLK_MASK                     (0x1 << 10)
+#define RT5645_ANC_CLK_SFT                      10
+#define RT5645_ANC_CLK_ANC                      (0x0 << 10)
+#define RT5645_ANC_CLK_REG                      (0x1 << 10)
+#define RT5645_ANC_ZCD_MASK                     (0x3 << 8)
+#define RT5645_ANC_ZCD_SFT                      8
+#define RT5645_ANC_ZCD_DIS                      (0x0 << 8)
+#define RT5645_ANC_ZCD_T1                       (0x1 << 8)
+#define RT5645_ANC_ZCD_T2                       (0x2 << 8)
+#define RT5645_ANC_ZCD_WT                       (0x3 << 8)
+#define RT5645_ANC_CS_MASK                      (0x1 << 7)
+#define RT5645_ANC_CS_SFT                       7
+#define RT5645_ANC_CS_DIS                       (0x0 << 7)
+#define RT5645_ANC_CS_EN                        (0x1 << 7)
+#define RT5645_ANC_SW_MASK                      (0x1 << 6)
+#define RT5645_ANC_SW_SFT                       6
+#define RT5645_ANC_SW_NOR                       (0x0 << 6)
+#define RT5645_ANC_SW_AUTO                      (0x1 << 6)
+#define RT5645_ANC_CO_L_MASK                    (0x3f)
+#define RT5645_ANC_CO_L_SFT                     0
+
+/* ANC Control 2 (0xb6) */
+#define RT5645_ANC_FG_R_MASK                    (0xf << 12)
+#define RT5645_ANC_FG_R_SFT                     12
+#define RT5645_ANC_FG_L_MASK                    (0xf << 8)
+#define RT5645_ANC_FG_L_SFT                     8
+#define RT5645_ANC_CG_R_MASK                    (0xf << 4)
+#define RT5645_ANC_CG_R_SFT                     4
+#define RT5645_ANC_CG_L_MASK                    (0xf)
+#define RT5645_ANC_CG_L_SFT                     0
+
+/* ANC Control 3 (0xb6) */
+#define RT5645_ANC_CD_MASK                      (0x1 << 6)
+#define RT5645_ANC_CD_SFT                       6
+#define RT5645_ANC_CD_BOTH                      (0x0 << 6)
+#define RT5645_ANC_CD_IND                       (0x1 << 6)
+#define RT5645_ANC_CO_R_MASK                    (0x3f)
+#define RT5645_ANC_CO_R_SFT                     0
+
+/* Jack Detect Control (0xbb) */
+#define RT5645_JD_MASK                          (0x7 << 13)
+#define RT5645_JD_SFT                           13
+#define RT5645_JD_DIS                           (0x0 << 13)
+#define RT5645_JD_GPIO1                         (0x1 << 13)
+#define RT5645_JD_JD1_IN4P                      (0x2 << 13)
+#define RT5645_JD_JD2_IN4N                      (0x3 << 13)
+#define RT5645_JD_GPIO2                         (0x4 << 13)
+#define RT5645_JD_GPIO3                         (0x5 << 13)
+#define RT5645_JD_GPIO4                         (0x6 << 13)
+#define RT5645_JD_HP_MASK                       (0x1 << 11)
+#define RT5645_JD_HP_SFT                        11
+#define RT5645_JD_HP_DIS                        (0x0 << 11)
+#define RT5645_JD_HP_EN                         (0x1 << 11)
+#define RT5645_JD_HP_TRG_MASK                   (0x1 << 10)
+#define RT5645_JD_HP_TRG_SFT                    10
+#define RT5645_JD_HP_TRG_LO                     (0x0 << 10)
+#define RT5645_JD_HP_TRG_HI                     (0x1 << 10)
+#define RT5645_JD_SPL_MASK                      (0x1 << 9)
+#define RT5645_JD_SPL_SFT                       9
+#define RT5645_JD_SPL_DIS                       (0x0 << 9)
+#define RT5645_JD_SPL_EN                        (0x1 << 9)
+#define RT5645_JD_SPL_TRG_MASK                  (0x1 << 8)
+#define RT5645_JD_SPL_TRG_SFT                   8
+#define RT5645_JD_SPL_TRG_LO                    (0x0 << 8)
+#define RT5645_JD_SPL_TRG_HI                    (0x1 << 8)
+#define RT5645_JD_SPR_MASK                      (0x1 << 7)
+#define RT5645_JD_SPR_SFT                       7
+#define RT5645_JD_SPR_DIS                       (0x0 << 7)
+#define RT5645_JD_SPR_EN                        (0x1 << 7)
+#define RT5645_JD_SPR_TRG_MASK                  (0x1 << 6)
+#define RT5645_JD_SPR_TRG_SFT                   6
+#define RT5645_JD_SPR_TRG_LO                    (0x0 << 6)
+#define RT5645_JD_SPR_TRG_HI                    (0x1 << 6)
+#define RT5645_JD_MO_MASK                       (0x1 << 5)
+#define RT5645_JD_MO_SFT                        5
+#define RT5645_JD_MO_DIS                        (0x0 << 5)
+#define RT5645_JD_MO_EN                         (0x1 << 5)
+#define RT5645_JD_MO_TRG_MASK                   (0x1 << 4)
+#define RT5645_JD_MO_TRG_SFT                    4
+#define RT5645_JD_MO_TRG_LO                     (0x0 << 4)
+#define RT5645_JD_MO_TRG_HI                     (0x1 << 4)
+#define RT5645_JD_LO_MASK                       (0x1 << 3)
+#define RT5645_JD_LO_SFT                        3
+#define RT5645_JD_LO_DIS                        (0x0 << 3)
+#define RT5645_JD_LO_EN                         (0x1 << 3)
+#define RT5645_JD_LO_TRG_MASK                   (0x1 << 2)
+#define RT5645_JD_LO_TRG_SFT                    2
+#define RT5645_JD_LO_TRG_LO                     (0x0 << 2)
+#define RT5645_JD_LO_TRG_HI                     (0x1 << 2)
+#define RT5645_JD1_IN4P_MASK                    (0x1 << 1)
+#define RT5645_JD1_IN4P_SFT                     1
+#define RT5645_JD1_IN4P_DIS                     (0x0 << 1)
+#define RT5645_JD1_IN4P_EN                      (0x1 << 1)
+#define RT5645_JD2_IN4N_MASK                    (0x1)
+#define RT5645_JD2_IN4N_SFT                     0
+#define RT5645_JD2_IN4N_DIS                     (0x0)
+#define RT5645_JD2_IN4N_EN                      (0x1)
+
+/* Jack detect for ANC (0xbc) */
+#define RT5645_ANC_DET_MASK                     (0x3 << 4)
+#define RT5645_ANC_DET_SFT                      4
+#define RT5645_ANC_DET_DIS                      (0x0 << 4)
+#define RT5645_ANC_DET_MB1                      (0x1 << 4)
+#define RT5645_ANC_DET_MB2                      (0x2 << 4)
+#define RT5645_ANC_DET_JD                       (0x3 << 4)
+#define RT5645_AD_TRG_MASK                      (0x1 << 3)
+#define RT5645_AD_TRG_SFT                       3
+#define RT5645_AD_TRG_LO                        (0x0 << 3)
+#define RT5645_AD_TRG_HI                        (0x1 << 3)
+#define RT5645_ANCM_DET_MASK                    (0x3 << 4)
+#define RT5645_ANCM_DET_SFT                     4
+#define RT5645_ANCM_DET_DIS                     (0x0 << 4)
+#define RT5645_ANCM_DET_MB1                     (0x1 << 4)
+#define RT5645_ANCM_DET_MB2                     (0x2 << 4)
+#define RT5645_ANCM_DET_JD                      (0x3 << 4)
+#define RT5645_AMD_TRG_MASK                     (0x1 << 3)
+#define RT5645_AMD_TRG_SFT                      3
+#define RT5645_AMD_TRG_LO                       (0x0 << 3)
+#define RT5645_AMD_TRG_HI                       (0x1 << 3)
+
+/* IRQ Control 1 (0xbd) */
+#define RT5645_IRQ_JD_MASK                      (0x1 << 15)
+#define RT5645_IRQ_JD_SFT                       15
+#define RT5645_IRQ_JD_BP                        (0x0 << 15)
+#define RT5645_IRQ_JD_NOR                       (0x1 << 15)
+#define RT5645_IRQ_OT_MASK                      (0x1 << 14)
+#define RT5645_IRQ_OT_SFT                       14
+#define RT5645_IRQ_OT_BP                        (0x0 << 14)
+#define RT5645_IRQ_OT_NOR                       (0x1 << 14)
+#define RT5645_JD_STKY_MASK                     (0x1 << 13)
+#define RT5645_JD_STKY_SFT                      13
+#define RT5645_JD_STKY_DIS                      (0x0 << 13)
+#define RT5645_JD_STKY_EN                       (0x1 << 13)
+#define RT5645_OT_STKY_MASK                     (0x1 << 12)
+#define RT5645_OT_STKY_SFT                      12
+#define RT5645_OT_STKY_DIS                      (0x0 << 12)
+#define RT5645_OT_STKY_EN                       (0x1 << 12)
+#define RT5645_JD_P_MASK                        (0x1 << 11)
+#define RT5645_JD_P_SFT                         11
+#define RT5645_JD_P_NOR                         (0x0 << 11)
+#define RT5645_JD_P_INV                         (0x1 << 11)
+#define RT5645_OT_P_MASK                        (0x1 << 10)
+#define RT5645_OT_P_SFT                         10
+#define RT5645_OT_P_NOR                         (0x0 << 10)
+#define RT5645_OT_P_INV                         (0x1 << 10)
+
+/* IRQ Control 2 (0xbe) */
+#define RT5645_IRQ_MB1_OC_MASK                  (0x1 << 15)
+#define RT5645_IRQ_MB1_OC_SFT                   15
+#define RT5645_IRQ_MB1_OC_BP                    (0x0 << 15)
+#define RT5645_IRQ_MB1_OC_NOR                   (0x1 << 15)
+#define RT5645_IRQ_MB2_OC_MASK                  (0x1 << 14)
+#define RT5645_IRQ_MB2_OC_SFT                   14
+#define RT5645_IRQ_MB2_OC_BP                    (0x0 << 14)
+#define RT5645_IRQ_MB2_OC_NOR                   (0x1 << 14)
+#define RT5645_MB1_OC_STKY_MASK                 (0x1 << 13)
+#define RT5645_MB1_OC_STKY_SFT                  13
+#define RT5645_MB1_OC_STKY_DIS                  (0x0 << 13)
+#define RT5645_MB1_OC_STKY_EN                   (0x1 << 13)
+#define RT5645_MB2_OC_STKY_MASK                 (0x1 << 12)
+#define RT5645_MB2_OC_STKY_SFT                  12
+#define RT5645_MB2_OC_STKY_DIS                  (0x0 << 12)
+#define RT5645_MB2_OC_STKY_EN                   (0x1 << 12)
+#define RT5645_MB1_OC_P_MASK                    (0x1 << 7)
+#define RT5645_MB1_OC_P_SFT                     7
+#define RT5645_MB1_OC_P_NOR                     (0x0 << 7)
+#define RT5645_MB1_OC_P_INV                     (0x1 << 7)
+#define RT5645_MB2_OC_P_MASK                    (0x1 << 6)
+#define RT5645_MB2_OC_P_SFT                     6
+#define RT5645_MB2_OC_P_NOR                     (0x0 << 6)
+#define RT5645_MB2_OC_P_INV                     (0x1 << 6)
+#define RT5645_MB1_OC_CLR                       (0x1 << 3)
+#define RT5645_MB1_OC_CLR_SFT                   3
+#define RT5645_MB2_OC_CLR                       (0x1 << 2)
+#define RT5645_MB2_OC_CLR_SFT                   2
+
+/* GPIO Control 1 (0xc0) */
+#define RT5645_GP1_PIN_MASK                     (0x1 << 15)
+#define RT5645_GP1_PIN_SFT                      15
+#define RT5645_GP1_PIN_GPIO1                    (0x0 << 15)
+#define RT5645_GP1_PIN_IRQ                      (0x1 << 15)
+#define RT5645_GP2_PIN_MASK                     (0x1 << 14)
+#define RT5645_GP2_PIN_SFT                      14
+#define RT5645_GP2_PIN_GPIO2                    (0x0 << 14)
+#define RT5645_GP2_PIN_DMIC1_SCL                (0x1 << 14)
+#define RT5645_GP3_PIN_MASK                     (0x3 << 12)
+#define RT5645_GP3_PIN_SFT                      12
+#define RT5645_GP3_PIN_GPIO3                    (0x0 << 12)
+#define RT5645_GP3_PIN_DMIC1_SDA                (0x1 << 12)
+#define RT5645_GP3_PIN_IRQ                      (0x2 << 12)
+#define RT5645_GP4_PIN_MASK                     (0x1 << 11)
+#define RT5645_GP4_PIN_SFT                      11
+#define RT5645_GP4_PIN_GPIO4                    (0x0 << 11)
+#define RT5645_GP4_PIN_DMIC2_SDA                (0x1 << 11)
+#define RT5645_DP_SIG_MASK                      (0x1 << 10)
+#define RT5645_DP_SIG_SFT                       10
+#define RT5645_DP_SIG_TEST                      (0x0 << 10)
+#define RT5645_DP_SIG_AP                        (0x1 << 10)
+#define RT5645_GPIO_M_MASK                      (0x1 << 9)
+#define RT5645_GPIO_M_SFT                       9
+#define RT5645_GPIO_M_FLT                       (0x0 << 9)
+#define RT5645_GPIO_M_PH                        (0x1 << 9)
+#define RT5645_I2S2_SEL                         (0x1 << 8)
+#define RT5645_I2S2_SEL_SFT                     8
+#define RT5645_GP5_PIN_MASK                     (0x1 << 7)
+#define RT5645_GP5_PIN_SFT                      7
+#define RT5645_GP5_PIN_GPIO5                    (0x0 << 7)
+#define RT5645_GP5_PIN_DMIC1_SDA                (0x1 << 7)
+#define RT5645_GP6_PIN_MASK                     (0x1 << 6)
+#define RT5645_GP6_PIN_SFT                      6
+#define RT5645_GP6_PIN_GPIO6                    (0x0 << 6)
+#define RT5645_GP6_PIN_DMIC2_SDA                (0x1 << 6)
+#define RT5645_GP8_PIN_MASK                     (0x1 << 3)
+#define RT5645_GP8_PIN_SFT                      3
+#define RT5645_GP8_PIN_GPIO8                    (0x0 << 3)
+#define RT5645_GP8_PIN_DMIC2_SDA                (0x1 << 3)
+#define RT5645_GP12_PIN_MASK                    (0x1 << 2)
+#define RT5645_GP12_PIN_SFT                     2
+#define RT5645_GP12_PIN_GPIO12                  (0x0 << 2)
+#define RT5645_GP12_PIN_DMIC2_SDA               (0x1 << 2)
+#define RT5645_GP11_PIN_MASK                    (0x1 << 1)
+#define RT5645_GP11_PIN_SFT                     1
+#define RT5645_GP11_PIN_GPIO11                  (0x0 << 1)
+#define RT5645_GP11_PIN_DMIC1_SDA               (0x1 << 1)
+#define RT5645_GP10_PIN_MASK                    (0x1)
+#define RT5645_GP10_PIN_SFT                     0
+#define RT5645_GP10_PIN_GPIO10                  (0x0)
+#define RT5645_GP10_PIN_DMIC2_SDA               (0x1)
+
+/* GPIO Control 3 (0xc2) */
+#define RT5645_GP4_PF_MASK                      (0x1 << 11)
+#define RT5645_GP4_PF_SFT                       11
+#define RT5645_GP4_PF_IN                        (0x0 << 11)
+#define RT5645_GP4_PF_OUT                       (0x1 << 11)
+#define RT5645_GP4_OUT_MASK                     (0x1 << 10)
+#define RT5645_GP4_OUT_SFT                      10
+#define RT5645_GP4_OUT_LO                       (0x0 << 10)
+#define RT5645_GP4_OUT_HI                       (0x1 << 10)
+#define RT5645_GP4_P_MASK                       (0x1 << 9)
+#define RT5645_GP4_P_SFT                        9
+#define RT5645_GP4_P_NOR                        (0x0 << 9)
+#define RT5645_GP4_P_INV                        (0x1 << 9)
+#define RT5645_GP3_PF_MASK                      (0x1 << 8)
+#define RT5645_GP3_PF_SFT                       8
+#define RT5645_GP3_PF_IN                        (0x0 << 8)
+#define RT5645_GP3_PF_OUT                       (0x1 << 8)
+#define RT5645_GP3_OUT_MASK                     (0x1 << 7)
+#define RT5645_GP3_OUT_SFT                      7
+#define RT5645_GP3_OUT_LO                       (0x0 << 7)
+#define RT5645_GP3_OUT_HI                       (0x1 << 7)
+#define RT5645_GP3_P_MASK                       (0x1 << 6)
+#define RT5645_GP3_P_SFT                        6
+#define RT5645_GP3_P_NOR                        (0x0 << 6)
+#define RT5645_GP3_P_INV                        (0x1 << 6)
+#define RT5645_GP2_PF_MASK                      (0x1 << 5)
+#define RT5645_GP2_PF_SFT                       5
+#define RT5645_GP2_PF_IN                        (0x0 << 5)
+#define RT5645_GP2_PF_OUT                       (0x1 << 5)
+#define RT5645_GP2_OUT_MASK                     (0x1 << 4)
+#define RT5645_GP2_OUT_SFT                      4
+#define RT5645_GP2_OUT_LO                       (0x0 << 4)
+#define RT5645_GP2_OUT_HI                       (0x1 << 4)
+#define RT5645_GP2_P_MASK                       (0x1 << 3)
+#define RT5645_GP2_P_SFT                        3
+#define RT5645_GP2_P_NOR                        (0x0 << 3)
+#define RT5645_GP2_P_INV                        (0x1 << 3)
+#define RT5645_GP1_PF_MASK                      (0x1 << 2)
+#define RT5645_GP1_PF_SFT                       2
+#define RT5645_GP1_PF_IN                        (0x0 << 2)
+#define RT5645_GP1_PF_OUT                       (0x1 << 2)
+#define RT5645_GP1_OUT_MASK                     (0x1 << 1)
+#define RT5645_GP1_OUT_SFT                      1
+#define RT5645_GP1_OUT_LO                       (0x0 << 1)
+#define RT5645_GP1_OUT_HI                       (0x1 << 1)
+#define RT5645_GP1_P_MASK                       (0x1)
+#define RT5645_GP1_P_SFT                        0
+#define RT5645_GP1_P_NOR                        (0x0)
+#define RT5645_GP1_P_INV                        (0x1)
+
+/* Programmable Register Array Control 1 (0xc8) */
+#define RT5645_REG_SEQ_MASK                     (0xf << 12)
+#define RT5645_REG_SEQ_SFT                      12
+#define RT5645_SEQ1_ST_MASK                     (0x1 << 11) /*RO*/
+#define RT5645_SEQ1_ST_SFT                      11
+#define RT5645_SEQ1_ST_RUN                      (0x0 << 11)
+#define RT5645_SEQ1_ST_FIN                      (0x1 << 11)
+#define RT5645_SEQ2_ST_MASK                     (0x1 << 10) /*RO*/
+#define RT5645_SEQ2_ST_SFT                      10
+#define RT5645_SEQ2_ST_RUN                      (0x0 << 10)
+#define RT5645_SEQ2_ST_FIN                      (0x1 << 10)
+#define RT5645_REG_LV_MASK                      (0x1 << 9)
+#define RT5645_REG_LV_SFT                       9
+#define RT5645_REG_LV_MX                        (0x0 << 9)
+#define RT5645_REG_LV_PR                        (0x1 << 9)
+#define RT5645_SEQ_2_PT_MASK                    (0x1 << 8)
+#define RT5645_SEQ_2_PT_BIT                     8
+#define RT5645_REG_IDX_MASK                     (0xff)
+#define RT5645_REG_IDX_SFT                      0
+
+/* Programmable Register Array Control 2 (0xc9) */
+#define RT5645_REG_DAT_MASK                     (0xffff)
+#define RT5645_REG_DAT_SFT                      0
+
+/* Programmable Register Array Control 3 (0xca) */
+#define RT5645_SEQ_DLY_MASK                     (0xff << 8)
+#define RT5645_SEQ_DLY_SFT                      8
+#define RT5645_PROG_MASK                        (0x1 << 7)
+#define RT5645_PROG_SFT                         7
+#define RT5645_PROG_DIS                         (0x0 << 7)
+#define RT5645_PROG_EN                          (0x1 << 7)
+#define RT5645_SEQ1_PT_RUN                      (0x1 << 6)
+#define RT5645_SEQ1_PT_RUN_BIT                  6
+#define RT5645_SEQ2_PT_RUN                      (0x1 << 5)
+#define RT5645_SEQ2_PT_RUN_BIT                  5
+
+/* Programmable Register Array Control 4 (0xcb) */
+#define RT5645_SEQ1_START_MASK                  (0xf << 8)
+#define RT5645_SEQ1_START_SFT                   8
+#define RT5645_SEQ1_END_MASK                    (0xf)
+#define RT5645_SEQ1_END_SFT                     0
+
+/* Programmable Register Array Control 5 (0xcc) */
+#define RT5645_SEQ2_START_MASK                  (0xf << 8)
+#define RT5645_SEQ2_START_SFT                   8
+#define RT5645_SEQ2_END_MASK                    (0xf)
+#define RT5645_SEQ2_END_SFT                     0
+
+/* Scramble Function (0xcd) */
+#define RT5645_SCB_KEY_MASK                     (0xff)
+#define RT5645_SCB_KEY_SFT                      0
+
+/* Scramble Control (0xce) */
+#define RT5645_SCB_SWAP_MASK                    (0x1 << 15)
+#define RT5645_SCB_SWAP_SFT                     15
+#define RT5645_SCB_SWAP_DIS                     (0x0 << 15)
+#define RT5645_SCB_SWAP_EN                      (0x1 << 15)
+#define RT5645_SCB_MASK                         (0x1 << 14)
+#define RT5645_SCB_SFT                          14
+#define RT5645_SCB_DIS                          (0x0 << 14)
+#define RT5645_SCB_EN                           (0x1 << 14)
+
+/* Baseback Control (0xcf) */
+#define RT5645_BB_MASK                          (0x1 << 15)
+#define RT5645_BB_SFT                           15
+#define RT5645_BB_DIS                           (0x0 << 15)
+#define RT5645_BB_EN                            (0x1 << 15)
+#define RT5645_BB_CT_MASK                       (0x7 << 12)
+#define RT5645_BB_CT_SFT                        12
+#define RT5645_BB_CT_A                          (0x0 << 12)
+#define RT5645_BB_CT_B                          (0x1 << 12)
+#define RT5645_BB_CT_C                          (0x2 << 12)
+#define RT5645_BB_CT_D                          (0x3 << 12)
+#define RT5645_M_BB_L_MASK                      (0x1 << 9)
+#define RT5645_M_BB_L_SFT                       9
+#define RT5645_M_BB_R_MASK                      (0x1 << 8)
+#define RT5645_M_BB_R_SFT                       8
+#define RT5645_M_BB_HPF_L_MASK                  (0x1 << 7)
+#define RT5645_M_BB_HPF_L_SFT                   7
+#define RT5645_M_BB_HPF_R_MASK                  (0x1 << 6)
+#define RT5645_M_BB_HPF_R_SFT                   6
+#define RT5645_G_BB_BST_MASK                    (0x3f)
+#define RT5645_G_BB_BST_SFT                     0
+
+/* MP3 Plus Control 1 (0xd0) */
+#define RT5645_M_MP3_L_MASK                     (0x1 << 15)
+#define RT5645_M_MP3_L_SFT                      15
+#define RT5645_M_MP3_R_MASK                     (0x1 << 14)
+#define RT5645_M_MP3_R_SFT                      14
+#define RT5645_M_MP3_MASK                       (0x1 << 13)
+#define RT5645_M_MP3_SFT                        13
+#define RT5645_M_MP3_DIS                        (0x0 << 13)
+#define RT5645_M_MP3_EN                         (0x1 << 13)
+#define RT5645_EG_MP3_MASK                      (0x1f << 8)
+#define RT5645_EG_MP3_SFT                       8
+#define RT5645_MP3_HLP_MASK                     (0x1 << 7)
+#define RT5645_MP3_HLP_SFT                      7
+#define RT5645_MP3_HLP_DIS                      (0x0 << 7)
+#define RT5645_MP3_HLP_EN                       (0x1 << 7)
+#define RT5645_M_MP3_ORG_L_MASK                 (0x1 << 6)
+#define RT5645_M_MP3_ORG_L_SFT                  6
+#define RT5645_M_MP3_ORG_R_MASK                 (0x1 << 5)
+#define RT5645_M_MP3_ORG_R_SFT                  5
+
+/* MP3 Plus Control 2 (0xd1) */
+#define RT5645_MP3_WT_MASK                      (0x1 << 13)
+#define RT5645_MP3_WT_SFT                       13
+#define RT5645_MP3_WT_1_4                       (0x0 << 13)
+#define RT5645_MP3_WT_1_2                       (0x1 << 13)
+#define RT5645_OG_MP3_MASK                      (0x1f << 8)
+#define RT5645_OG_MP3_SFT                       8
+#define RT5645_HG_MP3_MASK                      (0x3f)
+#define RT5645_HG_MP3_SFT                       0
+
+/* 3D HP Control 1 (0xd2) */
+#define RT5645_3D_CF_MASK                       (0x1 << 15)
+#define RT5645_3D_CF_SFT                        15
+#define RT5645_3D_CF_DIS                        (0x0 << 15)
+#define RT5645_3D_CF_EN                         (0x1 << 15)
+#define RT5645_3D_HP_MASK                       (0x1 << 14)
+#define RT5645_3D_HP_SFT                        14
+#define RT5645_3D_HP_DIS                        (0x0 << 14)
+#define RT5645_3D_HP_EN                         (0x1 << 14)
+#define RT5645_3D_BT_MASK                       (0x1 << 13)
+#define RT5645_3D_BT_SFT                        13
+#define RT5645_3D_BT_DIS                        (0x0 << 13)
+#define RT5645_3D_BT_EN                         (0x1 << 13)
+#define RT5645_3D_1F_MIX_MASK                   (0x3 << 11)
+#define RT5645_3D_1F_MIX_SFT                    11
+#define RT5645_3D_HP_M_MASK                     (0x1 << 10)
+#define RT5645_3D_HP_M_SFT                      10
+#define RT5645_3D_HP_M_SUR                      (0x0 << 10)
+#define RT5645_3D_HP_M_FRO                      (0x1 << 10)
+#define RT5645_M_3D_HRTF_MASK                   (0x1 << 9)
+#define RT5645_M_3D_HRTF_SFT                    9
+#define RT5645_M_3D_D2H_MASK                    (0x1 << 8)
+#define RT5645_M_3D_D2H_SFT                     8
+#define RT5645_M_3D_D2R_MASK                    (0x1 << 7)
+#define RT5645_M_3D_D2R_SFT                     7
+#define RT5645_M_3D_REVB_MASK                   (0x1 << 6)
+#define RT5645_M_3D_REVB_SFT                    6
+
+/* Adjustable high pass filter control 1 (0xd3) */
+#define RT5645_2ND_HPF_MASK                     (0x1 << 15)
+#define RT5645_2ND_HPF_SFT                      15
+#define RT5645_2ND_HPF_DIS                      (0x0 << 15)
+#define RT5645_2ND_HPF_EN                       (0x1 << 15)
+#define RT5645_HPF_CF_L_MASK                    (0x7 << 12)
+#define RT5645_HPF_CF_L_SFT                     12
+#define RT5645_1ST_HPF_MASK                     (0x1 << 11)
+#define RT5645_1ST_HPF_SFT                      11
+#define RT5645_1ST_HPF_DIS                      (0x0 << 11)
+#define RT5645_1ST_HPF_EN                       (0x1 << 11)
+#define RT5645_HPF_CF_R_MASK                    (0x7 << 8)
+#define RT5645_HPF_CF_R_SFT                     8
+#define RT5645_ZD_T_MASK                        (0x3 << 6)
+#define RT5645_ZD_T_SFT                         6
+#define RT5645_ZD_F_MASK                        (0x3 << 4)
+#define RT5645_ZD_F_SFT                         4
+#define RT5645_ZD_F_IM                          (0x0 << 4)
+#define RT5645_ZD_F_ZC_IM                       (0x1 << 4)
+#define RT5645_ZD_F_ZC_IOD                      (0x2 << 4)
+#define RT5645_ZD_F_UN                          (0x3 << 4)
+
+/* HP calibration control and Amp detection (0xd6) */
+#define RT5645_SI_DAC_MASK                      (0x1 << 11)
+#define RT5645_SI_DAC_SFT                       11
+#define RT5645_SI_DAC_AUTO                      (0x0 << 11)
+#define RT5645_SI_DAC_TEST                      (0x1 << 11)
+#define RT5645_DC_CAL_M_MASK                    (0x1 << 10)
+#define RT5645_DC_CAL_M_SFT                     10
+#define RT5645_DC_CAL_M_CAL                     (0x0 << 10)
+#define RT5645_DC_CAL_M_NOR                     (0x1 << 10)
+#define RT5645_DC_CAL_MASK                      (0x1 << 9)
+#define RT5645_DC_CAL_SFT                       9
+#define RT5645_DC_CAL_DIS                       (0x0 << 9)
+#define RT5645_DC_CAL_EN                        (0x1 << 9)
+#define RT5645_HPD_RCV_MASK                     (0x7 << 6)
+#define RT5645_HPD_RCV_SFT                      6
+#define RT5645_HPD_PS_MASK                      (0x1 << 5)
+#define RT5645_HPD_PS_SFT                       5
+#define RT5645_HPD_PS_DIS                       (0x0 << 5)
+#define RT5645_HPD_PS_EN                        (0x1 << 5)
+#define RT5645_CAL_M_MASK                       (0x1 << 4)
+#define RT5645_CAL_M_SFT                        4
+#define RT5645_CAL_M_DEP                        (0x0 << 4)
+#define RT5645_CAL_M_CAL                        (0x1 << 4)
+#define RT5645_CAL_MASK                         (0x1 << 3)
+#define RT5645_CAL_SFT                          3
+#define RT5645_CAL_DIS                          (0x0 << 3)
+#define RT5645_CAL_EN                           (0x1 << 3)
+#define RT5645_CAL_TEST_MASK                    (0x1 << 2)
+#define RT5645_CAL_TEST_SFT                     2
+#define RT5645_CAL_TEST_DIS                     (0x0 << 2)
+#define RT5645_CAL_TEST_EN                      (0x1 << 2)
+#define RT5645_CAL_P_MASK                       (0x3)
+#define RT5645_CAL_P_SFT                        0
+#define RT5645_CAL_P_NONE                       (0x0)
+#define RT5645_CAL_P_CAL                        (0x1)
+#define RT5645_CAL_P_DAC_CAL                    (0x2)
+
+/* Soft volume and zero cross control 1 (0xd9) */
+#define RT5645_SV_MASK                          (0x1 << 15)
+#define RT5645_SV_SFT                           15
+#define RT5645_SV_DIS                           (0x0 << 15)
+#define RT5645_SV_EN                            (0x1 << 15)
+#define RT5645_SPO_SV_MASK                      (0x1 << 14)
+#define RT5645_SPO_SV_SFT                       14
+#define RT5645_SPO_SV_DIS                       (0x0 << 14)
+#define RT5645_SPO_SV_EN                        (0x1 << 14)
+#define RT5645_OUT_SV_MASK                      (0x1 << 13)
+#define RT5645_OUT_SV_SFT                       13
+#define RT5645_OUT_SV_DIS                       (0x0 << 13)
+#define RT5645_OUT_SV_EN                        (0x1 << 13)
+#define RT5645_HP_SV_MASK                       (0x1 << 12)
+#define RT5645_HP_SV_SFT                        12
+#define RT5645_HP_SV_DIS                        (0x0 << 12)
+#define RT5645_HP_SV_EN                         (0x1 << 12)
+#define RT5645_ZCD_DIG_MASK                     (0x1 << 11)
+#define RT5645_ZCD_DIG_SFT                      11
+#define RT5645_ZCD_DIG_DIS                      (0x0 << 11)
+#define RT5645_ZCD_DIG_EN                       (0x1 << 11)
+#define RT5645_ZCD_MASK                         (0x1 << 10)
+#define RT5645_ZCD_SFT                          10
+#define RT5645_ZCD_PD                           (0x0 << 10)
+#define RT5645_ZCD_PU                           (0x1 << 10)
+#define RT5645_M_ZCD_MASK                       (0x3f << 4)
+#define RT5645_M_ZCD_SFT                        4
+#define RT5645_M_ZCD_RM_L                       (0x1 << 9)
+#define RT5645_M_ZCD_RM_R                       (0x1 << 8)
+#define RT5645_M_ZCD_SM_L                       (0x1 << 7)
+#define RT5645_M_ZCD_SM_R                       (0x1 << 6)
+#define RT5645_M_ZCD_OM_L                       (0x1 << 5)
+#define RT5645_M_ZCD_OM_R                       (0x1 << 4)
+#define RT5645_SV_DLY_MASK                      (0xf)
+#define RT5645_SV_DLY_SFT                       0
+
+/* Soft volume and zero cross control 2 (0xda) */
+#define RT5645_ZCD_HP_MASK                      (0x1 << 15)
+#define RT5645_ZCD_HP_SFT                       15
+#define RT5645_ZCD_HP_DIS                       (0x0 << 15)
+#define RT5645_ZCD_HP_EN                        (0x1 << 15)
+
+
+/* Codec Private Register definition */
+/* 3D Speaker Control (0x63) */
+#define RT5645_3D_SPK_MASK                      (0x1 << 15)
+#define RT5645_3D_SPK_SFT                       15
+#define RT5645_3D_SPK_DIS                       (0x0 << 15)
+#define RT5645_3D_SPK_EN                        (0x1 << 15)
+#define RT5645_3D_SPK_M_MASK                    (0x3 << 13)
+#define RT5645_3D_SPK_M_SFT                     13
+#define RT5645_3D_SPK_CG_MASK                   (0x1f << 8)
+#define RT5645_3D_SPK_CG_SFT                    8
+#define RT5645_3D_SPK_SG_MASK                   (0x1f)
+#define RT5645_3D_SPK_SG_SFT                    0
+
+/* Wind Noise Detection Control 1 (0x6c) */
+#define RT5645_WND_MASK                         (0x1 << 15)
+#define RT5645_WND_SFT                          15
+#define RT5645_WND_DIS                          (0x0 << 15)
+#define RT5645_WND_EN                           (0x1 << 15)
+
+/* Wind Noise Detection Control 2 (0x6d) */
+#define RT5645_WND_FC_NW_MASK                   (0x3f << 10)
+#define RT5645_WND_FC_NW_SFT                    10
+#define RT5645_WND_FC_WK_MASK                   (0x3f << 4)
+#define RT5645_WND_FC_WK_SFT                    4
+
+/* Wind Noise Detection Control 3 (0x6e) */
+#define RT5645_HPF_FC_MASK                      (0x3f << 6)
+#define RT5645_HPF_FC_SFT                       6
+#define RT5645_WND_FC_ST_MASK                   (0x3f)
+#define RT5645_WND_FC_ST_SFT                    0
+
+/* Wind Noise Detection Control 4 (0x6f) */
+#define RT5645_WND_TH_LO_MASK                   (0x3ff)
+#define RT5645_WND_TH_LO_SFT                    0
+
+/* Wind Noise Detection Control 5 (0x70) */
+#define RT5645_WND_TH_HI_MASK                   (0x3ff)
+#define RT5645_WND_TH_HI_SFT                    0
+
+/* Wind Noise Detection Control 8 (0x73) */
+#define RT5645_WND_WIND_MASK                    (0x1 << 13) /* Read-Only */
+#define RT5645_WND_WIND_SFT                     13
+#define RT5645_WND_STRONG_MASK                  (0x1 << 12) /* Read-Only */
+#define RT5645_WND_STRONG_SFT                   12
+enum {
+        RT5645_NO_WIND,
+        RT5645_BREEZE,
+        RT5645_STORM,
+};
+
+/* Dipole Speaker Interface (0x75) */
+#define RT5645_DP_ATT_MASK                      (0x3 << 14)
+#define RT5645_DP_ATT_SFT                       14
+#define RT5645_DP_SPK_MASK                      (0x1 << 10)
+#define RT5645_DP_SPK_SFT                       10
+#define RT5645_DP_SPK_DIS                       (0x0 << 10)
+#define RT5645_DP_SPK_EN                        (0x1 << 10)
+
+/* EQ Pre Volume Control (0xb3) */
+#define RT5645_EQ_PRE_VOL_MASK                  (0xffff)
+#define RT5645_EQ_PRE_VOL_SFT                   0
+
+/* EQ Post Volume Control (0xb4) */
+#define RT5645_EQ_PST_VOL_MASK                  (0xffff)
+#define RT5645_EQ_PST_VOL_SFT                   0
+
+/* Jack Detect Control 3 (0xf8) */
+#define RT5645_CMP_MIC_IN_DET_MASK              (0x7 << 12)
+#define RT5645_JD_CBJ_EN                        (0x1 << 7)
+#define RT5645_JD_CBJ_POL                       (0x1 << 6)
+#define RT5645_JD_TRI_CBJ_SEL_MASK              (0x7 << 3)
+#define RT5645_JD_TRI_CBJ_SEL_SFT               (3)
+#define RT5645_JD_TRI_HPO_SEL_MASK              (0x7)
+#define RT5645_JD_TRI_HPO_SEL_SFT               (0)
+#define RT5645_JD_F_GPIO_JD1                    (0x0)
+#define RT5645_JD_F_JD1_1                       (0x1)
+#define RT5645_JD_F_JD1_2                       (0x2)
+#define RT5645_JD_F_JD2                         (0x3)
+#define RT5645_JD_F_JD3                         (0x4)
+#define RT5645_JD_F_GPIO_JD2                    (0x5)
+#define RT5645_JD_F_MX0B_12                     (0x6)
+
+/* Digital Misc Control (0xfa) */
+#define RT5645_RST_DSP                          (0x1 << 13)
+#define RT5645_IF1_ADC1_IN1_SEL                 (0x1 << 12)
+#define RT5645_IF1_ADC1_IN1_SFT                 12
+#define RT5645_IF1_ADC1_IN2_SEL                 (0x1 << 11)
+#define RT5645_IF1_ADC1_IN2_SFT                 11
+#define RT5645_IF1_ADC2_IN1_SEL                 (0x1 << 10)
+#define RT5645_IF1_ADC2_IN1_SFT                 10
+#define RT5645_DIG_GATE_CTRL                    0x1
+
+/* General Control2 (0xfb) */
+#define RT5645_RXDC_SRC_MASK                    (0x1 << 7)
+#define RT5645_RXDC_SRC_STO                     (0x0 << 7)
+#define RT5645_RXDC_SRC_MONO                    (0x1 << 7)
+#define RT5645_RXDC_SRC_SFT                     (7)
+#define RT5645_RXDP2_SEL_MASK                   (0x1 << 3)
+#define RT5645_RXDP2_SEL_IF2                    (0x0 << 3)
+#define RT5645_RXDP2_SEL_ADC                    (0x1 << 3)
+#define RT5645_RXDP2_SEL_SFT                    (3)
+
+
+/* Vendor ID (0xfd) */
+#define RT5645_VER_C                            0x2
+#define RT5645_VER_D                            0x3
+
+
+/* Volume Rescale */
+#define RT5645_VOL_RSCL_MAX 0x27
+#define RT5645_VOL_RSCL_RANGE 0x1F
+/* Debug String Length */
+#define RT5645_REG_DISP_LEN 23
+
+
+/* System Clock Source */
+enum {
+        RT5645_SCLK_S_MCLK,
+        RT5645_SCLK_S_PLL1,
+        RT5645_SCLK_S_RCCLK,
+};
+
+/* PLL1 Source */
+enum {
+        RT5645_PLL1_S_MCLK,
+        RT5645_PLL1_S_BCLK1,
+        RT5645_PLL1_S_BCLK2,
+};
+
+enum {
+        RT5645_AIF1,
+        RT5645_AIF2,
+        RT5645_AIFS,
+};
+
+enum {
+        RT5645_DMIC_DATA_IN2P,
+        RT5645_DMIC_DATA_GPIO6,
+        RT5645_DMIC_DATA_GPIO10,
+        RT5645_DMIC_DATA_GPIO12,
+};
+
+enum {
+        RT5645_DMIC_DATA_IN2N,
+        RT5645_DMIC_DATA_GPIO5,
+        RT5645_DMIC_DATA_GPIO11,
+};
+
+struct rt5645_pll_code {
+        bool m_bp; /* Indicates bypass m code or not. */
+        int m_code;
+        int n_code;
+        int k_code;
+};
+
+struct rt5645_priv {
+        struct snd_soc_codec *codec;
+        struct rt5645_platform_data pdata;
+        struct regmap *regmap;
+
+        int sysclk;
+        int sysclk_src;
+        int lrck[RT5645_AIFS];
+        int bclk[RT5645_AIFS];
+        int master[RT5645_AIFS];
+
+        int pll_src;
+        int pll_in;
+        int pll_out;
+};
+
+#endif /* __RT5645_H__ */
diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
new file mode 100644
index 000000000000..9c88d89f41f0
--- /dev/null
+++ b/sound/soc/codecs/rt5651.c
@@ -0,0 +1,1897 @@
+/*
+ * rt5651.c  --  RT5651 ALSA SoC audio codec driver
+ *
+ * Copyright 2014 Realtek Semiconductor Corp.
+ * Author: Bard Liao <bardliao@realtek.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/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/i2c.h>
+#include <linux/regmap.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+
+#include "rt5651.h"
+
+#define RT5651_DEVICE_ID_VALUE 0x6281
+
+#define RT5651_PR_RANGE_BASE (0xff + 1)
+#define RT5651_PR_SPACING 0x100
+
+#define RT5651_PR_BASE (RT5651_PR_RANGE_BASE + (0 * RT5651_PR_SPACING))
+
+static const struct regmap_range_cfg rt5651_ranges[] = {
+        { .name = "PR", .range_min = RT5651_PR_BASE,
+          .range_max = RT5651_PR_BASE + 0xb4,
+          .selector_reg = RT5651_PRIV_INDEX,
+          .selector_mask = 0xff,
+          .selector_shift = 0x0,
+          .window_start = RT5651_PRIV_DATA,
+          .window_len = 0x1, },
+};
+
+static struct reg_default init_list[] = {
+        {RT5651_PR_BASE + 0x3d, 0x3e00},
+};
+
+static const struct reg_default rt5651_reg[] = {
+        { 0x00, 0x0000 },
+        { 0x02, 0xc8c8 },
+        { 0x03, 0xc8c8 },
+        { 0x05, 0x0000 },
+        { 0x0d, 0x0000 },
+        { 0x0e, 0x0000 },
+        { 0x0f, 0x0808 },
+        { 0x10, 0x0808 },
+        { 0x19, 0xafaf },
+        { 0x1a, 0xafaf },
+        { 0x1b, 0x0c00 },
+        { 0x1c, 0x2f2f },
+        { 0x1d, 0x2f2f },
+        { 0x1e, 0x0000 },
+        { 0x27, 0x7860 },
+        { 0x28, 0x7070 },
+        { 0x29, 0x8080 },
+        { 0x2a, 0x5252 },
+        { 0x2b, 0x5454 },
+        { 0x2f, 0x0000 },
+        { 0x30, 0x5000 },
+        { 0x3b, 0x0000 },
+        { 0x3c, 0x006f },
+        { 0x3d, 0x0000 },
+        { 0x3e, 0x006f },
+        { 0x45, 0x6000 },
+        { 0x4d, 0x0000 },
+        { 0x4e, 0x0000 },
+        { 0x4f, 0x0279 },
+        { 0x50, 0x0000 },
+        { 0x51, 0x0000 },
+        { 0x52, 0x0279 },
+        { 0x53, 0xf000 },
+        { 0x61, 0x0000 },
+        { 0x62, 0x0000 },
+        { 0x63, 0x00c0 },
+        { 0x64, 0x0000 },
+        { 0x65, 0x0000 },
+        { 0x66, 0x0000 },
+        { 0x70, 0x8000 },
+        { 0x71, 0x8000 },
+        { 0x73, 0x1104 },
+        { 0x74, 0x0c00 },
+        { 0x75, 0x1400 },
+        { 0x77, 0x0c00 },
+        { 0x78, 0x4000 },
+        { 0x79, 0x0123 },
+        { 0x80, 0x0000 },
+        { 0x81, 0x0000 },
+        { 0x82, 0x0000 },
+        { 0x83, 0x0800 },
+        { 0x84, 0x0000 },
+        { 0x85, 0x0008 },
+        { 0x89, 0x0000 },
+        { 0x8e, 0x0004 },
+        { 0x8f, 0x1100 },
+        { 0x90, 0x0000 },
+        { 0x93, 0x2000 },
+        { 0x94, 0x0200 },
+        { 0xb0, 0x2080 },
+        { 0xb1, 0x0000 },
+        { 0xb4, 0x2206 },
+        { 0xb5, 0x1f00 },
+        { 0xb6, 0x0000 },
+        { 0xbb, 0x0000 },
+        { 0xbc, 0x0000 },
+        { 0xbd, 0x0000 },
+        { 0xbe, 0x0000 },
+        { 0xbf, 0x0000 },
+        { 0xc0, 0x0400 },
+        { 0xc1, 0x0000 },
+        { 0xc2, 0x0000 },
+        { 0xcf, 0x0013 },
+        { 0xd0, 0x0680 },
+        { 0xd1, 0x1c17 },
+        { 0xd3, 0xb320 },
+        { 0xd9, 0x0809 },
+        { 0xfa, 0x0010 },
+        { 0xfe, 0x10ec },
+        { 0xff, 0x6281 },
+};
+
+static bool rt5651_volatile_register(struct device *dev,  unsigned int reg)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(rt5651_ranges); i++) {
+                if ((reg >= rt5651_ranges[i].window_start &&
+                     reg <= rt5651_ranges[i].window_start +
+                     rt5651_ranges[i].window_len) ||
+                    (reg >= rt5651_ranges[i].range_min &&
+                     reg <= rt5651_ranges[i].range_max)) {
+                        return true;
+                }
+        }
+
+        switch (reg) {
+        case RT5651_RESET:
+        case RT5651_PRIV_DATA:
+        case RT5651_EQ_CTRL1:
+        case RT5651_ALC_1:
+        case RT5651_IRQ_CTRL2:
+        case RT5651_INT_IRQ_ST:
+        case RT5651_PGM_REG_ARR1:
+        case RT5651_PGM_REG_ARR3:
+        case RT5651_VENDOR_ID:
+        case RT5651_DEVICE_ID:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static bool rt5651_readable_register(struct device *dev, unsigned int reg)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(rt5651_ranges); i++) {
+                if ((reg >= rt5651_ranges[i].window_start &&
+                     reg <= rt5651_ranges[i].window_start +
+                     rt5651_ranges[i].window_len) ||
+                    (reg >= rt5651_ranges[i].range_min &&
+                     reg <= rt5651_ranges[i].range_max)) {
+                        return true;
+                }
+        }
+
+        switch (reg) {
+        case RT5651_RESET:
+        case RT5651_VERSION_ID:
+        case RT5651_VENDOR_ID:
+        case RT5651_DEVICE_ID:
+        case RT5651_HP_VOL:
+        case RT5651_LOUT_CTRL1:
+        case RT5651_LOUT_CTRL2:
+        case RT5651_IN1_IN2:
+        case RT5651_IN3:
+        case RT5651_INL1_INR1_VOL:
+        case RT5651_INL2_INR2_VOL:
+        case RT5651_DAC1_DIG_VOL:
+        case RT5651_DAC2_DIG_VOL:
+        case RT5651_DAC2_CTRL:
+        case RT5651_ADC_DIG_VOL:
+        case RT5651_ADC_DATA:
+        case RT5651_ADC_BST_VOL:
+        case RT5651_STO1_ADC_MIXER:
+        case RT5651_STO2_ADC_MIXER:
+        case RT5651_AD_DA_MIXER:
+        case RT5651_STO_DAC_MIXER:
+        case RT5651_DD_MIXER:
+        case RT5651_DIG_INF_DATA:
+        case RT5651_PDM_CTL:
+        case RT5651_REC_L1_MIXER:
+        case RT5651_REC_L2_MIXER:
+        case RT5651_REC_R1_MIXER:
+        case RT5651_REC_R2_MIXER:
+        case RT5651_HPO_MIXER:
+        case RT5651_OUT_L1_MIXER:
+        case RT5651_OUT_L2_MIXER:
+        case RT5651_OUT_L3_MIXER:
+        case RT5651_OUT_R1_MIXER:
+        case RT5651_OUT_R2_MIXER:
+        case RT5651_OUT_R3_MIXER:
+        case RT5651_LOUT_MIXER:
+        case RT5651_PWR_DIG1:
+        case RT5651_PWR_DIG2:
+        case RT5651_PWR_ANLG1:
+        case RT5651_PWR_ANLG2:
+        case RT5651_PWR_MIXER:
+        case RT5651_PWR_VOL:
+        case RT5651_PRIV_INDEX:
+        case RT5651_PRIV_DATA:
+        case RT5651_I2S1_SDP:
+        case RT5651_I2S2_SDP:
+        case RT5651_ADDA_CLK1:
+        case RT5651_ADDA_CLK2:
+        case RT5651_DMIC:
+        case RT5651_TDM_CTL_1:
+        case RT5651_TDM_CTL_2:
+        case RT5651_TDM_CTL_3:
+        case RT5651_GLB_CLK:
+        case RT5651_PLL_CTRL1:
+        case RT5651_PLL_CTRL2:
+        case RT5651_PLL_MODE_1:
+        case RT5651_PLL_MODE_2:
+        case RT5651_PLL_MODE_3:
+        case RT5651_PLL_MODE_4:
+        case RT5651_PLL_MODE_5:
+        case RT5651_PLL_MODE_6:
+        case RT5651_PLL_MODE_7:
+        case RT5651_DEPOP_M1:
+        case RT5651_DEPOP_M2:
+        case RT5651_DEPOP_M3:
+        case RT5651_CHARGE_PUMP:
+        case RT5651_MICBIAS:
+        case RT5651_A_JD_CTL1:
+        case RT5651_EQ_CTRL1:
+        case RT5651_EQ_CTRL2:
+        case RT5651_ALC_1:
+        case RT5651_ALC_2:
+        case RT5651_ALC_3:
+        case RT5651_JD_CTRL1:
+        case RT5651_JD_CTRL2:
+        case RT5651_IRQ_CTRL1:
+        case RT5651_IRQ_CTRL2:
+        case RT5651_INT_IRQ_ST:
+        case RT5651_GPIO_CTRL1:
+        case RT5651_GPIO_CTRL2:
+        case RT5651_GPIO_CTRL3:
+        case RT5651_PGM_REG_ARR1:
+        case RT5651_PGM_REG_ARR2:
+        case RT5651_PGM_REG_ARR3:
+        case RT5651_PGM_REG_ARR4:
+        case RT5651_PGM_REG_ARR5:
+        case RT5651_SCB_FUNC:
+        case RT5651_SCB_CTRL:
+        case RT5651_BASE_BACK:
+        case RT5651_MP3_PLUS1:
+        case RT5651_MP3_PLUS2:
+        case RT5651_ADJ_HPF_CTRL1:
+        case RT5651_ADJ_HPF_CTRL2:
+        case RT5651_HP_CALIB_AMP_DET:
+        case RT5651_HP_CALIB2:
+        case RT5651_SV_ZCD1:
+        case RT5651_SV_ZCD2:
+        case RT5651_D_MISC:
+        case RT5651_DUMMY2:
+        case RT5651_DUMMY3:
+                return true;
+        default:
+                return false;
+        }
+}
+
+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);
+static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0);
+static const DECLARE_TLV_DB_SCALE(adc_bst_tlv, 0, 1200, 0);
+
+/* {0, +20, +24, +30, +35, +40, +44, +50, +52} dB */
+static unsigned int bst_tlv[] = {
+        TLV_DB_RANGE_HEAD(7),
+        0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
+        1, 1, TLV_DB_SCALE_ITEM(2000, 0, 0),
+        2, 2, TLV_DB_SCALE_ITEM(2400, 0, 0),
+        3, 5, TLV_DB_SCALE_ITEM(3000, 500, 0),
+        6, 6, TLV_DB_SCALE_ITEM(4400, 0, 0),
+        7, 7, TLV_DB_SCALE_ITEM(5000, 0, 0),
+        8, 8, TLV_DB_SCALE_ITEM(5200, 0, 0),
+};
+
+/* Interface data select */
+static const char * const rt5651_data_select[] = {
+        "Normal", "Swap", "left copy to right", "right copy to left"};
+
+static SOC_ENUM_SINGLE_DECL(rt5651_if2_dac_enum, RT5651_DIG_INF_DATA,
+                                RT5651_IF2_DAC_SEL_SFT, rt5651_data_select);
+
+static SOC_ENUM_SINGLE_DECL(rt5651_if2_adc_enum, RT5651_DIG_INF_DATA,
+                                RT5651_IF2_ADC_SEL_SFT, rt5651_data_select);
+
+static const struct snd_kcontrol_new rt5651_snd_controls[] = {
+        /* Headphone Output Volume */
+        SOC_DOUBLE_TLV("HP Playback Volume", RT5651_HP_VOL,
+                RT5651_L_VOL_SFT, RT5651_R_VOL_SFT, 39, 1, out_vol_tlv),
+        /* OUTPUT Control */
+        SOC_DOUBLE_TLV("OUT Playback Volume", RT5651_LOUT_CTRL1,
+                RT5651_L_VOL_SFT, RT5651_R_VOL_SFT, 39, 1, out_vol_tlv),
+
+        /* DAC Digital Volume */
+        SOC_DOUBLE("DAC2 Playback Switch", RT5651_DAC2_CTRL,
+                RT5651_M_DAC_L2_VOL_SFT, RT5651_M_DAC_R2_VOL_SFT, 1, 1),
+        SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5651_DAC1_DIG_VOL,
+                        RT5651_L_VOL_SFT, RT5651_R_VOL_SFT,
+                        175, 0, dac_vol_tlv),
+        SOC_DOUBLE_TLV("Mono DAC Playback Volume", RT5651_DAC2_DIG_VOL,
+                        RT5651_L_VOL_SFT, RT5651_R_VOL_SFT,
+                        175, 0, dac_vol_tlv),
+        /* IN1/IN2 Control */
+        SOC_SINGLE_TLV("IN1 Boost", RT5651_IN1_IN2,
+                RT5651_BST_SFT1, 8, 0, bst_tlv),
+        SOC_SINGLE_TLV("IN2 Boost", RT5651_IN1_IN2,
+                RT5651_BST_SFT2, 8, 0, bst_tlv),
+        /* INL/INR Volume Control */
+        SOC_DOUBLE_TLV("IN Capture Volume", RT5651_INL1_INR1_VOL,
+                        RT5651_INL_VOL_SFT, RT5651_INR_VOL_SFT,
+                        31, 1, in_vol_tlv),
+        /* ADC Digital Volume Control */
+        SOC_DOUBLE("ADC Capture Switch", RT5651_ADC_DIG_VOL,
+                RT5651_L_MUTE_SFT, RT5651_R_MUTE_SFT, 1, 1),
+        SOC_DOUBLE_TLV("ADC Capture Volume", RT5651_ADC_DIG_VOL,
+                        RT5651_L_VOL_SFT, RT5651_R_VOL_SFT,
+                        127, 0, adc_vol_tlv),
+        SOC_DOUBLE_TLV("Mono ADC Capture Volume", RT5651_ADC_DATA,
+                        RT5651_L_VOL_SFT, RT5651_R_VOL_SFT,
+                        127, 0, adc_vol_tlv),
+        /* ADC Boost Volume Control */
+        SOC_DOUBLE_TLV("ADC Boost Gain", RT5651_ADC_BST_VOL,
+                        RT5651_ADC_L_BST_SFT, RT5651_ADC_R_BST_SFT,
+                        3, 0, adc_bst_tlv),
+
+        /* ASRC */
+        SOC_SINGLE("IF1 ASRC Switch", RT5651_PLL_MODE_1,
+                RT5651_STO1_T_SFT, 1, 0),
+        SOC_SINGLE("IF2 ASRC Switch", RT5651_PLL_MODE_1,
+                RT5651_STO2_T_SFT, 1, 0),
+        SOC_SINGLE("DMIC ASRC Switch", RT5651_PLL_MODE_1,
+                RT5651_DMIC_1_M_SFT, 1, 0),
+
+        SOC_ENUM("ADC IF2 Data Switch", rt5651_if2_adc_enum),
+        SOC_ENUM("DAC IF2 Data Switch", rt5651_if2_dac_enum),
+};
+
+/**
+ * set_dmic_clk - Set parameter of dmic.
+ *
+ * @w: DAPM widget.
+ * @kcontrol: The kcontrol of this widget.
+ * @event: Event id.
+ *
+ * Choose dmic clock between 1MHz and 3MHz.
+ * It is better for clock to approximate 3MHz.
+ */
+static int set_dmic_clk(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+        int div[] = {2, 3, 4, 6, 8, 12}, idx = -EINVAL;
+        int i, rate, red, bound, temp;
+
+        rate = rt5651->sysclk;
+        red = 3000000 * 12;
+        for (i = 0; i < ARRAY_SIZE(div); i++) {
+                bound = div[i] * 3000000;
+                if (rate > bound)
+                        continue;
+                temp = bound - rate;
+                if (temp < red) {
+                        red = temp;
+                        idx = i;
+                }
+        }
+        if (idx < 0)
+                dev_err(codec->dev, "Failed to set DMIC clock\n");
+        else
+                snd_soc_update_bits(codec, RT5651_DMIC, RT5651_DMIC_CLK_MASK,
+                                        idx << RT5651_DMIC_CLK_SFT);
+
+        return idx;
+}
+
+static int is_sysclk_from_pll(struct snd_soc_dapm_widget *source,
+                         struct snd_soc_dapm_widget *sink)
+{
+        unsigned int val;
+
+        val = snd_soc_read(source->codec, RT5651_GLB_CLK);
+        val &= RT5651_SCLK_SRC_MASK;
+        if (val == RT5651_SCLK_SRC_PLL1)
+                return 1;
+        else
+                return 0;
+}
+
+/* Digital Mixer */
+static const struct snd_kcontrol_new rt5651_sto1_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5651_STO1_ADC_MIXER,
+                        RT5651_M_STO1_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5651_STO1_ADC_MIXER,
+                        RT5651_M_STO1_ADC_L2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_sto1_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5651_STO1_ADC_MIXER,
+                        RT5651_M_STO1_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5651_STO1_ADC_MIXER,
+                        RT5651_M_STO1_ADC_R2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_sto2_adc_l_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5651_STO2_ADC_MIXER,
+                        RT5651_M_STO2_ADC_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5651_STO2_ADC_MIXER,
+                        RT5651_M_STO2_ADC_L2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_sto2_adc_r_mix[] = {
+        SOC_DAPM_SINGLE("ADC1 Switch", RT5651_STO2_ADC_MIXER,
+                        RT5651_M_STO2_ADC_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("ADC2 Switch", RT5651_STO2_ADC_MIXER,
+                        RT5651_M_STO2_ADC_R2_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("Stereo ADC Switch", RT5651_AD_DA_MIXER,
+                        RT5651_M_ADCMIX_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INF1 Switch", RT5651_AD_DA_MIXER,
+                        RT5651_M_IF1_DAC_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("Stereo ADC Switch", RT5651_AD_DA_MIXER,
+                        RT5651_M_ADCMIX_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INF1 Switch", RT5651_AD_DA_MIXER,
+                        RT5651_M_IF1_DAC_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_sto_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5651_STO_DAC_MIXER,
+                        RT5651_M_DAC_L1_MIXL_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5651_STO_DAC_MIXER,
+                        RT5651_M_DAC_L2_MIXL_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5651_STO_DAC_MIXER,
+                        RT5651_M_DAC_R1_MIXL_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_sto_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5651_STO_DAC_MIXER,
+                        RT5651_M_DAC_R1_MIXR_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5651_STO_DAC_MIXER,
+                        RT5651_M_DAC_R2_MIXR_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5651_STO_DAC_MIXER,
+                        RT5651_M_DAC_L1_MIXR_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_dd_dac_l_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5651_DD_MIXER,
+                        RT5651_M_STO_DD_L1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5651_DD_MIXER,
+                        RT5651_M_STO_DD_L2_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5651_DD_MIXER,
+                        RT5651_M_STO_DD_R2_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_dd_dac_r_mix[] = {
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5651_DD_MIXER,
+                        RT5651_M_STO_DD_R1_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R2 Switch", RT5651_DD_MIXER,
+                        RT5651_M_STO_DD_R2_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L2 Switch", RT5651_DD_MIXER,
+                        RT5651_M_STO_DD_L2_R_SFT, 1, 1),
+};
+
+/* Analog Input Mixer */
+static const struct snd_kcontrol_new rt5651_rec_l_mix[] = {
+        SOC_DAPM_SINGLE("INL1 Switch", RT5651_REC_L2_MIXER,
+                        RT5651_M_IN1_L_RM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST3 Switch", RT5651_REC_L2_MIXER,
+                        RT5651_M_BST3_RM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5651_REC_L2_MIXER,
+                        RT5651_M_BST2_RM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5651_REC_L2_MIXER,
+                        RT5651_M_BST1_RM_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_rec_r_mix[] = {
+        SOC_DAPM_SINGLE("INR1 Switch", RT5651_REC_R2_MIXER,
+                        RT5651_M_IN1_R_RM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST3 Switch", RT5651_REC_R2_MIXER,
+                        RT5651_M_BST3_RM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5651_REC_R2_MIXER,
+                        RT5651_M_BST2_RM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5651_REC_R2_MIXER,
+                        RT5651_M_BST1_RM_R_SFT, 1, 1),
+};
+
+/* Analog Output Mixer */
+
+static const struct snd_kcontrol_new rt5651_out_l_mix[] = {
+        SOC_DAPM_SINGLE("BST1 Switch", RT5651_OUT_L3_MIXER,
+                        RT5651_M_BST1_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST2 Switch", RT5651_OUT_L3_MIXER,
+                        RT5651_M_BST2_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INL1 Switch", RT5651_OUT_L3_MIXER,
+                        RT5651_M_IN1_L_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("REC MIXL Switch", RT5651_OUT_L3_MIXER,
+                        RT5651_M_RM_L_OM_L_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5651_OUT_L3_MIXER,
+                        RT5651_M_DAC_L1_OM_L_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_out_r_mix[] = {
+        SOC_DAPM_SINGLE("BST2 Switch", RT5651_OUT_R3_MIXER,
+                        RT5651_M_BST2_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("BST1 Switch", RT5651_OUT_R3_MIXER,
+                        RT5651_M_BST1_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("INR1 Switch", RT5651_OUT_R3_MIXER,
+                        RT5651_M_IN1_R_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("REC MIXR Switch", RT5651_OUT_R3_MIXER,
+                        RT5651_M_RM_R_OM_R_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5651_OUT_R3_MIXER,
+                        RT5651_M_DAC_R1_OM_R_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_hpo_mix[] = {
+        SOC_DAPM_SINGLE("HPO MIX DAC1 Switch", RT5651_HPO_MIXER,
+                        RT5651_M_DAC1_HM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("HPO MIX HPVOL Switch", RT5651_HPO_MIXER,
+                        RT5651_M_HPVOL_HM_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new rt5651_lout_mix[] = {
+        SOC_DAPM_SINGLE("DAC L1 Switch", RT5651_LOUT_MIXER,
+                        RT5651_M_DAC_L1_LM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("DAC R1 Switch", RT5651_LOUT_MIXER,
+                        RT5651_M_DAC_R1_LM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("OUTVOL L Switch", RT5651_LOUT_MIXER,
+                        RT5651_M_OV_L_LM_SFT, 1, 1),
+        SOC_DAPM_SINGLE("OUTVOL R Switch", RT5651_LOUT_MIXER,
+                        RT5651_M_OV_R_LM_SFT, 1, 1),
+};
+
+static const struct snd_kcontrol_new outvol_l_control =
+        SOC_DAPM_SINGLE("Switch", RT5651_LOUT_CTRL1,
+                        RT5651_VOL_L_SFT, 1, 1);
+
+static const struct snd_kcontrol_new outvol_r_control =
+        SOC_DAPM_SINGLE("Switch", RT5651_LOUT_CTRL1,
+                        RT5651_VOL_R_SFT, 1, 1);
+
+static const struct snd_kcontrol_new lout_l_mute_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5651_LOUT_CTRL1,
+                                    RT5651_L_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new lout_r_mute_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5651_LOUT_CTRL1,
+                                    RT5651_R_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new hpovol_l_control =
+        SOC_DAPM_SINGLE("Switch", RT5651_HP_VOL,
+                        RT5651_VOL_L_SFT, 1, 1);
+
+static const struct snd_kcontrol_new hpovol_r_control =
+        SOC_DAPM_SINGLE("Switch", RT5651_HP_VOL,
+                        RT5651_VOL_R_SFT, 1, 1);
+
+static const struct snd_kcontrol_new hpo_l_mute_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5651_HP_VOL,
+                                    RT5651_L_MUTE_SFT, 1, 1);
+
+static const struct snd_kcontrol_new hpo_r_mute_control =
+        SOC_DAPM_SINGLE_AUTODISABLE("Switch", RT5651_HP_VOL,
+                                    RT5651_R_MUTE_SFT, 1, 1);
+
+/* INL/R source */
+static const char * const rt5651_inl_src[] = {"IN2P", "HPOVOLLP"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_inl_enum, RT5651_INL1_INR1_VOL,
+        RT5651_INL_SEL_SFT, rt5651_inl_src);
+
+static const struct snd_kcontrol_new rt5651_inl1_mux =
+        SOC_DAPM_ENUM("INL1 source", rt5651_inl_enum);
+
+static const char * const rt5651_inr1_src[] = {"IN2N", "HPOVOLRP"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_inr1_enum, RT5651_INL1_INR1_VOL,
+        RT5651_INR_SEL_SFT, rt5651_inr1_src);
+
+static const struct snd_kcontrol_new rt5651_inr1_mux =
+        SOC_DAPM_ENUM("INR1 source", rt5651_inr1_enum);
+
+static const char * const rt5651_inl2_src[] = {"IN3P", "OUTVOLLP"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_inl2_enum, RT5651_INL2_INR2_VOL,
+        RT5651_INL_SEL_SFT, rt5651_inl2_src);
+
+static const struct snd_kcontrol_new rt5651_inl2_mux =
+        SOC_DAPM_ENUM("INL2 source", rt5651_inl2_enum);
+
+static const char * const rt5651_inr2_src[] = {"IN3N", "OUTVOLRP"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_inr2_enum, RT5651_INL2_INR2_VOL,
+        RT5651_INR_SEL_SFT, rt5651_inr2_src);
+
+static const struct snd_kcontrol_new rt5651_inr2_mux =
+        SOC_DAPM_ENUM("INR2 source", rt5651_inr2_enum);
+
+
+/* Stereo ADC source */
+static const char * const rt5651_stereo1_adc1_src[] = {"DD MIX", "ADC"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_stereo1_adc1_enum, RT5651_STO1_ADC_MIXER,
+        RT5651_STO1_ADC_1_SRC_SFT, rt5651_stereo1_adc1_src);
+
+static const struct snd_kcontrol_new rt5651_sto1_adc_l1_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC L1 source", rt5651_stereo1_adc1_enum);
+
+static const struct snd_kcontrol_new rt5651_sto1_adc_r1_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC R1 source", rt5651_stereo1_adc1_enum);
+
+static const char * const rt5651_stereo1_adc2_src[] = {"DMIC", "DD MIX"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_stereo1_adc2_enum, RT5651_STO1_ADC_MIXER,
+        RT5651_STO1_ADC_2_SRC_SFT, rt5651_stereo1_adc2_src);
+
+static const struct snd_kcontrol_new rt5651_sto1_adc_l2_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC L2 source", rt5651_stereo1_adc2_enum);
+
+static const struct snd_kcontrol_new rt5651_sto1_adc_r2_mux =
+        SOC_DAPM_ENUM("Stereo1 ADC R2 source", rt5651_stereo1_adc2_enum);
+
+/* Mono ADC source */
+static const char * const rt5651_sto2_adc_l1_src[] = {"DD MIXL", "ADCL"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_sto2_adc_l1_enum, RT5651_STO1_ADC_MIXER,
+        RT5651_STO2_ADC_L1_SRC_SFT, rt5651_sto2_adc_l1_src);
+
+static const struct snd_kcontrol_new rt5651_sto2_adc_l1_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC1 left source", rt5651_sto2_adc_l1_enum);
+
+static const char * const rt5651_sto2_adc_l2_src[] = {"DMIC L", "DD MIXL"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_sto2_adc_l2_enum, RT5651_STO1_ADC_MIXER,
+        RT5651_STO2_ADC_L2_SRC_SFT, rt5651_sto2_adc_l2_src);
+
+static const struct snd_kcontrol_new rt5651_sto2_adc_l2_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC2 left source", rt5651_sto2_adc_l2_enum);
+
+static const char * const rt5651_sto2_adc_r1_src[] = {"DD MIXR", "ADCR"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_sto2_adc_r1_enum, RT5651_STO1_ADC_MIXER,
+        RT5651_STO2_ADC_R1_SRC_SFT, rt5651_sto2_adc_r1_src);
+
+static const struct snd_kcontrol_new rt5651_sto2_adc_r1_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC1 right source", rt5651_sto2_adc_r1_enum);
+
+static const char * const rt5651_sto2_adc_r2_src[] = {"DMIC R", "DD MIXR"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_sto2_adc_r2_enum, RT5651_STO1_ADC_MIXER,
+        RT5651_STO2_ADC_R2_SRC_SFT, rt5651_sto2_adc_r2_src);
+
+static const struct snd_kcontrol_new rt5651_sto2_adc_r2_mux =
+        SOC_DAPM_ENUM("Stereo2 ADC2 right source", rt5651_sto2_adc_r2_enum);
+
+/* DAC2 channel source */
+
+static const char * const rt5651_dac_src[] = {"IF1", "IF2"};
+
+static SOC_ENUM_SINGLE_DECL(rt5651_dac_l2_enum, RT5651_DAC2_CTRL,
+                                RT5651_SEL_DAC_L2_SFT, rt5651_dac_src);
+
+static const struct snd_kcontrol_new rt5651_dac_l2_mux =
+        SOC_DAPM_ENUM("DAC2 left channel source", rt5651_dac_l2_enum);
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_dac_r2_enum, RT5651_DAC2_CTRL,
+        RT5651_SEL_DAC_R2_SFT, rt5651_dac_src);
+
+static const struct snd_kcontrol_new rt5651_dac_r2_mux =
+        SOC_DAPM_ENUM("DAC2 right channel source", rt5651_dac_r2_enum);
+
+/* IF2_ADC channel source */
+
+static const char * const rt5651_adc_src[] = {"IF1 ADC1", "IF1 ADC2"};
+
+static SOC_ENUM_SINGLE_DECL(rt5651_if2_adc_src_enum, RT5651_DIG_INF_DATA,
+                                RT5651_IF2_ADC_SRC_SFT, rt5651_adc_src);
+
+static const struct snd_kcontrol_new rt5651_if2_adc_src_mux =
+        SOC_DAPM_ENUM("IF2 ADC channel source", rt5651_if2_adc_src_enum);
+
+/* PDM select */
+static const char * const rt5651_pdm_sel[] = {"DD MIX", "Stereo DAC MIX"};
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_pdm_l_sel_enum, RT5651_PDM_CTL,
+        RT5651_PDM_L_SEL_SFT, rt5651_pdm_sel);
+
+static SOC_ENUM_SINGLE_DECL(
+        rt5651_pdm_r_sel_enum, RT5651_PDM_CTL,
+        RT5651_PDM_R_SEL_SFT, rt5651_pdm_sel);
+
+static const struct snd_kcontrol_new rt5651_pdm_l_mux =
+        SOC_DAPM_ENUM("PDM L select", rt5651_pdm_l_sel_enum);
+
+static const struct snd_kcontrol_new rt5651_pdm_r_mux =
+        SOC_DAPM_ENUM("PDM R select", rt5651_pdm_r_sel_enum);
+
+static int rt5651_amp_power_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                /* depop parameters */
+                regmap_update_bits(rt5651->regmap, RT5651_PR_BASE +
+                        RT5651_CHPUMP_INT_REG1, 0x0700, 0x0200);
+                regmap_update_bits(rt5651->regmap, RT5651_DEPOP_M2,
+                        RT5651_DEPOP_MASK, RT5651_DEPOP_MAN);
+                regmap_update_bits(rt5651->regmap, RT5651_DEPOP_M1,
+                        RT5651_HP_CP_MASK | RT5651_HP_SG_MASK |
+                        RT5651_HP_CB_MASK, RT5651_HP_CP_PU |
+                        RT5651_HP_SG_DIS | RT5651_HP_CB_PU);
+                regmap_write(rt5651->regmap, RT5651_PR_BASE +
+                                RT5651_HP_DCC_INT1, 0x9f00);
+                /* headphone amp power on */
+                regmap_update_bits(rt5651->regmap, RT5651_PWR_ANLG1,
+                        RT5651_PWR_FV1 | RT5651_PWR_FV2, 0);
+                regmap_update_bits(rt5651->regmap, RT5651_PWR_ANLG1,
+                        RT5651_PWR_HA,
+                        RT5651_PWR_HA);
+                usleep_range(10000, 15000);
+                regmap_update_bits(rt5651->regmap, RT5651_PWR_ANLG1,
+                        RT5651_PWR_FV1 | RT5651_PWR_FV2 ,
+                        RT5651_PWR_FV1 | RT5651_PWR_FV2);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt5651_hp_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                /* headphone unmute sequence */
+                regmap_update_bits(rt5651->regmap, RT5651_DEPOP_M2,
+                        RT5651_DEPOP_MASK | RT5651_DIG_DP_MASK,
+                        RT5651_DEPOP_AUTO | RT5651_DIG_DP_EN);
+                regmap_update_bits(rt5651->regmap, RT5651_CHARGE_PUMP,
+                        RT5651_PM_HP_MASK, RT5651_PM_HP_HV);
+
+                regmap_update_bits(rt5651->regmap, RT5651_DEPOP_M3,
+                        RT5651_CP_FQ1_MASK | RT5651_CP_FQ2_MASK |
+                        RT5651_CP_FQ3_MASK,
+                        (RT5651_CP_FQ_192_KHZ << RT5651_CP_FQ1_SFT) |
+                        (RT5651_CP_FQ_12_KHZ << RT5651_CP_FQ2_SFT) |
+                        (RT5651_CP_FQ_192_KHZ << RT5651_CP_FQ3_SFT));
+
+                regmap_write(rt5651->regmap, RT5651_PR_BASE +
+                        RT5651_MAMP_INT_REG2, 0x1c00);
+                regmap_update_bits(rt5651->regmap, RT5651_DEPOP_M1,
+                        RT5651_HP_CP_MASK | RT5651_HP_SG_MASK,
+                        RT5651_HP_CP_PD | RT5651_HP_SG_EN);
+                regmap_update_bits(rt5651->regmap, RT5651_PR_BASE +
+                        RT5651_CHPUMP_INT_REG1, 0x0700, 0x0400);
+                rt5651->hp_mute = 0;
+                break;
+
+        case SND_SOC_DAPM_PRE_PMD:
+                rt5651->hp_mute = 1;
+                usleep_range(70000, 75000);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt5651_hp_post_event(struct snd_soc_dapm_widget *w,
+                           struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                if (!rt5651->hp_mute)
+                        usleep_range(80000, 85000);
+
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt5651_bst1_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_update_bits(codec, RT5651_PWR_ANLG2,
+                        RT5651_PWR_BST1_OP2, RT5651_PWR_BST1_OP2);
+                break;
+
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_update_bits(codec, RT5651_PWR_ANLG2,
+                        RT5651_PWR_BST1_OP2, 0);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt5651_bst2_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_update_bits(codec, RT5651_PWR_ANLG2,
+                        RT5651_PWR_BST2_OP2, RT5651_PWR_BST2_OP2);
+                break;
+
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_update_bits(codec, RT5651_PWR_ANLG2,
+                        RT5651_PWR_BST2_OP2, 0);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static int rt5651_bst3_event(struct snd_soc_dapm_widget *w,
+        struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+
+        switch (event) {
+        case SND_SOC_DAPM_POST_PMU:
+                snd_soc_update_bits(codec, RT5651_PWR_ANLG2,
+                        RT5651_PWR_BST3_OP2, RT5651_PWR_BST3_OP2);
+                break;
+
+        case SND_SOC_DAPM_PRE_PMD:
+                snd_soc_update_bits(codec, RT5651_PWR_ANLG2,
+                        RT5651_PWR_BST3_OP2, 0);
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 0;
+}
+
+static const struct snd_soc_dapm_widget rt5651_dapm_widgets[] = {
+        /* ASRC */
+        SND_SOC_DAPM_SUPPLY_S("I2S1 ASRC", 1, RT5651_PLL_MODE_2,
+                              15, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("I2S2 ASRC", 1, RT5651_PLL_MODE_2,
+                              14, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("STO1 DAC ASRC", 1, RT5651_PLL_MODE_2,
+                              13, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("STO2 DAC ASRC", 1, RT5651_PLL_MODE_2,
+                              12, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY_S("ADC ASRC", 1, RT5651_PLL_MODE_2,
+                              11, 0, NULL, 0),
+
+        SND_SOC_DAPM_SUPPLY("PLL1", RT5651_PWR_ANLG2,
+                        RT5651_PWR_PLL_BIT, 0, NULL, 0),
+        /* Input Side */
+        /* micbias */
+        SND_SOC_DAPM_SUPPLY("LDO", RT5651_PWR_ANLG1,
+                        RT5651_PWR_LDO_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MICBIAS("micbias1", RT5651_PWR_ANLG2,
+                        RT5651_PWR_MB1_BIT, 0),
+        /* Input Lines */
+        SND_SOC_DAPM_INPUT("MIC1"),
+        SND_SOC_DAPM_INPUT("MIC2"),
+        SND_SOC_DAPM_INPUT("MIC3"),
+
+        SND_SOC_DAPM_INPUT("IN1P"),
+        SND_SOC_DAPM_INPUT("IN2P"),
+        SND_SOC_DAPM_INPUT("IN2N"),
+        SND_SOC_DAPM_INPUT("IN3P"),
+        SND_SOC_DAPM_INPUT("DMIC L1"),
+        SND_SOC_DAPM_INPUT("DMIC R1"),
+        SND_SOC_DAPM_SUPPLY("DMIC CLK", RT5651_DMIC, RT5651_DMIC_1_EN_SFT,
+                            0, set_dmic_clk, SND_SOC_DAPM_PRE_PMU),
+        /* Boost */
+        SND_SOC_DAPM_PGA_E("BST1", RT5651_PWR_ANLG2,
+                RT5651_PWR_BST1_BIT, 0, NULL, 0, rt5651_bst1_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_PGA_E("BST2", RT5651_PWR_ANLG2,
+                RT5651_PWR_BST2_BIT, 0, NULL, 0, rt5651_bst2_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_PGA_E("BST3", RT5651_PWR_ANLG2,
+                RT5651_PWR_BST3_BIT, 0, NULL, 0, rt5651_bst3_event,
+                SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        /* Input Volume */
+        SND_SOC_DAPM_PGA("INL1 VOL", RT5651_PWR_VOL,
+                         RT5651_PWR_IN1_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("INR1 VOL", RT5651_PWR_VOL,
+                         RT5651_PWR_IN1_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("INL2 VOL", RT5651_PWR_VOL,
+                         RT5651_PWR_IN2_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("INR2 VOL", RT5651_PWR_VOL,
+                         RT5651_PWR_IN2_R_BIT, 0, NULL, 0),
+        /* IN Mux */
+        SND_SOC_DAPM_MUX("INL1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl1_mux),
+        SND_SOC_DAPM_MUX("INR1 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr1_mux),
+        SND_SOC_DAPM_MUX("INL2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inl2_mux),
+        SND_SOC_DAPM_MUX("INR2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_inr2_mux),
+        /* REC Mixer */
+        SND_SOC_DAPM_MIXER("RECMIXL", RT5651_PWR_MIXER, RT5651_PWR_RM_L_BIT, 0,
+                           rt5651_rec_l_mix, ARRAY_SIZE(rt5651_rec_l_mix)),
+        SND_SOC_DAPM_MIXER("RECMIXR", RT5651_PWR_MIXER, RT5651_PWR_RM_R_BIT, 0,
+                           rt5651_rec_r_mix, ARRAY_SIZE(rt5651_rec_r_mix)),
+        /* ADCs */
+        SND_SOC_DAPM_ADC("ADC L", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_ADC("ADC R", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_SUPPLY("ADC L Power", RT5651_PWR_DIG1,
+                            RT5651_PWR_ADC_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("ADC R Power", RT5651_PWR_DIG1,
+                            RT5651_PWR_ADC_R_BIT, 0, NULL, 0),
+        /* ADC Mux */
+        SND_SOC_DAPM_MUX("Stereo1 ADC L2 Mux", SND_SOC_NOPM, 0, 0,
+                         &rt5651_sto1_adc_l2_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC R2 Mux", SND_SOC_NOPM, 0, 0,
+                         &rt5651_sto1_adc_r2_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC L1 Mux", SND_SOC_NOPM, 0, 0,
+                         &rt5651_sto1_adc_l1_mux),
+        SND_SOC_DAPM_MUX("Stereo1 ADC R1 Mux", SND_SOC_NOPM, 0, 0,
+                         &rt5651_sto1_adc_r1_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC L2 Mux", SND_SOC_NOPM, 0, 0,
+                         &rt5651_sto2_adc_l2_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC L1 Mux", SND_SOC_NOPM, 0, 0,
+                         &rt5651_sto2_adc_l1_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC R1 Mux", SND_SOC_NOPM, 0, 0,
+                         &rt5651_sto2_adc_r1_mux),
+        SND_SOC_DAPM_MUX("Stereo2 ADC R2 Mux", SND_SOC_NOPM, 0, 0,
+                         &rt5651_sto2_adc_r2_mux),
+        /* ADC Mixer */
+        SND_SOC_DAPM_SUPPLY("Stereo1 Filter", RT5651_PWR_DIG2,
+                            RT5651_PWR_ADC_STO1_F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Stereo2 Filter", RT5651_PWR_DIG2,
+                            RT5651_PWR_ADC_STO2_F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("Stereo1 ADC MIXL", SND_SOC_NOPM, 0, 0,
+                           rt5651_sto1_adc_l_mix,
+                           ARRAY_SIZE(rt5651_sto1_adc_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo1 ADC MIXR", SND_SOC_NOPM, 0, 0,
+                           rt5651_sto1_adc_r_mix,
+                           ARRAY_SIZE(rt5651_sto1_adc_r_mix)),
+        SND_SOC_DAPM_MIXER("Stereo2 ADC MIXL", SND_SOC_NOPM, 0, 0,
+                           rt5651_sto2_adc_l_mix,
+                           ARRAY_SIZE(rt5651_sto2_adc_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo2 ADC MIXR", SND_SOC_NOPM, 0, 0,
+                           rt5651_sto2_adc_r_mix,
+                           ARRAY_SIZE(rt5651_sto2_adc_r_mix)),
+
+        /* Digital Interface */
+        SND_SOC_DAPM_SUPPLY("I2S1", RT5651_PWR_DIG1,
+                            RT5651_PWR_I2S1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC1 L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC1 R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 ADC1", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC2 L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 DAC2 R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF1 ADC2", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("I2S2", RT5651_PWR_DIG1,
+                            RT5651_PWR_I2S2_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC L", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("IF2 DAC R", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_MUX("IF2 ADC", SND_SOC_NOPM, 0, 0,
+                         &rt5651_if2_adc_src_mux),
+
+        /* Digital Interface Select */
+
+        SND_SOC_DAPM_MUX("PDM L Mux", RT5651_PDM_CTL,
+                         RT5651_M_PDM_L_SFT, 1, &rt5651_pdm_l_mux),
+        SND_SOC_DAPM_MUX("PDM R Mux", RT5651_PDM_CTL,
+                         RT5651_M_PDM_R_SFT, 1, &rt5651_pdm_r_mux),
+        /* Audio Interface */
+        SND_SOC_DAPM_AIF_IN("AIF1RX", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF1TX", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_IN("AIF2RX", "AIF2 Playback", 0, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_AIF_OUT("AIF2TX", "AIF2 Capture", 0, SND_SOC_NOPM, 0, 0),
+
+        /* Audio DSP */
+        SND_SOC_DAPM_PGA("Audio DSP", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        /* Output Side */
+        /* DAC mixer before sound effect  */
+        SND_SOC_DAPM_MIXER("DAC MIXL", SND_SOC_NOPM, 0, 0,
+                           rt5651_dac_l_mix, ARRAY_SIZE(rt5651_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("DAC MIXR", SND_SOC_NOPM, 0, 0,
+                           rt5651_dac_r_mix, ARRAY_SIZE(rt5651_dac_r_mix)),
+
+        /* DAC2 channel Mux */
+        SND_SOC_DAPM_MUX("DAC L2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_dac_l2_mux),
+        SND_SOC_DAPM_MUX("DAC R2 Mux", SND_SOC_NOPM, 0, 0, &rt5651_dac_r2_mux),
+        SND_SOC_DAPM_PGA("DAC L2 Volume", SND_SOC_NOPM, 0, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("DAC R2 Volume", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+        SND_SOC_DAPM_SUPPLY("Stero1 DAC Power", RT5651_PWR_DIG2,
+                            RT5651_PWR_DAC_STO1_F_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("Stero2 DAC Power", RT5651_PWR_DIG2,
+                            RT5651_PWR_DAC_STO2_F_BIT, 0, NULL, 0),
+        /* DAC Mixer */
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXL", SND_SOC_NOPM, 0, 0,
+                           rt5651_sto_dac_l_mix,
+                           ARRAY_SIZE(rt5651_sto_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("Stereo DAC MIXR", SND_SOC_NOPM, 0, 0,
+                           rt5651_sto_dac_r_mix,
+                           ARRAY_SIZE(rt5651_sto_dac_r_mix)),
+        SND_SOC_DAPM_MIXER("DD MIXL", SND_SOC_NOPM, 0, 0,
+                           rt5651_dd_dac_l_mix,
+                           ARRAY_SIZE(rt5651_dd_dac_l_mix)),
+        SND_SOC_DAPM_MIXER("DD MIXR", SND_SOC_NOPM, 0, 0,
+                           rt5651_dd_dac_r_mix,
+                           ARRAY_SIZE(rt5651_dd_dac_r_mix)),
+
+        /* DACs */
+        SND_SOC_DAPM_DAC("DAC L1", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_DAC("DAC R1", NULL, SND_SOC_NOPM, 0, 0),
+        SND_SOC_DAPM_SUPPLY("DAC L1 Power", RT5651_PWR_DIG1,
+                            RT5651_PWR_DAC_L1_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("DAC R1 Power", RT5651_PWR_DIG1,
+                            RT5651_PWR_DAC_R1_BIT, 0, NULL, 0),
+        /* OUT Mixer */
+        SND_SOC_DAPM_MIXER("OUT MIXL", RT5651_PWR_MIXER, RT5651_PWR_OM_L_BIT,
+                           0, rt5651_out_l_mix, ARRAY_SIZE(rt5651_out_l_mix)),
+        SND_SOC_DAPM_MIXER("OUT MIXR", RT5651_PWR_MIXER, RT5651_PWR_OM_R_BIT,
+                           0, rt5651_out_r_mix, ARRAY_SIZE(rt5651_out_r_mix)),
+        /* Ouput Volume */
+        SND_SOC_DAPM_SWITCH("OUTVOL L", RT5651_PWR_VOL,
+                            RT5651_PWR_OV_L_BIT, 0, &outvol_l_control),
+        SND_SOC_DAPM_SWITCH("OUTVOL R", RT5651_PWR_VOL,
+                            RT5651_PWR_OV_R_BIT, 0, &outvol_r_control),
+        SND_SOC_DAPM_SWITCH("HPOVOL L", RT5651_PWR_VOL,
+                            RT5651_PWR_HV_L_BIT, 0, &hpovol_l_control),
+        SND_SOC_DAPM_SWITCH("HPOVOL R", RT5651_PWR_VOL,
+                            RT5651_PWR_HV_R_BIT, 0, &hpovol_r_control),
+        SND_SOC_DAPM_PGA("INL1", RT5651_PWR_VOL,
+                         RT5651_PWR_IN1_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("INR1", RT5651_PWR_VOL,
+                         RT5651_PWR_IN1_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("INL2", RT5651_PWR_VOL,
+                         RT5651_PWR_IN2_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("INR2", RT5651_PWR_VOL,
+                         RT5651_PWR_IN2_R_BIT, 0, NULL, 0),
+        /* HPO/LOUT/Mono Mixer */
+        SND_SOC_DAPM_MIXER("HPOL MIX", SND_SOC_NOPM, 0, 0,
+                           rt5651_hpo_mix, ARRAY_SIZE(rt5651_hpo_mix)),
+        SND_SOC_DAPM_MIXER("HPOR MIX", SND_SOC_NOPM, 0, 0,
+                           rt5651_hpo_mix, ARRAY_SIZE(rt5651_hpo_mix)),
+        SND_SOC_DAPM_SUPPLY("HP L Amp", RT5651_PWR_ANLG1,
+                            RT5651_PWR_HP_L_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_SUPPLY("HP R Amp", RT5651_PWR_ANLG1,
+                            RT5651_PWR_HP_R_BIT, 0, NULL, 0),
+        SND_SOC_DAPM_MIXER("LOUT MIX", RT5651_PWR_ANLG1, RT5651_PWR_LM_BIT, 0,
+                           rt5651_lout_mix, ARRAY_SIZE(rt5651_lout_mix)),
+
+        SND_SOC_DAPM_SUPPLY("Amp Power", RT5651_PWR_ANLG1,
+                            RT5651_PWR_HA_BIT, 0, rt5651_amp_power_event,
+                            SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_PGA_S("HP Amp", 1, SND_SOC_NOPM, 0, 0, rt5651_hp_event,
+                           SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
+        SND_SOC_DAPM_SWITCH("HPO L Playback", SND_SOC_NOPM, 0, 0,
+                            &hpo_l_mute_control),
+        SND_SOC_DAPM_SWITCH("HPO R Playback", SND_SOC_NOPM, 0, 0,
+                            &hpo_r_mute_control),
+        SND_SOC_DAPM_SWITCH("LOUT L Playback", SND_SOC_NOPM, 0, 0,
+                            &lout_l_mute_control),
+        SND_SOC_DAPM_SWITCH("LOUT R Playback", SND_SOC_NOPM, 0, 0,
+                            &lout_r_mute_control),
+        SND_SOC_DAPM_POST("HP Post", rt5651_hp_post_event),
+
+        /* Output Lines */
+        SND_SOC_DAPM_OUTPUT("HPOL"),
+        SND_SOC_DAPM_OUTPUT("HPOR"),
+        SND_SOC_DAPM_OUTPUT("LOUTL"),
+        SND_SOC_DAPM_OUTPUT("LOUTR"),
+        SND_SOC_DAPM_OUTPUT("PDML"),
+        SND_SOC_DAPM_OUTPUT("PDMR"),
+};
+
+static const struct snd_soc_dapm_route rt5651_dapm_routes[] = {
+        {"Stero1 DAC Power", NULL, "STO1 DAC ASRC"},
+        {"Stero2 DAC Power", NULL, "STO2 DAC ASRC"},
+        {"I2S1", NULL, "I2S1 ASRC"},
+        {"I2S2", NULL, "I2S2 ASRC"},
+
+        {"IN1P", NULL, "LDO"},
+        {"IN2P", NULL, "LDO"},
+        {"IN3P", NULL, "LDO"},
+
+        {"IN1P", NULL, "MIC1"},
+        {"IN2P", NULL, "MIC2"},
+        {"IN2N", NULL, "MIC2"},
+        {"IN3P", NULL, "MIC3"},
+
+        {"BST1", NULL, "IN1P"},
+        {"BST2", NULL, "IN2P"},
+        {"BST2", NULL, "IN2N"},
+        {"BST3", NULL, "IN3P"},
+
+        {"INL1 VOL", NULL, "IN2P"},
+        {"INR1 VOL", NULL, "IN2N"},
+
+        {"RECMIXL", "INL1 Switch", "INL1 VOL"},
+        {"RECMIXL", "BST3 Switch", "BST3"},
+        {"RECMIXL", "BST2 Switch", "BST2"},
+        {"RECMIXL", "BST1 Switch", "BST1"},
+
+        {"RECMIXR", "INR1 Switch", "INR1 VOL"},
+        {"RECMIXR", "BST3 Switch", "BST3"},
+        {"RECMIXR", "BST2 Switch", "BST2"},
+        {"RECMIXR", "BST1 Switch", "BST1"},
+
+        {"ADC L", NULL, "RECMIXL"},
+        {"ADC L", NULL, "ADC L Power"},
+        {"ADC R", NULL, "RECMIXR"},
+        {"ADC R", NULL, "ADC R Power"},
+
+        {"DMIC L1", NULL, "DMIC CLK"},
+        {"DMIC R1", NULL, "DMIC CLK"},
+
+        {"Stereo1 ADC L2 Mux", "DMIC", "DMIC L1"},
+        {"Stereo1 ADC L2 Mux", "DD MIX", "DD MIXL"},
+        {"Stereo1 ADC L1 Mux", "ADC", "ADC L"},
+        {"Stereo1 ADC L1 Mux", "DD MIX", "DD MIXL"},
+
+        {"Stereo1 ADC R1 Mux", "ADC", "ADC R"},
+        {"Stereo1 ADC R1 Mux", "DD MIX", "DD MIXR"},
+        {"Stereo1 ADC R2 Mux", "DMIC", "DMIC R1"},
+        {"Stereo1 ADC R2 Mux", "DD MIX", "DD MIXR"},
+
+        {"Stereo2 ADC L2 Mux", "DMIC L", "DMIC L1"},
+        {"Stereo2 ADC L2 Mux", "DD MIXL", "DD MIXL"},
+        {"Stereo2 ADC L1 Mux", "DD MIXL", "DD MIXL"},
+        {"Stereo2 ADC L1 Mux", "ADCL", "ADC L"},
+
+        {"Stereo2 ADC R1 Mux", "DD MIXR", "DD MIXR"},
+        {"Stereo2 ADC R1 Mux", "ADCR", "ADC R"},
+        {"Stereo2 ADC R2 Mux", "DMIC R", "DMIC R1"},
+        {"Stereo2 ADC R2 Mux", "DD MIXR", "DD MIXR"},
+
+        {"Stereo1 ADC MIXL", "ADC1 Switch", "Stereo1 ADC L1 Mux"},
+        {"Stereo1 ADC MIXL", "ADC2 Switch", "Stereo1 ADC L2 Mux"},
+        {"Stereo1 ADC MIXL", NULL, "Stereo1 Filter"},
+        {"Stereo1 Filter", NULL, "PLL1", is_sysclk_from_pll},
+        {"Stereo1 Filter", NULL, "ADC ASRC"},
+
+        {"Stereo1 ADC MIXR", "ADC1 Switch", "Stereo1 ADC R1 Mux"},
+        {"Stereo1 ADC MIXR", "ADC2 Switch", "Stereo1 ADC R2 Mux"},
+        {"Stereo1 ADC MIXR", NULL, "Stereo1 Filter"},
+
+        {"Stereo2 ADC MIXL", "ADC1 Switch", "Stereo2 ADC L1 Mux"},
+        {"Stereo2 ADC MIXL", "ADC2 Switch", "Stereo2 ADC L2 Mux"},
+        {"Stereo2 ADC MIXL", NULL, "Stereo2 Filter"},
+        {"Stereo2 Filter", NULL, "PLL1", is_sysclk_from_pll},
+        {"Stereo2 Filter", NULL, "ADC ASRC"},
+
+        {"Stereo2 ADC MIXR", "ADC1 Switch", "Stereo2 ADC R1 Mux"},
+        {"Stereo2 ADC MIXR", "ADC2 Switch", "Stereo2 ADC R2 Mux"},
+        {"Stereo2 ADC MIXR", NULL, "Stereo2 Filter"},
+
+        {"IF1 ADC2", NULL, "Stereo2 ADC MIXL"},
+        {"IF1 ADC2", NULL, "Stereo2 ADC MIXR"},
+        {"IF1 ADC1", NULL, "Stereo1 ADC MIXL"},
+        {"IF1 ADC1", NULL, "Stereo1 ADC MIXR"},
+
+        {"IF1 ADC1", NULL, "I2S1"},
+
+        {"IF2 ADC", "IF1 ADC1", "IF1 ADC1"},
+        {"IF2 ADC", "IF1 ADC2", "IF1 ADC2"},
+        {"IF2 ADC", NULL, "I2S2"},
+
+        {"AIF1TX", NULL, "IF1 ADC1"},
+        {"AIF1TX", NULL, "IF1 ADC2"},
+        {"AIF2TX", NULL, "IF2 ADC"},
+
+        {"IF1 DAC", NULL, "AIF1RX"},
+        {"IF1 DAC", NULL, "I2S1"},
+        {"IF2 DAC", NULL, "AIF2RX"},
+        {"IF2 DAC", NULL, "I2S2"},
+
+        {"IF1 DAC1 L", NULL, "IF1 DAC"},
+        {"IF1 DAC1 R", NULL, "IF1 DAC"},
+        {"IF1 DAC2 L", NULL, "IF1 DAC"},
+        {"IF1 DAC2 R", NULL, "IF1 DAC"},
+        {"IF2 DAC L", NULL, "IF2 DAC"},
+        {"IF2 DAC R", NULL, "IF2 DAC"},
+
+        {"DAC MIXL", "Stereo ADC Switch", "Stereo1 ADC MIXL"},
+        {"DAC MIXL", "INF1 Switch", "IF1 DAC1 L"},
+        {"DAC MIXR", "Stereo ADC Switch", "Stereo1 ADC MIXR"},
+        {"DAC MIXR", "INF1 Switch", "IF1 DAC1 R"},
+
+        {"Audio DSP", NULL, "DAC MIXL"},
+        {"Audio DSP", NULL, "DAC MIXR"},
+
+        {"DAC L2 Mux", "IF1", "IF1 DAC2 L"},
+        {"DAC L2 Mux", "IF2", "IF2 DAC L"},
+        {"DAC L2 Volume", NULL, "DAC L2 Mux"},
+
+        {"DAC R2 Mux", "IF1", "IF1 DAC2 R"},
+        {"DAC R2 Mux", "IF2", "IF2 DAC R"},
+        {"DAC R2 Volume", NULL, "DAC R2 Mux"},
+
+        {"Stereo DAC MIXL", "DAC L1 Switch", "Audio DSP"},
+        {"Stereo DAC MIXL", "DAC L2 Switch", "DAC L2 Volume"},
+        {"Stereo DAC MIXL", "DAC R1 Switch", "DAC MIXR"},
+        {"Stereo DAC MIXL", NULL, "Stero1 DAC Power"},
+        {"Stereo DAC MIXL", NULL, "Stero2 DAC Power"},
+        {"Stereo DAC MIXR", "DAC R1 Switch", "Audio DSP"},
+        {"Stereo DAC MIXR", "DAC R2 Switch", "DAC R2 Volume"},
+        {"Stereo DAC MIXR", "DAC L1 Switch", "DAC MIXL"},
+        {"Stereo DAC MIXR", NULL, "Stero1 DAC Power"},
+        {"Stereo DAC MIXR", NULL, "Stero2 DAC Power"},
+
+        {"PDM L Mux", "Stereo DAC MIX", "Stereo DAC MIXL"},
+        {"PDM L Mux", "DD MIX", "DAC MIXL"},
+        {"PDM R Mux", "Stereo DAC MIX", "Stereo DAC MIXR"},
+        {"PDM R Mux", "DD MIX", "DAC MIXR"},
+
+        {"DAC L1", NULL, "Stereo DAC MIXL"},
+        {"DAC L1", NULL, "PLL1", is_sysclk_from_pll},
+        {"DAC L1", NULL, "DAC L1 Power"},
+        {"DAC R1", NULL, "Stereo DAC MIXR"},
+        {"DAC R1", NULL, "PLL1", is_sysclk_from_pll},
+        {"DAC R1", NULL, "DAC R1 Power"},
+
+        {"DD MIXL", "DAC L1 Switch", "DAC MIXL"},
+        {"DD MIXL", "DAC L2 Switch", "DAC L2 Volume"},
+        {"DD MIXL", "DAC R2 Switch", "DAC R2 Volume"},
+        {"DD MIXL", NULL, "Stero2 DAC Power"},
+
+        {"DD MIXR", "DAC R1 Switch", "DAC MIXR"},
+        {"DD MIXR", "DAC R2 Switch", "DAC R2 Volume"},
+        {"DD MIXR", "DAC L2 Switch", "DAC L2 Volume"},
+        {"DD MIXR", NULL, "Stero2 DAC Power"},
+
+        {"OUT MIXL", "BST1 Switch", "BST1"},
+        {"OUT MIXL", "BST2 Switch", "BST2"},
+        {"OUT MIXL", "INL1 Switch", "INL1 VOL"},
+        {"OUT MIXL", "REC MIXL Switch", "RECMIXL"},
+        {"OUT MIXL", "DAC L1 Switch", "DAC L1"},
+
+        {"OUT MIXR", "BST2 Switch", "BST2"},
+        {"OUT MIXR", "BST1 Switch", "BST1"},
+        {"OUT MIXR", "INR1 Switch", "INR1 VOL"},
+        {"OUT MIXR", "REC MIXR Switch", "RECMIXR"},
+        {"OUT MIXR", "DAC R1 Switch", "DAC R1"},
+
+        {"HPOVOL L", "Switch", "OUT MIXL"},
+        {"HPOVOL R", "Switch", "OUT MIXR"},
+        {"OUTVOL L", "Switch", "OUT MIXL"},
+        {"OUTVOL R", "Switch", "OUT MIXR"},
+
+        {"HPOL MIX", "HPO MIX DAC1 Switch", "DAC L1"},
+        {"HPOL MIX", "HPO MIX HPVOL Switch", "HPOVOL L"},
+        {"HPOL MIX", NULL, "HP L Amp"},
+        {"HPOR MIX", "HPO MIX DAC1 Switch", "DAC R1"},
+        {"HPOR MIX", "HPO MIX HPVOL Switch", "HPOVOL R"},
+        {"HPOR MIX", NULL, "HP R Amp"},
+
+        {"LOUT MIX", "DAC L1 Switch", "DAC L1"},
+        {"LOUT MIX", "DAC R1 Switch", "DAC R1"},
+        {"LOUT MIX", "OUTVOL L Switch", "OUTVOL L"},
+        {"LOUT MIX", "OUTVOL R Switch", "OUTVOL R"},
+
+        {"HP Amp", NULL, "HPOL MIX"},
+        {"HP Amp", NULL, "HPOR MIX"},
+        {"HP Amp", NULL, "Amp Power"},
+        {"HPO L Playback", "Switch", "HP Amp"},
+        {"HPO R Playback", "Switch", "HP Amp"},
+        {"HPOL", NULL, "HPO L Playback"},
+        {"HPOR", NULL, "HPO R Playback"},
+
+        {"LOUT L Playback", "Switch", "LOUT MIX"},
+        {"LOUT R Playback", "Switch", "LOUT MIX"},
+        {"LOUTL", NULL, "LOUT L Playback"},
+        {"LOUTL", NULL, "Amp Power"},
+        {"LOUTR", NULL, "LOUT R Playback"},
+        {"LOUTR", NULL, "Amp Power"},
+
+        {"PDML", NULL, "PDM L Mux"},
+        {"PDMR", NULL, "PDM R Mux"},
+};
+
+static int get_clk_info(int sclk, int rate)
+{
+        int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};
+
+        if (sclk <= 0 || rate <= 0)
+                return -EINVAL;
+
+        rate = rate << 8;
+        for (i = 0; i < ARRAY_SIZE(pd); i++)
+                if (sclk == rate * pd[i])
+                        return i;
+
+        return -EINVAL;
+}
+
+static int rt5651_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 rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+        unsigned int val_len = 0, val_clk, mask_clk;
+        int pre_div, bclk_ms, frame_size;
+
+        rt5651->lrck[dai->id] = params_rate(params);
+        pre_div = get_clk_info(rt5651->sysclk, rt5651->lrck[dai->id]);
+
+        if (pre_div < 0) {
+                dev_err(codec->dev, "Unsupported clock setting\n");
+                return -EINVAL;
+        }
+        frame_size = snd_soc_params_to_frame_size(params);
+        if (frame_size < 0) {
+                dev_err(codec->dev, "Unsupported frame size: %d\n", frame_size);
+                return -EINVAL;
+        }
+        bclk_ms = frame_size > 32 ? 1 : 0;
+        rt5651->bclk[dai->id] = rt5651->lrck[dai->id] * (32 << bclk_ms);
+
+        dev_dbg(dai->dev, "bclk is %dHz and lrck is %dHz\n",
+                rt5651->bclk[dai->id], rt5651->lrck[dai->id]);
+        dev_dbg(dai->dev, "bclk_ms is %d and pre_div is %d for iis %d\n",
+                                bclk_ms, pre_div, dai->id);
+
+        switch (params_format(params)) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                break;
+        case SNDRV_PCM_FORMAT_S20_3LE:
+                val_len |= RT5651_I2S_DL_20;
+                break;
+        case SNDRV_PCM_FORMAT_S24_LE:
+                val_len |= RT5651_I2S_DL_24;
+                break;
+        case SNDRV_PCM_FORMAT_S8:
+                val_len |= RT5651_I2S_DL_8;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (dai->id) {
+        case RT5651_AIF1:
+                mask_clk = RT5651_I2S_PD1_MASK;
+                val_clk = pre_div << RT5651_I2S_PD1_SFT;
+                snd_soc_update_bits(codec, RT5651_I2S1_SDP,
+                        RT5651_I2S_DL_MASK, val_len);
+                snd_soc_update_bits(codec, RT5651_ADDA_CLK1, mask_clk, val_clk);
+                break;
+        case RT5651_AIF2:
+                mask_clk = RT5651_I2S_BCLK_MS2_MASK | RT5651_I2S_PD2_MASK;
+                val_clk = pre_div << RT5651_I2S_PD2_SFT;
+                snd_soc_update_bits(codec, RT5651_I2S2_SDP,
+                        RT5651_I2S_DL_MASK, val_len);
+                snd_soc_update_bits(codec, RT5651_ADDA_CLK1, mask_clk, val_clk);
+                break;
+        default:
+                dev_err(codec->dev, "Wrong dai->id: %d\n", dai->id);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int rt5651_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+        unsigned int reg_val = 0;
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBM_CFM:
+                rt5651->master[dai->id] = 1;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFS:
+                reg_val |= RT5651_I2S_MS_S;
+                rt5651->master[dai->id] = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                break;
+        case SND_SOC_DAIFMT_IB_NF:
+                reg_val |= RT5651_I2S_BP_INV;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+                break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                reg_val |= RT5651_I2S_DF_LEFT;
+                break;
+        case SND_SOC_DAIFMT_DSP_A:
+                reg_val |= RT5651_I2S_DF_PCM_A;
+                break;
+        case SND_SOC_DAIFMT_DSP_B:
+                reg_val |= RT5651_I2S_DF_PCM_B;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (dai->id) {
+        case RT5651_AIF1:
+                snd_soc_update_bits(codec, RT5651_I2S1_SDP,
+                        RT5651_I2S_MS_MASK | RT5651_I2S_BP_MASK |
+                        RT5651_I2S_DF_MASK, reg_val);
+                break;
+        case RT5651_AIF2:
+                snd_soc_update_bits(codec, RT5651_I2S2_SDP,
+                        RT5651_I2S_MS_MASK | RT5651_I2S_BP_MASK |
+                        RT5651_I2S_DF_MASK, reg_val);
+                break;
+        default:
+                dev_err(codec->dev, "Wrong dai->id: %d\n", dai->id);
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static int rt5651_set_dai_sysclk(struct snd_soc_dai *dai,
+                int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+        unsigned int reg_val = 0;
+
+        if (freq == rt5651->sysclk && clk_id == rt5651->sysclk_src)
+                return 0;
+
+        switch (clk_id) {
+        case RT5651_SCLK_S_MCLK:
+                reg_val |= RT5651_SCLK_SRC_MCLK;
+                break;
+        case RT5651_SCLK_S_PLL1:
+                reg_val |= RT5651_SCLK_SRC_PLL1;
+                break;
+        case RT5651_SCLK_S_RCCLK:
+                reg_val |= RT5651_SCLK_SRC_RCCLK;
+                break;
+        default:
+                dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id);
+                return -EINVAL;
+        }
+        snd_soc_update_bits(codec, RT5651_GLB_CLK,
+                RT5651_SCLK_SRC_MASK, reg_val);
+        rt5651->sysclk = freq;
+        rt5651->sysclk_src = clk_id;
+
+        dev_dbg(dai->dev, "Sysclk is %dHz and clock id is %d\n", freq, clk_id);
+
+        return 0;
+}
+
+/**
+ * rt5651_pll_calc - Calcualte PLL M/N/K code.
+ * @freq_in: external clock provided to codec.
+ * @freq_out: target clock which codec works on.
+ * @pll_code: Pointer to structure with M, N, K and bypass flag.
+ *
+ * Calcualte M/N/K code to configure PLL for codec. And K is assigned to 2
+ * which make calculation more efficiently.
+ *
+ * Returns 0 for success or negative error code.
+ */
+static int rt5651_pll_calc(const unsigned int freq_in,
+        const unsigned int freq_out, struct rt5651_pll_code *pll_code)
+{
+        int max_n = RT5651_PLL_N_MAX, max_m = RT5651_PLL_M_MAX;
+        int n = 0, m = 0, red, n_t, m_t, in_t, out_t;
+        int red_t = abs(freq_out - freq_in);
+        bool bypass = false;
+
+        if (RT5651_PLL_INP_MAX < freq_in || RT5651_PLL_INP_MIN > freq_in)
+                return -EINVAL;
+
+        for (n_t = 0; n_t <= max_n; n_t++) {
+                in_t = (freq_in >> 1) + (freq_in >> 2) * n_t;
+                if (in_t < 0)
+                        continue;
+                if (in_t == freq_out) {
+                        bypass = true;
+                        n = n_t;
+                        goto code_find;
+                }
+                for (m_t = 0; m_t <= max_m; m_t++) {
+                        out_t = in_t / (m_t + 2);
+                        red = abs(out_t - freq_out);
+                        if (red < red_t) {
+                                n = n_t;
+                                m = m_t;
+                                if (red == 0)
+                                        goto code_find;
+                                red_t = red;
+                        }
+                }
+        }
+        pr_debug("Only get approximation about PLL\n");
+
+code_find:
+        pll_code->m_bp = bypass;
+        pll_code->m_code = m;
+        pll_code->n_code = n;
+        pll_code->k_code = 2;
+        return 0;
+}
+
+static int rt5651_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source,
+                        unsigned int freq_in, unsigned int freq_out)
+{
+        struct snd_soc_codec *codec = dai->codec;
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+        struct rt5651_pll_code *pll_code = &rt5651->pll_code;
+        int ret;
+
+        if (source == rt5651->pll_src && freq_in == rt5651->pll_in &&
+            freq_out == rt5651->pll_out)
+                return 0;
+
+        if (!freq_in || !freq_out) {
+                dev_dbg(codec->dev, "PLL disabled\n");
+
+                rt5651->pll_in = 0;
+                rt5651->pll_out = 0;
+                snd_soc_update_bits(codec, RT5651_GLB_CLK,
+                        RT5651_SCLK_SRC_MASK, RT5651_SCLK_SRC_MCLK);
+                return 0;
+        }
+
+        switch (source) {
+        case RT5651_PLL1_S_MCLK:
+                snd_soc_update_bits(codec, RT5651_GLB_CLK,
+                        RT5651_PLL1_SRC_MASK, RT5651_PLL1_SRC_MCLK);
+                break;
+        case RT5651_PLL1_S_BCLK1:
+                snd_soc_update_bits(codec, RT5651_GLB_CLK,
+                                RT5651_PLL1_SRC_MASK, RT5651_PLL1_SRC_BCLK1);
+                break;
+        case RT5651_PLL1_S_BCLK2:
+                        snd_soc_update_bits(codec, RT5651_GLB_CLK,
+                                RT5651_PLL1_SRC_MASK, RT5651_PLL1_SRC_BCLK2);
+                break;
+        default:
+                dev_err(codec->dev, "Unknown PLL source %d\n", source);
+                return -EINVAL;
+        }
+
+        ret = rt5651_pll_calc(freq_in, freq_out, pll_code);
+        if (ret < 0) {
+                dev_err(codec->dev, "Unsupport input clock %d\n", freq_in);
+                return ret;
+        }
+
+        dev_dbg(codec->dev, "bypass=%d m=%d n=%d k=2\n", pll_code->m_bp,
+                (pll_code->m_bp ? 0 : pll_code->m_code), pll_code->n_code);
+
+        snd_soc_write(codec, RT5651_PLL_CTRL1,
+                pll_code->n_code << RT5651_PLL_N_SFT | pll_code->k_code);
+        snd_soc_write(codec, RT5651_PLL_CTRL2,
+                (pll_code->m_bp ? 0 : pll_code->m_code) << RT5651_PLL_M_SFT |
+                pll_code->m_bp << RT5651_PLL_M_BP_SFT);
+
+        rt5651->pll_in = freq_in;
+        rt5651->pll_out = freq_out;
+        rt5651->pll_src = source;
+
+        return 0;
+}
+
+static int rt5651_set_bias_level(struct snd_soc_codec *codec,
+                        enum snd_soc_bias_level level)
+{
+        switch (level) {
+        case SND_SOC_BIAS_PREPARE:
+                if (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) {
+                        snd_soc_update_bits(codec, RT5651_PWR_ANLG1,
+                                RT5651_PWR_VREF1 | RT5651_PWR_MB |
+                                RT5651_PWR_BG | RT5651_PWR_VREF2,
+                                RT5651_PWR_VREF1 | RT5651_PWR_MB |
+                                RT5651_PWR_BG | RT5651_PWR_VREF2);
+                        usleep_range(10000, 15000);
+                        snd_soc_update_bits(codec, RT5651_PWR_ANLG1,
+                                RT5651_PWR_FV1 | RT5651_PWR_FV2,
+                                RT5651_PWR_FV1 | RT5651_PWR_FV2);
+                        snd_soc_update_bits(codec, RT5651_PWR_ANLG1,
+                                RT5651_PWR_LDO_DVO_MASK,
+                                RT5651_PWR_LDO_DVO_1_2V);
+                        snd_soc_update_bits(codec, RT5651_D_MISC, 0x1, 0x1);
+                        if (snd_soc_read(codec, RT5651_PLL_MODE_1) & 0x9200)
+                                snd_soc_update_bits(codec, RT5651_D_MISC,
+                                                    0xc00, 0xc00);
+                }
+                break;
+
+        case SND_SOC_BIAS_STANDBY:
+                snd_soc_write(codec, RT5651_D_MISC, 0x0010);
+                snd_soc_write(codec, RT5651_PWR_DIG1, 0x0000);
+                snd_soc_write(codec, RT5651_PWR_DIG2, 0x0000);
+                snd_soc_write(codec, RT5651_PWR_VOL, 0x0000);
+                snd_soc_write(codec, RT5651_PWR_MIXER, 0x0000);
+                snd_soc_write(codec, RT5651_PWR_ANLG1, 0x0000);
+                snd_soc_write(codec, RT5651_PWR_ANLG2, 0x0000);
+                break;
+
+        default:
+                break;
+        }
+        codec->dapm.bias_level = level;
+
+        return 0;
+}
+
+static int rt5651_probe(struct snd_soc_codec *codec)
+{
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+
+        rt5651->codec = codec;
+
+        snd_soc_update_bits(codec, RT5651_PWR_ANLG1,
+                RT5651_PWR_VREF1 | RT5651_PWR_MB |
+                RT5651_PWR_BG | RT5651_PWR_VREF2,
+                RT5651_PWR_VREF1 | RT5651_PWR_MB |
+                RT5651_PWR_BG | RT5651_PWR_VREF2);
+        usleep_range(10000, 15000);
+        snd_soc_update_bits(codec, RT5651_PWR_ANLG1,
+                RT5651_PWR_FV1 | RT5651_PWR_FV2,
+                RT5651_PWR_FV1 | RT5651_PWR_FV2);
+
+        rt5651_set_bias_level(codec, SND_SOC_BIAS_OFF);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int rt5651_suspend(struct snd_soc_codec *codec)
+{
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+
+        regcache_cache_only(rt5651->regmap, true);
+        regcache_mark_dirty(rt5651->regmap);
+        return 0;
+}
+
+static int rt5651_resume(struct snd_soc_codec *codec)
+{
+        struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);
+
+        regcache_cache_only(rt5651->regmap, false);
+        snd_soc_cache_sync(codec);
+
+        return 0;
+}
+#else
+#define rt5651_suspend NULL
+#define rt5651_resume NULL
+#endif
+
+#define RT5651_STEREO_RATES SNDRV_PCM_RATE_8000_96000
+#define RT5651_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
+                        SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8)
+
+static const struct snd_soc_dai_ops rt5651_aif_dai_ops = {
+        .hw_params = rt5651_hw_params,
+        .set_fmt = rt5651_set_dai_fmt,
+        .set_sysclk = rt5651_set_dai_sysclk,
+        .set_pll = rt5651_set_dai_pll,
+};
+
+static struct snd_soc_dai_driver rt5651_dai[] = {
+        {
+                .name = "rt5651-aif1",
+                .id = RT5651_AIF1,
+                .playback = {
+                        .stream_name = "AIF1 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5651_STEREO_RATES,
+                        .formats = RT5651_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF1 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5651_STEREO_RATES,
+                        .formats = RT5651_FORMATS,
+                },
+                .ops = &rt5651_aif_dai_ops,
+        },
+        {
+                .name = "rt5651-aif2",
+                .id = RT5651_AIF2,
+                .playback = {
+                        .stream_name = "AIF2 Playback",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5651_STEREO_RATES,
+                        .formats = RT5651_FORMATS,
+                },
+                .capture = {
+                        .stream_name = "AIF2 Capture",
+                        .channels_min = 1,
+                        .channels_max = 2,
+                        .rates = RT5651_STEREO_RATES,
+                        .formats = RT5651_FORMATS,
+                },
+                .ops = &rt5651_aif_dai_ops,
+        },
+};
+
+static struct snd_soc_codec_driver soc_codec_dev_rt5651 = {
+        .probe = rt5651_probe,
+        .suspend = rt5651_suspend,
+        .resume = rt5651_resume,
+        .set_bias_level = rt5651_set_bias_level,
+        .idle_bias_off = true,
+        .controls = rt5651_snd_controls,
+        .num_controls = ARRAY_SIZE(rt5651_snd_controls),
+        .dapm_widgets = rt5651_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(rt5651_dapm_widgets),
+        .dapm_routes = rt5651_dapm_routes,
+        .num_dapm_routes = ARRAY_SIZE(rt5651_dapm_routes),
+};
+
+static const struct regmap_config rt5651_regmap = {
+        .reg_bits = 8,
+        .val_bits = 16,
+
+        .max_register = RT5651_DEVICE_ID + 1 + (ARRAY_SIZE(rt5651_ranges) *
+                                               RT5651_PR_SPACING),
+        .volatile_reg = rt5651_volatile_register,
+        .readable_reg = rt5651_readable_register,
+
+        .cache_type = REGCACHE_RBTREE,
+        .reg_defaults = rt5651_reg,
+        .num_reg_defaults = ARRAY_SIZE(rt5651_reg),
+        .ranges = rt5651_ranges,
+        .num_ranges = ARRAY_SIZE(rt5651_ranges),
+};
+
+static const struct i2c_device_id rt5651_i2c_id[] = {
+        { "rt5651", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, rt5651_i2c_id);
+
+static int rt5651_i2c_probe(struct i2c_client *i2c,
+                    const struct i2c_device_id *id)
+{
+        struct rt5651_platform_data *pdata = dev_get_platdata(&i2c->dev);
+        struct rt5651_priv *rt5651;
+        int ret;
+
+        rt5651 = devm_kzalloc(&i2c->dev, sizeof(*rt5651),
+                                GFP_KERNEL);
+        if (NULL == rt5651)
+                return -ENOMEM;
+
+        i2c_set_clientdata(i2c, rt5651);
+
+        if (pdata)
+                rt5651->pdata = *pdata;
+
+        rt5651->regmap = devm_regmap_init_i2c(i2c, &rt5651_regmap);
+        if (IS_ERR(rt5651->regmap)) {
+                ret = PTR_ERR(rt5651->regmap);
+                dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
+                        ret);
+                return ret;
+        }
+
+        regmap_read(rt5651->regmap, RT5651_DEVICE_ID, &ret);
+        if (ret != RT5651_DEVICE_ID_VALUE) {
+                dev_err(&i2c->dev,
+                        "Device with ID register %x is not rt5651\n", ret);
+                return -ENODEV;
+        }
+
+        regmap_write(rt5651->regmap, RT5651_RESET, 0);
+
+        ret = regmap_register_patch(rt5651->regmap, init_list,
+                                    ARRAY_SIZE(init_list));
+        if (ret != 0)
+                dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret);
+
+        if (rt5651->pdata.in2_diff)
+                regmap_update_bits(rt5651->regmap, RT5651_IN1_IN2,
+                                        RT5651_IN_DF2, RT5651_IN_DF2);
+
+        if (rt5651->pdata.dmic_en)
+                regmap_update_bits(rt5651->regmap, RT5651_GPIO_CTRL1,
+                                RT5651_GP2_PIN_MASK, RT5651_GP2_PIN_DMIC1_SCL);
+
+        rt5651->hp_mute = 1;
+
+        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5651,
+                                rt5651_dai, ARRAY_SIZE(rt5651_dai));
+
+        return ret;
+}
+
+static int rt5651_i2c_remove(struct i2c_client *i2c)
+{
+        snd_soc_unregister_codec(&i2c->dev);
+
+        return 0;
+}
+
+static struct i2c_driver rt5651_i2c_driver = {
+        .driver = {
+                .name = "rt5651",
+                .owner = THIS_MODULE,
+        },
+        .probe = rt5651_i2c_probe,
+        .remove   = rt5651_i2c_remove,
+        .id_table = rt5651_i2c_id,
+};
+module_i2c_driver(rt5651_i2c_driver);
+
+MODULE_DESCRIPTION("ASoC RT5651 driver");
+MODULE_AUTHOR("Bard Liao <bardliao@realtek.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/rt5651.h b/sound/soc/codecs/rt5651.h
new file mode 100644
index 000000000000..a28bd0c3d613
--- /dev/null
+++ b/sound/soc/codecs/rt5651.h
@@ -0,0 +1,2081 @@
+/*
+ * rt5651.h  --  RT5651 ALSA SoC audio driver
+ *
+ * Copyright 2011 Realtek Microelectronics
+ * Author: Johnny Hsu <johnnyhsu@realtek.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.
+ */
+
+#ifndef __RT5651_H__
+#define __RT5651_H__
+
+#include <sound/rt5651.h>
+
+/* Info */
+#define RT5651_RESET                            0x00
+#define RT5651_VERSION_ID                       0xfd
+#define RT5651_VENDOR_ID                        0xfe
+#define RT5651_DEVICE_ID                        0xff
+/*  I/O - Output */
+#define RT5651_HP_VOL                           0x02
+#define RT5651_LOUT_CTRL1                       0x03
+#define RT5651_LOUT_CTRL2                       0x05
+/* I/O - Input */
+#define RT5651_IN1_IN2                          0x0d
+#define RT5651_IN3                              0x0e
+#define RT5651_INL1_INR1_VOL                    0x0f
+#define RT5651_INL2_INR2_VOL                    0x10
+/* I/O - ADC/DAC/DMIC */
+#define RT5651_DAC1_DIG_VOL                     0x19
+#define RT5651_DAC2_DIG_VOL                     0x1a
+#define RT5651_DAC2_CTRL                        0x1b
+#define RT5651_ADC_DIG_VOL                      0x1c
+#define RT5651_ADC_DATA                         0x1d
+#define RT5651_ADC_BST_VOL                      0x1e
+/* Mixer - D-D */
+#define RT5651_STO1_ADC_MIXER                   0x27
+#define RT5651_STO2_ADC_MIXER                   0x28
+#define RT5651_AD_DA_MIXER                      0x29
+#define RT5651_STO_DAC_MIXER                    0x2a
+#define RT5651_DD_MIXER                         0x2b
+#define RT5651_DIG_INF_DATA                     0x2f
+/* PDM */
+#define RT5651_PDM_CTL                          0x30
+#define RT5651_PDM_I2C_CTL1                     0x31
+#define RT5651_PDM_I2C_CTL2                     0x32
+#define RT5651_PDM_I2C_DATA_W                   0x33
+#define RT5651_PDM_I2C_DATA_R                   0x34
+/* Mixer - ADC */
+#define RT5651_REC_L1_MIXER                     0x3b
+#define RT5651_REC_L2_MIXER                     0x3c
+#define RT5651_REC_R1_MIXER                     0x3d
+#define RT5651_REC_R2_MIXER                     0x3e
+/* Mixer - DAC */
+#define RT5651_HPO_MIXER                        0x45
+#define RT5651_OUT_L1_MIXER                     0x4d
+#define RT5651_OUT_L2_MIXER                     0x4e
+#define RT5651_OUT_L3_MIXER                     0x4f
+#define RT5651_OUT_R1_MIXER                     0x50
+#define RT5651_OUT_R2_MIXER                     0x51
+#define RT5651_OUT_R3_MIXER                     0x52
+#define RT5651_LOUT_MIXER                       0x53
+/* Power */
+#define RT5651_PWR_DIG1                         0x61
+#define RT5651_PWR_DIG2                         0x62
+#define RT5651_PWR_ANLG1                        0x63
+#define RT5651_PWR_ANLG2                        0x64
+#define RT5651_PWR_MIXER                        0x65
+#define RT5651_PWR_VOL                          0x66
+/* Private Register Control */
+#define RT5651_PRIV_INDEX                       0x6a
+#define RT5651_PRIV_DATA                        0x6c
+/* Format - ADC/DAC */
+#define RT5651_I2S1_SDP                         0x70
+#define RT5651_I2S2_SDP                         0x71
+#define RT5651_ADDA_CLK1                        0x73
+#define RT5651_ADDA_CLK2                        0x74
+#define RT5651_DMIC                             0x75
+/* TDM Control */
+#define RT5651_TDM_CTL_1                        0x77
+#define RT5651_TDM_CTL_2                        0x78
+#define RT5651_TDM_CTL_3                        0x79
+/* Function - Analog */
+#define RT5651_GLB_CLK                          0x80
+#define RT5651_PLL_CTRL1                        0x81
+#define RT5651_PLL_CTRL2                        0x82
+#define RT5651_PLL_MODE_1                       0x83
+#define RT5651_PLL_MODE_2                       0x84
+#define RT5651_PLL_MODE_3                       0x85
+#define RT5651_PLL_MODE_4                       0x86
+#define RT5651_PLL_MODE_5                       0x87
+#define RT5651_PLL_MODE_6                       0x89
+#define RT5651_PLL_MODE_7                       0x8a
+#define RT5651_DEPOP_M1                         0x8e
+#define RT5651_DEPOP_M2                         0x8f
+#define RT5651_DEPOP_M3                         0x90
+#define RT5651_CHARGE_PUMP                      0x91
+#define RT5651_MICBIAS                          0x93
+#define RT5651_A_JD_CTL1                        0x94
+/* Function - Digital */
+#define RT5651_EQ_CTRL1                         0xb0
+#define RT5651_EQ_CTRL2                         0xb1
+#define RT5651_ALC_1                            0xb4
+#define RT5651_ALC_2                            0xb5
+#define RT5651_ALC_3                            0xb6
+#define RT5651_JD_CTRL1                         0xbb
+#define RT5651_JD_CTRL2                         0xbc
+#define RT5651_IRQ_CTRL1                        0xbd
+#define RT5651_IRQ_CTRL2                        0xbe
+#define RT5651_INT_IRQ_ST                       0xbf
+#define RT5651_GPIO_CTRL1                       0xc0
+#define RT5651_GPIO_CTRL2                       0xc1
+#define RT5651_GPIO_CTRL3                       0xc2
+#define RT5651_PGM_REG_ARR1                     0xc8
+#define RT5651_PGM_REG_ARR2                     0xc9
+#define RT5651_PGM_REG_ARR3                     0xca
+#define RT5651_PGM_REG_ARR4                     0xcb
+#define RT5651_PGM_REG_ARR5                     0xcc
+#define RT5651_SCB_FUNC                         0xcd
+#define RT5651_SCB_CTRL                         0xce
+#define RT5651_BASE_BACK                        0xcf
+#define RT5651_MP3_PLUS1                        0xd0
+#define RT5651_MP3_PLUS2                        0xd1
+#define RT5651_ADJ_HPF_CTRL1                    0xd3
+#define RT5651_ADJ_HPF_CTRL2                    0xd4
+#define RT5651_HP_CALIB_AMP_DET                 0xd6
+#define RT5651_HP_CALIB2                        0xd7
+#define RT5651_SV_ZCD1                          0xd9
+#define RT5651_SV_ZCD2                          0xda
+#define RT5651_D_MISC                           0xfa
+/* Dummy Register */
+#define RT5651_DUMMY2                           0xfb
+#define RT5651_DUMMY3                           0xfc
+
+
+/* Index of Codec Private Register definition */
+#define RT5651_BIAS_CUR1                        0x12
+#define RT5651_BIAS_CUR3                        0x14
+#define RT5651_CLSD_INT_REG1                    0x1c
+#define RT5651_CHPUMP_INT_REG1                  0x24
+#define RT5651_MAMP_INT_REG2                    0x37
+#define RT5651_CHOP_DAC_ADC                     0x3d
+#define RT5651_3D_SPK                           0x63
+#define RT5651_WND_1                            0x6c
+#define RT5651_WND_2                            0x6d
+#define RT5651_WND_3                            0x6e
+#define RT5651_WND_4                            0x6f
+#define RT5651_WND_5                            0x70
+#define RT5651_WND_8                            0x73
+#define RT5651_DIP_SPK_INF                      0x75
+#define RT5651_HP_DCC_INT1                      0x77
+#define RT5651_EQ_BW_LOP                        0xa0
+#define RT5651_EQ_GN_LOP                        0xa1
+#define RT5651_EQ_FC_BP1                        0xa2
+#define RT5651_EQ_BW_BP1                        0xa3
+#define RT5651_EQ_GN_BP1                        0xa4
+#define RT5651_EQ_FC_BP2                        0xa5
+#define RT5651_EQ_BW_BP2                        0xa6
+#define RT5651_EQ_GN_BP2                        0xa7
+#define RT5651_EQ_FC_BP3                        0xa8
+#define RT5651_EQ_BW_BP3                        0xa9
+#define RT5651_EQ_GN_BP3                        0xaa
+#define RT5651_EQ_FC_BP4                        0xab
+#define RT5651_EQ_BW_BP4                        0xac
+#define RT5651_EQ_GN_BP4                        0xad
+#define RT5651_EQ_FC_HIP1                       0xae
+#define RT5651_EQ_GN_HIP1                       0xaf
+#define RT5651_EQ_FC_HIP2                       0xb0
+#define RT5651_EQ_BW_HIP2                       0xb1
+#define RT5651_EQ_GN_HIP2                       0xb2
+#define RT5651_EQ_PRE_VOL                       0xb3
+#define RT5651_EQ_PST_VOL                       0xb4
+
+
+/* global definition */
+#define RT5651_L_MUTE                           (0x1 << 15)
+#define RT5651_L_MUTE_SFT                       15
+#define RT5651_VOL_L_MUTE                       (0x1 << 14)
+#define RT5651_VOL_L_SFT                        14
+#define RT5651_R_MUTE                           (0x1 << 7)
+#define RT5651_R_MUTE_SFT                       7
+#define RT5651_VOL_R_MUTE                       (0x1 << 6)
+#define RT5651_VOL_R_SFT                        6
+#define RT5651_L_VOL_MASK                       (0x3f << 8)
+#define RT5651_L_VOL_SFT                        8
+#define RT5651_R_VOL_MASK                       (0x3f)
+#define RT5651_R_VOL_SFT                        0
+
+/* LOUT Control 2(0x05) */
+#define RT5651_EN_DFO                           (0x1 << 15)
+
+/* IN1 and IN2 Control (0x0d) */
+/* IN3 and IN4 Control (0x0e) */
+#define RT5651_BST_MASK1                        (0xf<<12)
+#define RT5651_BST_SFT1                         12
+#define RT5651_BST_MASK2                        (0xf<<8)
+#define RT5651_BST_SFT2                         8
+#define RT5651_IN_DF1                           (0x1 << 7)
+#define RT5651_IN_SFT1                          7
+#define RT5651_IN_DF2                           (0x1 << 6)
+#define RT5651_IN_SFT2                          6
+
+/* INL1 and INR1 Volume Control (0x0f) */
+/* INL2 and INR2 Volume Control (0x10) */
+#define RT5651_INL_SEL_MASK                     (0x1 << 15)
+#define RT5651_INL_SEL_SFT                      15
+#define RT5651_INL_SEL_IN4P                     (0x0 << 15)
+#define RT5651_INL_SEL_MONOP                    (0x1 << 15)
+#define RT5651_INL_VOL_MASK                     (0x1f << 8)
+#define RT5651_INL_VOL_SFT                      8
+#define RT5651_INR_SEL_MASK                     (0x1 << 7)
+#define RT5651_INR_SEL_SFT                      7
+#define RT5651_INR_SEL_IN4N                     (0x0 << 7)
+#define RT5651_INR_SEL_MONON                    (0x1 << 7)
+#define RT5651_INR_VOL_MASK                     (0x1f)
+#define RT5651_INR_VOL_SFT                      0
+
+/* DAC1 Digital Volume (0x19) */
+#define RT5651_DAC_L1_VOL_MASK                  (0xff << 8)
+#define RT5651_DAC_L1_VOL_SFT                   8
+#define RT5651_DAC_R1_VOL_MASK                  (0xff)
+#define RT5651_DAC_R1_VOL_SFT                   0
+
+/* DAC2 Digital Volume (0x1a) */
+#define RT5651_DAC_L2_VOL_MASK                  (0xff << 8)
+#define RT5651_DAC_L2_VOL_SFT                   8
+#define RT5651_DAC_R2_VOL_MASK                  (0xff)
+#define RT5651_DAC_R2_VOL_SFT                   0
+
+/* DAC2 Control (0x1b) */
+#define RT5651_M_DAC_L2_VOL                     (0x1 << 13)
+#define RT5651_M_DAC_L2_VOL_SFT                 13
+#define RT5651_M_DAC_R2_VOL                     (0x1 << 12)
+#define RT5651_M_DAC_R2_VOL_SFT                 12
+#define RT5651_SEL_DAC_L2                       (0x1 << 11)
+#define RT5651_IF2_DAC_L2                       (0x1 << 11)
+#define RT5651_IF1_DAC_L2                       (0x0 << 11)
+#define RT5651_SEL_DAC_L2_SFT                   11
+#define RT5651_SEL_DAC_R2                       (0x1 << 10)
+#define RT5651_IF2_DAC_R2                       (0x1 << 11)
+#define RT5651_IF1_DAC_R2                       (0x0 << 11)
+#define RT5651_SEL_DAC_R2_SFT                   10
+
+/* ADC Digital Volume Control (0x1c) */
+#define RT5651_ADC_L_VOL_MASK                   (0x7f << 8)
+#define RT5651_ADC_L_VOL_SFT                    8
+#define RT5651_ADC_R_VOL_MASK                   (0x7f)
+#define RT5651_ADC_R_VOL_SFT                    0
+
+/* Mono ADC Digital Volume Control (0x1d) */
+#define RT5651_M_MONO_ADC_L                     (0x1 << 15)
+#define RT5651_M_MONO_ADC_L_SFT                 15
+#define RT5651_MONO_ADC_L_VOL_MASK              (0x7f << 8)
+#define RT5651_MONO_ADC_L_VOL_SFT               8
+#define RT5651_M_MONO_ADC_R                     (0x1 << 7)
+#define RT5651_M_MONO_ADC_R_SFT                 7
+#define RT5651_MONO_ADC_R_VOL_MASK              (0x7f)
+#define RT5651_MONO_ADC_R_VOL_SFT               0
+
+/* ADC Boost Volume Control (0x1e) */
+#define RT5651_ADC_L_BST_MASK                   (0x3 << 14)
+#define RT5651_ADC_L_BST_SFT                    14
+#define RT5651_ADC_R_BST_MASK                   (0x3 << 12)
+#define RT5651_ADC_R_BST_SFT                    12
+#define RT5651_ADC_COMP_MASK                    (0x3 << 10)
+#define RT5651_ADC_COMP_SFT                     10
+
+/* Stereo ADC1 Mixer Control (0x27) */
+#define RT5651_M_STO1_ADC_L1                    (0x1 << 14)
+#define RT5651_M_STO1_ADC_L1_SFT                14
+#define RT5651_M_STO1_ADC_L2                    (0x1 << 13)
+#define RT5651_M_STO1_ADC_L2_SFT                13
+#define RT5651_STO1_ADC_1_SRC_MASK              (0x1 << 12)
+#define RT5651_STO1_ADC_1_SRC_SFT               12
+#define RT5651_STO1_ADC_1_SRC_ADC               (0x1 << 12)
+#define RT5651_STO1_ADC_1_SRC_DACMIX            (0x0 << 12)
+#define RT5651_STO1_ADC_2_SRC_MASK              (0x1 << 11)
+#define RT5651_STO1_ADC_2_SRC_SFT               11
+#define RT5651_STO1_ADC_2_SRC_DMIC              (0x0 << 11)
+#define RT5651_STO1_ADC_2_SRC_DACMIXR   (0x1 << 11)
+#define RT5651_M_STO1_ADC_R1                    (0x1 << 6)
+#define RT5651_M_STO1_ADC_R1_SFT                6
+#define RT5651_M_STO1_ADC_R2                    (0x1 << 5)
+#define RT5651_M_STO1_ADC_R2_SFT                5
+
+/* Stereo ADC2 Mixer Control (0x28) */
+#define RT5651_M_STO2_ADC_L1                    (0x1 << 14)
+#define RT5651_M_STO2_ADC_L1_SFT                14
+#define RT5651_M_STO2_ADC_L2                    (0x1 << 13)
+#define RT5651_M_STO2_ADC_L2_SFT                13
+#define RT5651_STO2_ADC_L1_SRC_MASK             (0x1 << 12)
+#define RT5651_STO2_ADC_L1_SRC_SFT              12
+#define RT5651_STO2_ADC_L1_SRC_DACMIXL          (0x0 << 12)
+#define RT5651_STO2_ADC_L1_SRC_ADCL             (0x1 << 12)
+#define RT5651_STO2_ADC_L2_SRC_MASK             (0x1 << 11)
+#define RT5651_STO2_ADC_L2_SRC_SFT              11
+#define RT5651_STO2_ADC_L2_SRC_DMIC             (0x0 << 11)
+#define RT5651_STO2_ADC_L2_SRC_DACMIXR          (0x1 << 11)
+#define RT5651_M_STO2_ADC_R1                    (0x1 << 6)
+#define RT5651_M_STO2_ADC_R1_SFT                6
+#define RT5651_M_STO2_ADC_R2                    (0x1 << 5)
+#define RT5651_M_STO2_ADC_R2_SFT                5
+#define RT5651_STO2_ADC_R1_SRC_MASK             (0x1 << 4)
+#define RT5651_STO2_ADC_R1_SRC_SFT              4
+#define RT5651_STO2_ADC_R1_SRC_ADCR             (0x1 << 4)
+#define RT5651_STO2_ADC_R1_SRC_DACMIXR          (0x0 << 4)
+#define RT5651_STO2_ADC_R2_SRC_MASK             (0x1 << 3)
+#define RT5651_STO2_ADC_R2_SRC_SFT              3
+#define RT5651_STO2_ADC_R2_SRC_DMIC             (0x0 << 3)
+#define RT5651_STO2_ADC_R2_SRC_DACMIXR          (0x1 << 3)
+
+/* ADC Mixer to DAC Mixer Control (0x29) */
+#define RT5651_M_ADCMIX_L                       (0x1 << 15)
+#define RT5651_M_ADCMIX_L_SFT                   15
+#define RT5651_M_IF1_DAC_L                      (0x1 << 14)
+#define RT5651_M_IF1_DAC_L_SFT                  14
+#define RT5651_M_ADCMIX_R                       (0x1 << 7)
+#define RT5651_M_ADCMIX_R_SFT                   7
+#define RT5651_M_IF1_DAC_R                      (0x1 << 6)
+#define RT5651_M_IF1_DAC_R_SFT                  6
+
+/* Stereo DAC Mixer Control (0x2a) */
+#define RT5651_M_DAC_L1_MIXL                    (0x1 << 14)
+#define RT5651_M_DAC_L1_MIXL_SFT                14
+#define RT5651_DAC_L1_STO_L_VOL_MASK            (0x1 << 13)
+#define RT5651_DAC_L1_STO_L_VOL_SFT             13
+#define RT5651_M_DAC_L2_MIXL                    (0x1 << 12)
+#define RT5651_M_DAC_L2_MIXL_SFT                12
+#define RT5651_DAC_L2_STO_L_VOL_MASK            (0x1 << 11)
+#define RT5651_DAC_L2_STO_L_VOL_SFT             11
+#define RT5651_M_DAC_R1_MIXL                    (0x1 << 9)
+#define RT5651_M_DAC_R1_MIXL_SFT                9
+#define RT5651_DAC_R1_STO_L_VOL_MASK            (0x1 << 8)
+#define RT5651_DAC_R1_STO_L_VOL_SFT             8
+#define RT5651_M_DAC_R1_MIXR                    (0x1 << 6)
+#define RT5651_M_DAC_R1_MIXR_SFT                6
+#define RT5651_DAC_R1_STO_R_VOL_MASK            (0x1 << 5)
+#define RT5651_DAC_R1_STO_R_VOL_SFT             5
+#define RT5651_M_DAC_R2_MIXR                    (0x1 << 4)
+#define RT5651_M_DAC_R2_MIXR_SFT                4
+#define RT5651_DAC_R2_STO_R_VOL_MASK            (0x1 << 3)
+#define RT5651_DAC_R2_STO_R_VOL_SFT             3
+#define RT5651_M_DAC_L1_MIXR                    (0x1 << 1)
+#define RT5651_M_DAC_L1_MIXR_SFT                1
+#define RT5651_DAC_L1_STO_R_VOL_MASK            (0x1)
+#define RT5651_DAC_L1_STO_R_VOL_SFT             0
+
+/* DD Mixer Control (0x2b) */
+#define RT5651_M_STO_DD_L1                      (0x1 << 14)
+#define RT5651_M_STO_DD_L1_SFT                  14
+#define RT5651_STO_DD_L1_VOL_MASK               (0x1 << 13)
+#define RT5651_DAC_DD_L1_VOL_SFT                13
+#define RT5651_M_STO_DD_L2                      (0x1 << 12)
+#define RT5651_M_STO_DD_L2_SFT                  12
+#define RT5651_STO_DD_L2_VOL_MASK               (0x1 << 11)
+#define RT5651_STO_DD_L2_VOL_SFT                11
+#define RT5651_M_STO_DD_R2_L                    (0x1 << 10)
+#define RT5651_M_STO_DD_R2_L_SFT                10
+#define RT5651_STO_DD_R2_L_VOL_MASK             (0x1 << 9)
+#define RT5651_STO_DD_R2_L_VOL_SFT              9
+#define RT5651_M_STO_DD_R1                      (0x1 << 6)
+#define RT5651_M_STO_DD_R1_SFT                  6
+#define RT5651_STO_DD_R1_VOL_MASK               (0x1 << 5)
+#define RT5651_STO_DD_R1_VOL_SFT                5
+#define RT5651_M_STO_DD_R2                      (0x1 << 4)
+#define RT5651_M_STO_DD_R2_SFT                  4
+#define RT5651_STO_DD_R2_VOL_MASK               (0x1 << 3)
+#define RT5651_STO_DD_R2_VOL_SFT                3
+#define RT5651_M_STO_DD_L2_R                    (0x1 << 2)
+#define RT5651_M_STO_DD_L2_R_SFT                2
+#define RT5651_STO_DD_L2_R_VOL_MASK             (0x1 << 1)
+#define RT5651_STO_DD_L2_R_VOL_SFT              1
+
+/* Digital Mixer Control (0x2c) */
+#define RT5651_M_STO_L_DAC_L                    (0x1 << 15)
+#define RT5651_M_STO_L_DAC_L_SFT                15
+#define RT5651_STO_L_DAC_L_VOL_MASK             (0x1 << 14)
+#define RT5651_STO_L_DAC_L_VOL_SFT              14
+#define RT5651_M_DAC_L2_DAC_L                   (0x1 << 13)
+#define RT5651_M_DAC_L2_DAC_L_SFT               13
+#define RT5651_DAC_L2_DAC_L_VOL_MASK            (0x1 << 12)
+#define RT5651_DAC_L2_DAC_L_VOL_SFT             12
+#define RT5651_M_STO_R_DAC_R                    (0x1 << 11)
+#define RT5651_M_STO_R_DAC_R_SFT                11
+#define RT5651_STO_R_DAC_R_VOL_MASK             (0x1 << 10)
+#define RT5651_STO_R_DAC_R_VOL_SFT              10
+#define RT5651_M_DAC_R2_DAC_R                   (0x1 << 9)
+#define RT5651_M_DAC_R2_DAC_R_SFT               9
+#define RT5651_DAC_R2_DAC_R_VOL_MASK            (0x1 << 8)
+#define RT5651_DAC_R2_DAC_R_VOL_SFT             8
+
+/* DSP Path Control 1 (0x2d) */
+#define RT5651_RXDP_SRC_MASK                    (0x1 << 15)
+#define RT5651_RXDP_SRC_SFT                     15
+#define RT5651_RXDP_SRC_NOR                     (0x0 << 15)
+#define RT5651_RXDP_SRC_DIV3                    (0x1 << 15)
+#define RT5651_TXDP_SRC_MASK                    (0x1 << 14)
+#define RT5651_TXDP_SRC_SFT                     14
+#define RT5651_TXDP_SRC_NOR                     (0x0 << 14)
+#define RT5651_TXDP_SRC_DIV3                    (0x1 << 14)
+
+/* DSP Path Control 2 (0x2e) */
+#define RT5651_DAC_L2_SEL_MASK                  (0x3 << 14)
+#define RT5651_DAC_L2_SEL_SFT                   14
+#define RT5651_DAC_L2_SEL_IF2                   (0x0 << 14)
+#define RT5651_DAC_L2_SEL_IF3                   (0x1 << 14)
+#define RT5651_DAC_L2_SEL_TXDC                  (0x2 << 14)
+#define RT5651_DAC_L2_SEL_BASS                  (0x3 << 14)
+#define RT5651_DAC_R2_SEL_MASK                  (0x3 << 12)
+#define RT5651_DAC_R2_SEL_SFT                   12
+#define RT5651_DAC_R2_SEL_IF2                   (0x0 << 12)
+#define RT5651_DAC_R2_SEL_IF3                   (0x1 << 12)
+#define RT5651_DAC_R2_SEL_TXDC                  (0x2 << 12)
+#define RT5651_IF2_ADC_L_SEL_MASK               (0x1 << 11)
+#define RT5651_IF2_ADC_L_SEL_SFT                11
+#define RT5651_IF2_ADC_L_SEL_TXDP               (0x0 << 11)
+#define RT5651_IF2_ADC_L_SEL_PASS               (0x1 << 11)
+#define RT5651_IF2_ADC_R_SEL_MASK               (0x1 << 10)
+#define RT5651_IF2_ADC_R_SEL_SFT                10
+#define RT5651_IF2_ADC_R_SEL_TXDP               (0x0 << 10)
+#define RT5651_IF2_ADC_R_SEL_PASS               (0x1 << 10)
+#define RT5651_RXDC_SEL_MASK                    (0x3 << 8)
+#define RT5651_RXDC_SEL_SFT                     8
+#define RT5651_RXDC_SEL_NOR                     (0x0 << 8)
+#define RT5651_RXDC_SEL_L2R                     (0x1 << 8)
+#define RT5651_RXDC_SEL_R2L                     (0x2 << 8)
+#define RT5651_RXDC_SEL_SWAP                    (0x3 << 8)
+#define RT5651_RXDP_SEL_MASK                    (0x3 << 6)
+#define RT5651_RXDP_SEL_SFT                     6
+#define RT5651_RXDP_SEL_NOR                     (0x0 << 6)
+#define RT5651_RXDP_SEL_L2R                     (0x1 << 6)
+#define RT5651_RXDP_SEL_R2L                     (0x2 << 6)
+#define RT5651_RXDP_SEL_SWAP                    (0x3 << 6)
+#define RT5651_TXDC_SEL_MASK                    (0x3 << 4)
+#define RT5651_TXDC_SEL_SFT                     4
+#define RT5651_TXDC_SEL_NOR                     (0x0 << 4)
+#define RT5651_TXDC_SEL_L2R                     (0x1 << 4)
+#define RT5651_TXDC_SEL_R2L                     (0x2 << 4)
+#define RT5651_TXDC_SEL_SWAP                    (0x3 << 4)
+#define RT5651_TXDP_SEL_MASK                    (0x3 << 2)
+#define RT5651_TXDP_SEL_SFT                     2
+#define RT5651_TXDP_SEL_NOR                     (0x0 << 2)
+#define RT5651_TXDP_SEL_L2R                     (0x1 << 2)
+#define RT5651_TXDP_SEL_R2L                     (0x2 << 2)
+#define RT5651_TRXDP_SEL_SWAP                   (0x3 << 2)
+
+/* Digital Interface Data Control (0x2f) */
+#define RT5651_IF2_DAC_SEL_MASK                 (0x3 << 10)
+#define RT5651_IF2_DAC_SEL_SFT                  10
+#define RT5651_IF2_DAC_SEL_NOR                  (0x0 << 10)
+#define RT5651_IF2_DAC_SEL_SWAP                 (0x1 << 10)
+#define RT5651_IF2_DAC_SEL_L2R                  (0x2 << 10)
+#define RT5651_IF2_DAC_SEL_R2L                  (0x3 << 10)
+#define RT5651_IF2_ADC_SEL_MASK                 (0x3 << 8)
+#define RT5651_IF2_ADC_SEL_SFT                  8
+#define RT5651_IF2_ADC_SEL_NOR                  (0x0 << 8)
+#define RT5651_IF2_ADC_SEL_SWAP                 (0x1 << 8)
+#define RT5651_IF2_ADC_SEL_L2R                  (0x2 << 8)
+#define RT5651_IF2_ADC_SEL_R2L                  (0x3 << 8)
+#define RT5651_IF2_ADC_SRC_MASK                 (0x1 << 7)
+#define RT5651_IF2_ADC_SRC_SFT                  7
+#define RT5651_IF1_ADC1                         (0x0 << 7)
+#define RT5651_IF1_ADC2                         (0x1 << 7)
+
+/* PDM Output Control (0x30) */
+#define RT5651_PDM_L_SEL_MASK                   (0x1 << 15)
+#define RT5651_PDM_L_SEL_SFT                    15
+#define RT5651_PDM_L_SEL_DD_L                   (0x0 << 15)
+#define RT5651_PDM_L_SEL_STO_L                  (0x1 << 15)
+#define RT5651_M_PDM_L                          (0x1 << 14)
+#define RT5651_M_PDM_L_SFT                      14
+#define RT5651_PDM_R_SEL_MASK                   (0x1 << 13)
+#define RT5651_PDM_R_SEL_SFT                    13
+#define RT5651_PDM_R_SEL_DD_L                   (0x0 << 13)
+#define RT5651_PDM_R_SEL_STO_L                  (0x1 << 13)
+#define RT5651_M_PDM_R                          (0x1 << 12)
+#define RT5651_M_PDM_R_SFT                      12
+#define RT5651_PDM_BUSY                         (0x1 << 6)
+#define RT5651_PDM_BUSY_SFT                     6
+#define RT5651_PDM_PATTERN_SEL_MASK             (0x1 << 5)
+#define RT5651_PDM_PATTERN_SEL_64               (0x0 << 5)
+#define RT5651_PDM_PATTERN_SEL_128              (0x1 << 5)
+#define RT5651_PDM_VOL_MASK                     (0x1 << 4)
+#define RT5651_PDM_VOL_SFT                      4
+#define RT5651_PDM_DIV_MASK                     (0x3)
+#define RT5651_PDM_DIV_SFT                      0
+#define RT5651_PDM_DIV_1                        0
+#define RT5651_PDM_DIV_2                        1
+#define RT5651_PDM_DIV_3                        2
+#define RT5651_PDM_DIV_4                        3
+
+/* PDM I2C/Data Control 1 (0x31) */
+#define RT5651_PDM_I2C_ID_MASK                  (0xf << 12)
+#define PT5631_PDM_CMD_EXE                      (0x1 << 11)
+#define RT5651_PDM_I2C_CMD_MASK                 (0x1 << 10)
+#define RT5651_PDM_I2C_CMD_R                    (0x0 << 10)
+#define RT5651_PDM_I2C_CMD_W                    (0x1 << 10)
+#define RT5651_PDM_I2C_CMD_EXE                  (0x1 << 9)
+#define RT5651_PDM_I2C_NORMAL                   (0x0 << 8)
+#define RT5651_PDM_I2C_BUSY                     (0x1 << 8)
+
+/* PDM I2C/Data Control 2 (0x32) */
+#define RT5651_PDM_I2C_ADDR                     (0xff << 8)
+#define RT5651_PDM_I2C_CMD_PATTERN              (0xff)
+
+
+/* REC Left Mixer Control 1 (0x3b) */
+#define RT5651_G_LN_L2_RM_L_MASK                (0x7 << 13)
+#define RT5651_G_IN_L2_RM_L_SFT                 13
+#define RT5651_G_LN_L1_RM_L_MASK                (0x7 << 10)
+#define RT5651_G_IN_L1_RM_L_SFT                 10
+#define RT5651_G_BST3_RM_L_MASK                 (0x7 << 4)
+#define RT5651_G_BST3_RM_L_SFT                  4
+#define RT5651_G_BST2_RM_L_MASK                 (0x7 << 1)
+#define RT5651_G_BST2_RM_L_SFT                  1
+
+/* REC Left Mixer Control 2 (0x3c) */
+#define RT5651_G_BST1_RM_L_MASK                 (0x7 << 13)
+#define RT5651_G_BST1_RM_L_SFT                  13
+#define RT5651_G_OM_L_RM_L_MASK                 (0x7 << 10)
+#define RT5651_G_OM_L_RM_L_SFT                  10
+#define RT5651_M_IN2_L_RM_L                     (0x1 << 6)
+#define RT5651_M_IN2_L_RM_L_SFT                 6
+#define RT5651_M_IN1_L_RM_L                     (0x1 << 5)
+#define RT5651_M_IN1_L_RM_L_SFT                 5
+#define RT5651_M_BST3_RM_L                      (0x1 << 3)
+#define RT5651_M_BST3_RM_L_SFT                  3
+#define RT5651_M_BST2_RM_L                      (0x1 << 2)
+#define RT5651_M_BST2_RM_L_SFT                  2
+#define RT5651_M_BST1_RM_L                      (0x1 << 1)
+#define RT5651_M_BST1_RM_L_SFT                  1
+#define RT5651_M_OM_L_RM_L                      (0x1)
+#define RT5651_M_OM_L_RM_L_SFT                  0
+
+/* REC Right Mixer Control 1 (0x3d) */
+#define RT5651_G_IN2_R_RM_R_MASK                (0x7 << 13)
+#define RT5651_G_IN2_R_RM_R_SFT                 13
+#define RT5651_G_IN1_R_RM_R_MASK                (0x7 << 10)
+#define RT5651_G_IN1_R_RM_R_SFT                 10
+#define RT5651_G_BST3_RM_R_MASK                 (0x7 << 4)
+#define RT5651_G_BST3_RM_R_SFT                  4
+#define RT5651_G_BST2_RM_R_MASK                 (0x7 << 1)
+#define RT5651_G_BST2_RM_R_SFT                  1
+
+/* REC Right Mixer Control 2 (0x3e) */
+#define RT5651_G_BST1_RM_R_MASK                 (0x7 << 13)
+#define RT5651_G_BST1_RM_R_SFT                  13
+#define RT5651_G_OM_R_RM_R_MASK                 (0x7 << 10)
+#define RT5651_G_OM_R_RM_R_SFT                  10
+#define RT5651_M_IN2_R_RM_R                     (0x1 << 6)
+#define RT5651_M_IN2_R_RM_R_SFT                 6
+#define RT5651_M_IN1_R_RM_R                     (0x1 << 5)
+#define RT5651_M_IN1_R_RM_R_SFT                 5
+#define RT5651_M_BST3_RM_R                      (0x1 << 3)
+#define RT5651_M_BST3_RM_R_SFT                  3
+#define RT5651_M_BST2_RM_R                      (0x1 << 2)
+#define RT5651_M_BST2_RM_R_SFT                  2
+#define RT5651_M_BST1_RM_R                      (0x1 << 1)
+#define RT5651_M_BST1_RM_R_SFT                  1
+#define RT5651_M_OM_R_RM_R                      (0x1)
+#define RT5651_M_OM_R_RM_R_SFT                  0
+
+/* HPMIX Control (0x45) */
+#define RT5651_M_DAC1_HM                        (0x1 << 14)
+#define RT5651_M_DAC1_HM_SFT                    14
+#define RT5651_M_HPVOL_HM                       (0x1 << 13)
+#define RT5651_M_HPVOL_HM_SFT                   13
+#define RT5651_G_HPOMIX_MASK                    (0x1 << 12)
+#define RT5651_G_HPOMIX_SFT                     12
+
+/* SPK Left Mixer Control (0x46) */
+#define RT5651_G_RM_L_SM_L_MASK                 (0x3 << 14)
+#define RT5651_G_RM_L_SM_L_SFT                  14
+#define RT5651_G_IN_L_SM_L_MASK                 (0x3 << 12)
+#define RT5651_G_IN_L_SM_L_SFT                  12
+#define RT5651_G_DAC_L1_SM_L_MASK               (0x3 << 10)
+#define RT5651_G_DAC_L1_SM_L_SFT                10
+#define RT5651_G_DAC_L2_SM_L_MASK               (0x3 << 8)
+#define RT5651_G_DAC_L2_SM_L_SFT                8
+#define RT5651_G_OM_L_SM_L_MASK                 (0x3 << 6)
+#define RT5651_G_OM_L_SM_L_SFT                  6
+#define RT5651_M_RM_L_SM_L                      (0x1 << 5)
+#define RT5651_M_RM_L_SM_L_SFT                  5
+#define RT5651_M_IN_L_SM_L                      (0x1 << 4)
+#define RT5651_M_IN_L_SM_L_SFT                  4
+#define RT5651_M_DAC_L1_SM_L                    (0x1 << 3)
+#define RT5651_M_DAC_L1_SM_L_SFT                3
+#define RT5651_M_DAC_L2_SM_L                    (0x1 << 2)
+#define RT5651_M_DAC_L2_SM_L_SFT                2
+#define RT5651_M_OM_L_SM_L                      (0x1 << 1)
+#define RT5651_M_OM_L_SM_L_SFT                  1
+
+/* SPK Right Mixer Control (0x47) */
+#define RT5651_G_RM_R_SM_R_MASK                 (0x3 << 14)
+#define RT5651_G_RM_R_SM_R_SFT                  14
+#define RT5651_G_IN_R_SM_R_MASK                 (0x3 << 12)
+#define RT5651_G_IN_R_SM_R_SFT                  12
+#define RT5651_G_DAC_R1_SM_R_MASK               (0x3 << 10)
+#define RT5651_G_DAC_R1_SM_R_SFT                10
+#define RT5651_G_DAC_R2_SM_R_MASK               (0x3 << 8)
+#define RT5651_G_DAC_R2_SM_R_SFT                8
+#define RT5651_G_OM_R_SM_R_MASK                 (0x3 << 6)
+#define RT5651_G_OM_R_SM_R_SFT                  6
+#define RT5651_M_RM_R_SM_R                      (0x1 << 5)
+#define RT5651_M_RM_R_SM_R_SFT                  5
+#define RT5651_M_IN_R_SM_R                      (0x1 << 4)
+#define RT5651_M_IN_R_SM_R_SFT                  4
+#define RT5651_M_DAC_R1_SM_R                    (0x1 << 3)
+#define RT5651_M_DAC_R1_SM_R_SFT                3
+#define RT5651_M_DAC_R2_SM_R                    (0x1 << 2)
+#define RT5651_M_DAC_R2_SM_R_SFT                2
+#define RT5651_M_OM_R_SM_R                      (0x1 << 1)
+#define RT5651_M_OM_R_SM_R_SFT                  1
+
+/* SPOLMIX Control (0x48) */
+#define RT5651_M_DAC_R1_SPM_L                   (0x1 << 15)
+#define RT5651_M_DAC_R1_SPM_L_SFT               15
+#define RT5651_M_DAC_L1_SPM_L                   (0x1 << 14)
+#define RT5651_M_DAC_L1_SPM_L_SFT               14
+#define RT5651_M_SV_R_SPM_L                     (0x1 << 13)
+#define RT5651_M_SV_R_SPM_L_SFT                 13
+#define RT5651_M_SV_L_SPM_L                     (0x1 << 12)
+#define RT5651_M_SV_L_SPM_L_SFT                 12
+#define RT5651_M_BST1_SPM_L                     (0x1 << 11)
+#define RT5651_M_BST1_SPM_L_SFT                 11
+
+/* SPORMIX Control (0x49) */
+#define RT5651_M_DAC_R1_SPM_R                   (0x1 << 13)
+#define RT5651_M_DAC_R1_SPM_R_SFT               13
+#define RT5651_M_SV_R_SPM_R                     (0x1 << 12)
+#define RT5651_M_SV_R_SPM_R_SFT                 12
+#define RT5651_M_BST1_SPM_R                     (0x1 << 11)
+#define RT5651_M_BST1_SPM_R_SFT                 11
+
+/* SPOLMIX / SPORMIX Ratio Control (0x4a) */
+#define RT5651_SPO_CLSD_RATIO_MASK              (0x7)
+#define RT5651_SPO_CLSD_RATIO_SFT               0
+
+/* Mono Output Mixer Control (0x4c) */
+#define RT5651_M_DAC_R2_MM                      (0x1 << 15)
+#define RT5651_M_DAC_R2_MM_SFT                  15
+#define RT5651_M_DAC_L2_MM                      (0x1 << 14)
+#define RT5651_M_DAC_L2_MM_SFT                  14
+#define RT5651_M_OV_R_MM                        (0x1 << 13)
+#define RT5651_M_OV_R_MM_SFT                    13
+#define RT5651_M_OV_L_MM                        (0x1 << 12)
+#define RT5651_M_OV_L_MM_SFT                    12
+#define RT5651_M_BST1_MM                        (0x1 << 11)
+#define RT5651_M_BST1_MM_SFT                    11
+#define RT5651_G_MONOMIX_MASK                   (0x1 << 10)
+#define RT5651_G_MONOMIX_SFT                    10
+
+/* Output Left Mixer Control 1 (0x4d) */
+#define RT5651_G_BST2_OM_L_MASK                 (0x7 << 10)
+#define RT5651_G_BST2_OM_L_SFT                  10
+#define RT5651_G_BST1_OM_L_MASK                 (0x7 << 7)
+#define RT5651_G_BST1_OM_L_SFT                  7
+#define RT5651_G_IN1_L_OM_L_MASK                (0x7 << 4)
+#define RT5651_G_IN1_L_OM_L_SFT                 4
+#define RT5651_G_RM_L_OM_L_MASK                 (0x7 << 1)
+#define RT5651_G_RM_L_OM_L_SFT                  1
+
+/* Output Left Mixer Control 2 (0x4e) */
+#define RT5651_G_DAC_L1_OM_L_MASK               (0x7 << 7)
+#define RT5651_G_DAC_L1_OM_L_SFT                7
+#define RT5651_G_IN2_L_OM_L_MASK                (0x7 << 4)
+#define RT5651_G_IN2_L_OM_L_SFT                 4
+
+/* Output Left Mixer Control 3 (0x4f) */
+#define RT5651_M_IN2_L_OM_L                     (0x1 << 9)
+#define RT5651_M_IN2_L_OM_L_SFT                 9
+#define RT5651_M_BST2_OM_L                      (0x1 << 6)
+#define RT5651_M_BST2_OM_L_SFT                  6
+#define RT5651_M_BST1_OM_L                      (0x1 << 5)
+#define RT5651_M_BST1_OM_L_SFT                  5
+#define RT5651_M_IN1_L_OM_L                     (0x1 << 4)
+#define RT5651_M_IN1_L_OM_L_SFT                 4
+#define RT5651_M_RM_L_OM_L                      (0x1 << 3)
+#define RT5651_M_RM_L_OM_L_SFT                  3
+#define RT5651_M_DAC_L1_OM_L                    (0x1)
+#define RT5651_M_DAC_L1_OM_L_SFT                0
+
+/* Output Right Mixer Control 1 (0x50) */
+#define RT5651_G_BST2_OM_R_MASK                 (0x7 << 10)
+#define RT5651_G_BST2_OM_R_SFT                  10
+#define RT5651_G_BST1_OM_R_MASK                 (0x7 << 7)
+#define RT5651_G_BST1_OM_R_SFT                  7
+#define RT5651_G_IN1_R_OM_R_MASK                (0x7 << 4)
+#define RT5651_G_IN1_R_OM_R_SFT                 4
+#define RT5651_G_RM_R_OM_R_MASK                 (0x7 << 1)
+#define RT5651_G_RM_R_OM_R_SFT                  1
+
+/* Output Right Mixer Control 2 (0x51) */
+#define RT5651_G_DAC_R1_OM_R_MASK               (0x7 << 7)
+#define RT5651_G_DAC_R1_OM_R_SFT                7
+#define RT5651_G_IN2_R_OM_R_MASK                (0x7 << 4)
+#define RT5651_G_IN2_R_OM_R_SFT                 4
+
+/* Output Right Mixer Control 3 (0x52) */
+#define RT5651_M_IN2_R_OM_R                     (0x1 << 9)
+#define RT5651_M_IN2_R_OM_R_SFT                 9
+#define RT5651_M_BST2_OM_R                      (0x1 << 6)
+#define RT5651_M_BST2_OM_R_SFT                  6
+#define RT5651_M_BST1_OM_R                      (0x1 << 5)
+#define RT5651_M_BST1_OM_R_SFT                  5
+#define RT5651_M_IN1_R_OM_R                     (0x1 << 4)
+#define RT5651_M_IN1_R_OM_R_SFT                 4
+#define RT5651_M_RM_R_OM_R                      (0x1 << 3)
+#define RT5651_M_RM_R_OM_R_SFT                  3
+#define RT5651_M_DAC_R1_OM_R                    (0x1)
+#define RT5651_M_DAC_R1_OM_R_SFT                0
+
+/* LOUT Mixer Control (0x53) */
+#define RT5651_M_DAC_L1_LM                      (0x1 << 15)
+#define RT5651_M_DAC_L1_LM_SFT                  15
+#define RT5651_M_DAC_R1_LM                      (0x1 << 14)
+#define RT5651_M_DAC_R1_LM_SFT                  14
+#define RT5651_M_OV_L_LM                        (0x1 << 13)
+#define RT5651_M_OV_L_LM_SFT                    13
+#define RT5651_M_OV_R_LM                        (0x1 << 12)
+#define RT5651_M_OV_R_LM_SFT                    12
+#define RT5651_G_LOUTMIX_MASK                   (0x1 << 11)
+#define RT5651_G_LOUTMIX_SFT                    11
+
+/* Power Management for Digital 1 (0x61) */
+#define RT5651_PWR_I2S1                         (0x1 << 15)
+#define RT5651_PWR_I2S1_BIT                     15
+#define RT5651_PWR_I2S2                         (0x1 << 14)
+#define RT5651_PWR_I2S2_BIT                     14
+#define RT5651_PWR_DAC_L1                       (0x1 << 12)
+#define RT5651_PWR_DAC_L1_BIT                   12
+#define RT5651_PWR_DAC_R1                       (0x1 << 11)
+#define RT5651_PWR_DAC_R1_BIT                   11
+#define RT5651_PWR_ADC_L                        (0x1 << 2)
+#define RT5651_PWR_ADC_L_BIT                    2
+#define RT5651_PWR_ADC_R                        (0x1 << 1)
+#define RT5651_PWR_ADC_R_BIT                    1
+
+/* Power Management for Digital 2 (0x62) */
+#define RT5651_PWR_ADC_STO1_F                   (0x1 << 15)
+#define RT5651_PWR_ADC_STO1_F_BIT                       15
+#define RT5651_PWR_ADC_STO2_F                   (0x1 << 14)
+#define RT5651_PWR_ADC_STO2_F_BIT               14
+#define RT5651_PWR_DAC_STO1_F                   (0x1 << 11)
+#define RT5651_PWR_DAC_STO1_F_BIT                       11
+#define RT5651_PWR_DAC_STO2_F                   (0x1 << 10)
+#define RT5651_PWR_DAC_STO2_F_BIT               10
+#define RT5651_PWR_PDM                          (0x1 << 9)
+#define RT5651_PWR_PDM_BIT                      9
+
+/* Power Management for Analog 1 (0x63) */
+#define RT5651_PWR_VREF1                        (0x1 << 15)
+#define RT5651_PWR_VREF1_BIT                    15
+#define RT5651_PWR_FV1                          (0x1 << 14)
+#define RT5651_PWR_FV1_BIT                      14
+#define RT5651_PWR_MB                           (0x1 << 13)
+#define RT5651_PWR_MB_BIT                       13
+#define RT5651_PWR_LM                           (0x1 << 12)
+#define RT5651_PWR_LM_BIT                       12
+#define RT5651_PWR_BG                           (0x1 << 11)
+#define RT5651_PWR_BG_BIT                       11
+#define RT5651_PWR_HP_L                         (0x1 << 7)
+#define RT5651_PWR_HP_L_BIT                     7
+#define RT5651_PWR_HP_R                         (0x1 << 6)
+#define RT5651_PWR_HP_R_BIT                     6
+#define RT5651_PWR_HA                           (0x1 << 5)
+#define RT5651_PWR_HA_BIT                       5
+#define RT5651_PWR_VREF2                        (0x1 << 4)
+#define RT5651_PWR_VREF2_BIT                    4
+#define RT5651_PWR_FV2                          (0x1 << 3)
+#define RT5651_PWR_FV2_BIT                      3
+#define RT5651_PWR_LDO                          (0x1 << 2)
+#define RT5651_PWR_LDO_BIT                      2
+#define RT5651_PWR_LDO_DVO_MASK                 (0x3)
+#define RT5651_PWR_LDO_DVO_1_0V                 0
+#define RT5651_PWR_LDO_DVO_1_1V                 1
+#define RT5651_PWR_LDO_DVO_1_2V                 2
+#define RT5651_PWR_LDO_DVO_1_3V                 3
+
+/* Power Management for Analog 2 (0x64) */
+#define RT5651_PWR_BST1                         (0x1 << 15)
+#define RT5651_PWR_BST1_BIT                     15
+#define RT5651_PWR_BST2                         (0x1 << 14)
+#define RT5651_PWR_BST2_BIT                     14
+#define RT5651_PWR_BST3                         (0x1 << 13)
+#define RT5651_PWR_BST3_BIT                     13
+#define RT5651_PWR_MB1                          (0x1 << 11)
+#define RT5651_PWR_MB1_BIT                      11
+#define RT5651_PWR_PLL                          (0x1 << 9)
+#define RT5651_PWR_PLL_BIT                      9
+#define RT5651_PWR_BST1_OP2                     (0x1 << 5)
+#define RT5651_PWR_BST1_OP2_BIT                 5
+#define RT5651_PWR_BST2_OP2                     (0x1 << 4)
+#define RT5651_PWR_BST2_OP2_BIT                 4
+#define RT5651_PWR_BST3_OP2                     (0x1 << 3)
+#define RT5651_PWR_BST3_OP2_BIT                 3
+#define RT5651_PWR_JD_M                         (0x1 << 2)
+#define RT5651_PWM_JD_M_BIT                     2
+#define RT5651_PWR_JD2                          (0x1 << 1)
+#define RT5651_PWM_JD2_BIT                      1
+#define RT5651_PWR_JD3                          (0x1)
+#define RT5651_PWM_JD3_BIT                      0
+
+/* Power Management for Mixer (0x65) */
+#define RT5651_PWR_OM_L                         (0x1 << 15)
+#define RT5651_PWR_OM_L_BIT                     15
+#define RT5651_PWR_OM_R                         (0x1 << 14)
+#define RT5651_PWR_OM_R_BIT                     14
+#define RT5651_PWR_RM_L                         (0x1 << 11)
+#define RT5651_PWR_RM_L_BIT                     11
+#define RT5651_PWR_RM_R                         (0x1 << 10)
+#define RT5651_PWR_RM_R_BIT                     10
+
+/* Power Management for Volume (0x66) */
+#define RT5651_PWR_OV_L                         (0x1 << 13)
+#define RT5651_PWR_OV_L_BIT                     13
+#define RT5651_PWR_OV_R                         (0x1 << 12)
+#define RT5651_PWR_OV_R_BIT                     12
+#define RT5651_PWR_HV_L                         (0x1 << 11)
+#define RT5651_PWR_HV_L_BIT                     11
+#define RT5651_PWR_HV_R                         (0x1 << 10)
+#define RT5651_PWR_HV_R_BIT                     10
+#define RT5651_PWR_IN1_L                        (0x1 << 9)
+#define RT5651_PWR_IN1_L_BIT                    9
+#define RT5651_PWR_IN1_R                        (0x1 << 8)
+#define RT5651_PWR_IN1_R_BIT                    8
+#define RT5651_PWR_IN2_L                        (0x1 << 7)
+#define RT5651_PWR_IN2_L_BIT                    7
+#define RT5651_PWR_IN2_R                        (0x1 << 6)
+#define RT5651_PWR_IN2_R_BIT                    6
+
+/* I2S1/2/3 Audio Serial Data Port Control (0x70 0x71) */
+#define RT5651_I2S_MS_MASK                      (0x1 << 15)
+#define RT5651_I2S_MS_SFT                       15
+#define RT5651_I2S_MS_M                         (0x0 << 15)
+#define RT5651_I2S_MS_S                         (0x1 << 15)
+#define RT5651_I2S_O_CP_MASK                    (0x3 << 10)
+#define RT5651_I2S_O_CP_SFT                     10
+#define RT5651_I2S_O_CP_OFF                     (0x0 << 10)
+#define RT5651_I2S_O_CP_U_LAW                   (0x1 << 10)
+#define RT5651_I2S_O_CP_A_LAW                   (0x2 << 10)
+#define RT5651_I2S_I_CP_MASK                    (0x3 << 8)
+#define RT5651_I2S_I_CP_SFT                     8
+#define RT5651_I2S_I_CP_OFF                     (0x0 << 8)
+#define RT5651_I2S_I_CP_U_LAW                   (0x1 << 8)
+#define RT5651_I2S_I_CP_A_LAW                   (0x2 << 8)
+#define RT5651_I2S_BP_MASK                      (0x1 << 7)
+#define RT5651_I2S_BP_SFT                       7
+#define RT5651_I2S_BP_NOR                       (0x0 << 7)
+#define RT5651_I2S_BP_INV                       (0x1 << 7)
+#define RT5651_I2S_DL_MASK                      (0x3 << 2)
+#define RT5651_I2S_DL_SFT                       2
+#define RT5651_I2S_DL_16                        (0x0 << 2)
+#define RT5651_I2S_DL_20                        (0x1 << 2)
+#define RT5651_I2S_DL_24                        (0x2 << 2)
+#define RT5651_I2S_DL_8                         (0x3 << 2)
+#define RT5651_I2S_DF_MASK                      (0x3)
+#define RT5651_I2S_DF_SFT                       0
+#define RT5651_I2S_DF_I2S                       (0x0)
+#define RT5651_I2S_DF_LEFT                      (0x1)
+#define RT5651_I2S_DF_PCM_A                     (0x2)
+#define RT5651_I2S_DF_PCM_B                     (0x3)
+
+/* ADC/DAC Clock Control 1 (0x73) */
+#define RT5651_I2S_PD1_MASK                     (0x7 << 12)
+#define RT5651_I2S_PD1_SFT                      12
+#define RT5651_I2S_PD1_1                        (0x0 << 12)
+#define RT5651_I2S_PD1_2                        (0x1 << 12)
+#define RT5651_I2S_PD1_3                        (0x2 << 12)
+#define RT5651_I2S_PD1_4                        (0x3 << 12)
+#define RT5651_I2S_PD1_6                        (0x4 << 12)
+#define RT5651_I2S_PD1_8                        (0x5 << 12)
+#define RT5651_I2S_PD1_12                       (0x6 << 12)
+#define RT5651_I2S_PD1_16                       (0x7 << 12)
+#define RT5651_I2S_BCLK_MS2_MASK                (0x1 << 11)
+#define RT5651_I2S_BCLK_MS2_SFT                 11
+#define RT5651_I2S_BCLK_MS2_32                  (0x0 << 11)
+#define RT5651_I2S_BCLK_MS2_64                  (0x1 << 11)
+#define RT5651_I2S_PD2_MASK                     (0x7 << 8)
+#define RT5651_I2S_PD2_SFT                      8
+#define RT5651_I2S_PD2_1                        (0x0 << 8)
+#define RT5651_I2S_PD2_2                        (0x1 << 8)
+#define RT5651_I2S_PD2_3                        (0x2 << 8)
+#define RT5651_I2S_PD2_4                        (0x3 << 8)
+#define RT5651_I2S_PD2_6                        (0x4 << 8)
+#define RT5651_I2S_PD2_8                        (0x5 << 8)
+#define RT5651_I2S_PD2_12                       (0x6 << 8)
+#define RT5651_I2S_PD2_16                       (0x7 << 8)
+#define RT5651_DAC_OSR_MASK                     (0x3 << 2)
+#define RT5651_DAC_OSR_SFT                      2
+#define RT5651_DAC_OSR_128                      (0x0 << 2)
+#define RT5651_DAC_OSR_64                       (0x1 << 2)
+#define RT5651_DAC_OSR_32                       (0x2 << 2)
+#define RT5651_DAC_OSR_128_3                    (0x3 << 2)
+#define RT5651_ADC_OSR_MASK                     (0x3)
+#define RT5651_ADC_OSR_SFT                      0
+#define RT5651_ADC_OSR_128                      (0x0)
+#define RT5651_ADC_OSR_64                       (0x1)
+#define RT5651_ADC_OSR_32                       (0x2)
+#define RT5651_ADC_OSR_128_3                    (0x3)
+
+/* ADC/DAC Clock Control 2 (0x74) */
+#define RT5651_DAHPF_EN                         (0x1 << 11)
+#define RT5651_DAHPF_EN_SFT                     11
+#define RT5651_ADHPF_EN                         (0x1 << 10)
+#define RT5651_ADHPF_EN_SFT                     10
+
+/* Digital Microphone Control (0x75) */
+#define RT5651_DMIC_1_EN_MASK                   (0x1 << 15)
+#define RT5651_DMIC_1_EN_SFT                    15
+#define RT5651_DMIC_1_DIS                       (0x0 << 15)
+#define RT5651_DMIC_1_EN                        (0x1 << 15)
+#define RT5651_DMIC_1L_LH_MASK                  (0x1 << 13)
+#define RT5651_DMIC_1L_LH_SFT                   13
+#define RT5651_DMIC_1L_LH_FALLING               (0x0 << 13)
+#define RT5651_DMIC_1L_LH_RISING                (0x1 << 13)
+#define RT5651_DMIC_1R_LH_MASK                  (0x1 << 12)
+#define RT5651_DMIC_1R_LH_SFT                   12
+#define RT5651_DMIC_1R_LH_FALLING               (0x0 << 12)
+#define RT5651_DMIC_1R_LH_RISING                (0x1 << 12)
+#define RT5651_DMIC_1_DP_MASK                   (0x3 << 10)
+#define RT5651_DMIC_1_DP_SFT                    10
+#define RT5651_DMIC_1_DP_GPIO6                  (0x0 << 10)
+#define RT5651_DMIC_1_DP_IN1P                   (0x1 << 10)
+#define RT5651_DMIC_2_DP_GPIO8                  (0x2 << 10)
+#define RT5651_DMIC_CLK_MASK                    (0x7 << 5)
+#define RT5651_DMIC_CLK_SFT                     5
+
+/* TDM Control 1 (0x77) */
+#define RT5651_TDM_INTEL_SEL_MASK               (0x1 << 15)
+#define RT5651_TDM_INTEL_SEL_SFT                15
+#define RT5651_TDM_INTEL_SEL_64                 (0x0 << 15)
+#define RT5651_TDM_INTEL_SEL_50                 (0x1 << 15)
+#define RT5651_TDM_MODE_SEL_MASK                (0x1 << 14)
+#define RT5651_TDM_MODE_SEL_SFT                 14
+#define RT5651_TDM_MODE_SEL_NOR                 (0x0 << 14)
+#define RT5651_TDM_MODE_SEL_TDM                 (0x1 << 14)
+#define RT5651_TDM_CH_NUM_SEL_MASK              (0x3 << 12)
+#define RT5651_TDM_CH_NUM_SEL_SFT               12
+#define RT5651_TDM_CH_NUM_SEL_2                 (0x0 << 12)
+#define RT5651_TDM_CH_NUM_SEL_4                 (0x1 << 12)
+#define RT5651_TDM_CH_NUM_SEL_6                 (0x2 << 12)
+#define RT5651_TDM_CH_NUM_SEL_8                 (0x3 << 12)
+#define RT5651_TDM_CH_LEN_SEL_MASK              (0x3 << 10)
+#define RT5651_TDM_CH_LEN_SEL_SFT               10
+#define RT5651_TDM_CH_LEN_SEL_16                (0x0 << 10)
+#define RT5651_TDM_CH_LEN_SEL_20                (0x1 << 10)
+#define RT5651_TDM_CH_LEN_SEL_24                (0x2 << 10)
+#define RT5651_TDM_CH_LEN_SEL_32                (0x3 << 10)
+#define RT5651_TDM_ADC_SEL_MASK                 (0x1 << 9)
+#define RT5651_TDM_ADC_SEL_SFT                  9
+#define RT5651_TDM_ADC_SEL_NOR                  (0x0 << 9)
+#define RT5651_TDM_ADC_SEL_SWAP                 (0x1 << 9)
+#define RT5651_TDM_ADC_START_SEL_MASK           (0x1 << 8)
+#define RT5651_TDM_ADC_START_SEL_SFT            8
+#define RT5651_TDM_ADC_START_SEL_SL0            (0x0 << 8)
+#define RT5651_TDM_ADC_START_SEL_SL4            (0x1 << 8)
+#define RT5651_TDM_I2S_CH2_SEL_MASK             (0x3 << 6)
+#define RT5651_TDM_I2S_CH2_SEL_SFT              6
+#define RT5651_TDM_I2S_CH2_SEL_LR               (0x0 << 6)
+#define RT5651_TDM_I2S_CH2_SEL_RL               (0x1 << 6)
+#define RT5651_TDM_I2S_CH2_SEL_LL               (0x2 << 6)
+#define RT5651_TDM_I2S_CH2_SEL_RR               (0x3 << 6)
+#define RT5651_TDM_I2S_CH4_SEL_MASK             (0x3 << 4)
+#define RT5651_TDM_I2S_CH4_SEL_SFT              4
+#define RT5651_TDM_I2S_CH4_SEL_LR               (0x0 << 4)
+#define RT5651_TDM_I2S_CH4_SEL_RL               (0x1 << 4)
+#define RT5651_TDM_I2S_CH4_SEL_LL               (0x2 << 4)
+#define RT5651_TDM_I2S_CH4_SEL_RR               (0x3 << 4)
+#define RT5651_TDM_I2S_CH6_SEL_MASK             (0x3 << 2)
+#define RT5651_TDM_I2S_CH6_SEL_SFT              2
+#define RT5651_TDM_I2S_CH6_SEL_LR               (0x0 << 2)
+#define RT5651_TDM_I2S_CH6_SEL_RL               (0x1 << 2)
+#define RT5651_TDM_I2S_CH6_SEL_LL               (0x2 << 2)
+#define RT5651_TDM_I2S_CH6_SEL_RR               (0x3 << 2)
+#define RT5651_TDM_I2S_CH8_SEL_MASK             (0x3)
+#define RT5651_TDM_I2S_CH8_SEL_SFT              0
+#define RT5651_TDM_I2S_CH8_SEL_LR               (0x0)
+#define RT5651_TDM_I2S_CH8_SEL_RL               (0x1)
+#define RT5651_TDM_I2S_CH8_SEL_LL               (0x2)
+#define RT5651_TDM_I2S_CH8_SEL_RR               (0x3)
+
+/* TDM Control 2 (0x78) */
+#define RT5651_TDM_LRCK_POL_SEL_MASK            (0x1 << 15)
+#define RT5651_TDM_LRCK_POL_SEL_SFT             15
+#define RT5651_TDM_LRCK_POL_SEL_NOR             (0x0 << 15)
+#define RT5651_TDM_LRCK_POL_SEL_INV             (0x1 << 15)
+#define RT5651_TDM_CH_VAL_SEL_MASK              (0x1 << 14)
+#define RT5651_TDM_CH_VAL_SEL_SFT               14
+#define RT5651_TDM_CH_VAL_SEL_CH01              (0x0 << 14)
+#define RT5651_TDM_CH_VAL_SEL_CH0123            (0x1 << 14)
+#define RT5651_TDM_CH_VAL_EN                    (0x1 << 13)
+#define RT5651_TDM_CH_VAL_SFT                   13
+#define RT5651_TDM_LPBK_EN                      (0x1 << 12)
+#define RT5651_TDM_LPBK_SFT                     12
+#define RT5651_TDM_LRCK_PULSE_SEL_MASK          (0x1 << 11)
+#define RT5651_TDM_LRCK_PULSE_SEL_SFT           11
+#define RT5651_TDM_LRCK_PULSE_SEL_BCLK          (0x0 << 11)
+#define RT5651_TDM_LRCK_PULSE_SEL_CH            (0x1 << 11)
+#define RT5651_TDM_END_EDGE_SEL_MASK            (0x1 << 10)
+#define RT5651_TDM_END_EDGE_SEL_SFT             10
+#define RT5651_TDM_END_EDGE_SEL_POS             (0x0 << 10)
+#define RT5651_TDM_END_EDGE_SEL_NEG             (0x1 << 10)
+#define RT5651_TDM_END_EDGE_EN                  (0x1 << 9)
+#define RT5651_TDM_END_EDGE_EN_SFT              9
+#define RT5651_TDM_TRAN_EDGE_SEL_MASK           (0x1 << 8)
+#define RT5651_TDM_TRAN_EDGE_SEL_SFT            8
+#define RT5651_TDM_TRAN_EDGE_SEL_POS            (0x0 << 8)
+#define RT5651_TDM_TRAN_EDGE_SEL_NEG            (0x1 << 8)
+#define RT5651_M_TDM2_L                         (0x1 << 7)
+#define RT5651_M_TDM2_L_SFT                     7
+#define RT5651_M_TDM2_R                         (0x1 << 6)
+#define RT5651_M_TDM2_R_SFT                     6
+#define RT5651_M_TDM4_L                         (0x1 << 5)
+#define RT5651_M_TDM4_L_SFT                     5
+#define RT5651_M_TDM4_R                         (0x1 << 4)
+#define RT5651_M_TDM4_R_SFT                     4
+
+/* TDM Control 3 (0x79) */
+#define RT5651_CH2_L_SEL_MASK                   (0x7 << 12)
+#define RT5651_CH2_L_SEL_SFT                    12
+#define RT5651_CH2_L_SEL_SL0                    (0x0 << 12)
+#define RT5651_CH2_L_SEL_SL1                    (0x1 << 12)
+#define RT5651_CH2_L_SEL_SL2                    (0x2 << 12)
+#define RT5651_CH2_L_SEL_SL3                    (0x3 << 12)
+#define RT5651_CH2_L_SEL_SL4                    (0x4 << 12)
+#define RT5651_CH2_L_SEL_SL5                    (0x5 << 12)
+#define RT5651_CH2_L_SEL_SL6                    (0x6 << 12)
+#define RT5651_CH2_L_SEL_SL7                    (0x7 << 12)
+#define RT5651_CH2_R_SEL_MASK                   (0x7 << 8)
+#define RT5651_CH2_R_SEL_SFT                    8
+#define RT5651_CH2_R_SEL_SL0                    (0x0 << 8)
+#define RT5651_CH2_R_SEL_SL1                    (0x1 << 8)
+#define RT5651_CH2_R_SEL_SL2                    (0x2 << 8)
+#define RT5651_CH2_R_SEL_SL3                    (0x3 << 8)
+#define RT5651_CH2_R_SEL_SL4                    (0x4 << 8)
+#define RT5651_CH2_R_SEL_SL5                    (0x5 << 8)
+#define RT5651_CH2_R_SEL_SL6                    (0x6 << 8)
+#define RT5651_CH2_R_SEL_SL7                    (0x7 << 8)
+#define RT5651_CH4_L_SEL_MASK                   (0x7 << 4)
+#define RT5651_CH4_L_SEL_SFT                    4
+#define RT5651_CH4_L_SEL_SL0                    (0x0 << 4)
+#define RT5651_CH4_L_SEL_SL1                    (0x1 << 4)
+#define RT5651_CH4_L_SEL_SL2                    (0x2 << 4)
+#define RT5651_CH4_L_SEL_SL3                    (0x3 << 4)
+#define RT5651_CH4_L_SEL_SL4                    (0x4 << 4)
+#define RT5651_CH4_L_SEL_SL5                    (0x5 << 4)
+#define RT5651_CH4_L_SEL_SL6                    (0x6 << 4)
+#define RT5651_CH4_L_SEL_SL7                    (0x7 << 4)
+#define RT5651_CH4_R_SEL_MASK                   (0x7)
+#define RT5651_CH4_R_SEL_SFT                    0
+#define RT5651_CH4_R_SEL_SL0                    (0x0)
+#define RT5651_CH4_R_SEL_SL1                    (0x1)
+#define RT5651_CH4_R_SEL_SL2                    (0x2)
+#define RT5651_CH4_R_SEL_SL3                    (0x3)
+#define RT5651_CH4_R_SEL_SL4                    (0x4)
+#define RT5651_CH4_R_SEL_SL5                    (0x5)
+#define RT5651_CH4_R_SEL_SL6                    (0x6)
+#define RT5651_CH4_R_SEL_SL7                    (0x7)
+
+/* Global Clock Control (0x80) */
+#define RT5651_SCLK_SRC_MASK                    (0x3 << 14)
+#define RT5651_SCLK_SRC_SFT                     14
+#define RT5651_SCLK_SRC_MCLK                    (0x0 << 14)
+#define RT5651_SCLK_SRC_PLL1                    (0x1 << 14)
+#define RT5651_SCLK_SRC_RCCLK                   (0x2 << 14)
+#define RT5651_PLL1_SRC_MASK                    (0x3 << 12)
+#define RT5651_PLL1_SRC_SFT                     12
+#define RT5651_PLL1_SRC_MCLK                    (0x0 << 12)
+#define RT5651_PLL1_SRC_BCLK1                   (0x1 << 12)
+#define RT5651_PLL1_SRC_BCLK2                   (0x2 << 12)
+#define RT5651_PLL1_PD_MASK                     (0x1 << 3)
+#define RT5651_PLL1_PD_SFT                      3
+#define RT5651_PLL1_PD_1                        (0x0 << 3)
+#define RT5651_PLL1_PD_2                        (0x1 << 3)
+
+#define RT5651_PLL_INP_MAX                      40000000
+#define RT5651_PLL_INP_MIN                      256000
+/* PLL M/N/K Code Control 1 (0x81) */
+#define RT5651_PLL_N_MAX                        0x1ff
+#define RT5651_PLL_N_MASK                       (RT5651_PLL_N_MAX << 7)
+#define RT5651_PLL_N_SFT                        7
+#define RT5651_PLL_K_MAX                        0x1f
+#define RT5651_PLL_K_MASK                       (RT5651_PLL_K_MAX)
+#define RT5651_PLL_K_SFT                        0
+
+/* PLL M/N/K Code Control 2 (0x82) */
+#define RT5651_PLL_M_MAX                        0xf
+#define RT5651_PLL_M_MASK                       (RT5651_PLL_M_MAX << 12)
+#define RT5651_PLL_M_SFT                        12
+#define RT5651_PLL_M_BP                         (0x1 << 11)
+#define RT5651_PLL_M_BP_SFT                     11
+
+/* PLL tracking mode 1 (0x83) */
+#define RT5651_STO1_T_MASK                      (0x1 << 15)
+#define RT5651_STO1_T_SFT                       15
+#define RT5651_STO1_T_SCLK                      (0x0 << 15)
+#define RT5651_STO1_T_LRCK1                     (0x1 << 15)
+#define RT5651_STO2_T_MASK                      (0x1 << 12)
+#define RT5651_STO2_T_SFT                       12
+#define RT5651_STO2_T_I2S2                      (0x0 << 12)
+#define RT5651_STO2_T_LRCK2                     (0x1 << 12)
+#define RT5651_ASRC2_REF_MASK                   (0x1 << 11)
+#define RT5651_ASRC2_REF_SFT                    11
+#define RT5651_ASRC2_REF_LRCK2                  (0x0 << 11)
+#define RT5651_ASRC2_REF_LRCK1                  (0x1 << 11)
+#define RT5651_DMIC_1_M_MASK                    (0x1 << 9)
+#define RT5651_DMIC_1_M_SFT                     9
+#define RT5651_DMIC_1_M_NOR                     (0x0 << 9)
+#define RT5651_DMIC_1_M_ASYN                    (0x1 << 9)
+
+/* PLL tracking mode 2 (0x84) */
+#define RT5651_STO1_ASRC_EN                     (0x1 << 15)
+#define RT5651_STO1_ASRC_EN_SFT                 15
+#define RT5651_STO2_ASRC_EN                     (0x1 << 14)
+#define RT5651_STO2_ASRC_EN_SFT                 14
+#define RT5651_STO1_DAC_M_MASK                  (0x1 << 13)
+#define RT5651_STO1_DAC_M_SFT                   13
+#define RT5651_STO1_DAC_M_NOR                   (0x0 << 13)
+#define RT5651_STO1_DAC_M_ASRC                  (0x1 << 13)
+#define RT5651_STO2_DAC_M_MASK                  (0x1 << 12)
+#define RT5651_STO2_DAC_M_SFT                   12
+#define RT5651_STO2_DAC_M_NOR                   (0x0 << 12)
+#define RT5651_STO2_DAC_M_ASRC                  (0x1 << 12)
+#define RT5651_ADC_M_MASK                       (0x1 << 11)
+#define RT5651_ADC_M_SFT                        11
+#define RT5651_ADC_M_NOR                        (0x0 << 11)
+#define RT5651_ADC_M_ASRC                       (0x1 << 11)
+#define RT5651_I2S1_R_D_MASK                    (0x1 << 4)
+#define RT5651_I2S1_R_D_SFT                     4
+#define RT5651_I2S1_R_D_DIS                     (0x0 << 4)
+#define RT5651_I2S1_R_D_EN                      (0x1 << 4)
+#define RT5651_I2S2_R_D_MASK                    (0x1 << 3)
+#define RT5651_I2S2_R_D_SFT                     3
+#define RT5651_I2S2_R_D_DIS                     (0x0 << 3)
+#define RT5651_I2S2_R_D_EN                      (0x1 << 3)
+#define RT5651_PRE_SCLK_MASK                    (0x3)
+#define RT5651_PRE_SCLK_SFT                     0
+#define RT5651_PRE_SCLK_512                     (0x0)
+#define RT5651_PRE_SCLK_1024                    (0x1)
+#define RT5651_PRE_SCLK_2048                    (0x2)
+
+/* PLL tracking mode 3 (0x85) */
+#define RT5651_I2S1_RATE_MASK                   (0xf << 12)
+#define RT5651_I2S1_RATE_SFT                    12
+#define RT5651_I2S2_RATE_MASK                   (0xf << 8)
+#define RT5651_I2S2_RATE_SFT                    8
+#define RT5651_G_ASRC_LP_MASK                   (0x1 << 3)
+#define RT5651_G_ASRC_LP_SFT                    3
+#define RT5651_ASRC_LP_F_M                      (0x1 << 2)
+#define RT5651_ASRC_LP_F_SFT                    2
+#define RT5651_ASRC_LP_F_NOR                    (0x0 << 2)
+#define RT5651_ASRC_LP_F_SB                     (0x1 << 2)
+#define RT5651_FTK_PH_DET_MASK                  (0x3)
+#define RT5651_FTK_PH_DET_SFT                   0
+#define RT5651_FTK_PH_DET_DIV1                  (0x0)
+#define RT5651_FTK_PH_DET_DIV2                  (0x1)
+#define RT5651_FTK_PH_DET_DIV4                  (0x2)
+#define RT5651_FTK_PH_DET_DIV8                  (0x3)
+
+/*PLL tracking mode 6 (0x89) */
+#define RT5651_I2S1_PD_MASK                     (0x7 << 12)
+#define RT5651_I2S1_PD_SFT                      12
+#define RT5651_I2S2_PD_MASK                     (0x7 << 8)
+#define RT5651_I2S2_PD_SFT                      8
+
+/*PLL tracking mode 7 (0x8a) */
+#define RT5651_FSI1_RATE_MASK                   (0xf << 12)
+#define RT5651_FSI1_RATE_SFT                    12
+#define RT5651_FSI2_RATE_MASK                   (0xf << 8)
+#define RT5651_FSI2_RATE_SFT                    8
+
+/* HPOUT Over Current Detection (0x8b) */
+#define RT5651_HP_OVCD_MASK                     (0x1 << 10)
+#define RT5651_HP_OVCD_SFT                      10
+#define RT5651_HP_OVCD_DIS                      (0x0 << 10)
+#define RT5651_HP_OVCD_EN                       (0x1 << 10)
+#define RT5651_HP_OC_TH_MASK                    (0x3 << 8)
+#define RT5651_HP_OC_TH_SFT                     8
+#define RT5651_HP_OC_TH_90                      (0x0 << 8)
+#define RT5651_HP_OC_TH_105                     (0x1 << 8)
+#define RT5651_HP_OC_TH_120                     (0x2 << 8)
+#define RT5651_HP_OC_TH_135                     (0x3 << 8)
+
+/* Depop Mode Control 1 (0x8e) */
+#define RT5651_SMT_TRIG_MASK                    (0x1 << 15)
+#define RT5651_SMT_TRIG_SFT                     15
+#define RT5651_SMT_TRIG_DIS                     (0x0 << 15)
+#define RT5651_SMT_TRIG_EN                      (0x1 << 15)
+#define RT5651_HP_L_SMT_MASK                    (0x1 << 9)
+#define RT5651_HP_L_SMT_SFT                     9
+#define RT5651_HP_L_SMT_DIS                     (0x0 << 9)
+#define RT5651_HP_L_SMT_EN                      (0x1 << 9)
+#define RT5651_HP_R_SMT_MASK                    (0x1 << 8)
+#define RT5651_HP_R_SMT_SFT                     8
+#define RT5651_HP_R_SMT_DIS                     (0x0 << 8)
+#define RT5651_HP_R_SMT_EN                      (0x1 << 8)
+#define RT5651_HP_CD_PD_MASK                    (0x1 << 7)
+#define RT5651_HP_CD_PD_SFT                     7
+#define RT5651_HP_CD_PD_DIS                     (0x0 << 7)
+#define RT5651_HP_CD_PD_EN                      (0x1 << 7)
+#define RT5651_RSTN_MASK                        (0x1 << 6)
+#define RT5651_RSTN_SFT                         6
+#define RT5651_RSTN_DIS                         (0x0 << 6)
+#define RT5651_RSTN_EN                          (0x1 << 6)
+#define RT5651_RSTP_MASK                        (0x1 << 5)
+#define RT5651_RSTP_SFT                         5
+#define RT5651_RSTP_DIS                         (0x0 << 5)
+#define RT5651_RSTP_EN                          (0x1 << 5)
+#define RT5651_HP_CO_MASK                       (0x1 << 4)
+#define RT5651_HP_CO_SFT                        4
+#define RT5651_HP_CO_DIS                        (0x0 << 4)
+#define RT5651_HP_CO_EN                         (0x1 << 4)
+#define RT5651_HP_CP_MASK                       (0x1 << 3)
+#define RT5651_HP_CP_SFT                        3
+#define RT5651_HP_CP_PD                         (0x0 << 3)
+#define RT5651_HP_CP_PU                         (0x1 << 3)
+#define RT5651_HP_SG_MASK                       (0x1 << 2)
+#define RT5651_HP_SG_SFT                        2
+#define RT5651_HP_SG_DIS                        (0x0 << 2)
+#define RT5651_HP_SG_EN                         (0x1 << 2)
+#define RT5651_HP_DP_MASK                       (0x1 << 1)
+#define RT5651_HP_DP_SFT                        1
+#define RT5651_HP_DP_PD                         (0x0 << 1)
+#define RT5651_HP_DP_PU                         (0x1 << 1)
+#define RT5651_HP_CB_MASK                       (0x1)
+#define RT5651_HP_CB_SFT                        0
+#define RT5651_HP_CB_PD                         (0x0)
+#define RT5651_HP_CB_PU                         (0x1)
+
+/* Depop Mode Control 2 (0x8f) */
+#define RT5651_DEPOP_MASK                       (0x1 << 13)
+#define RT5651_DEPOP_SFT                        13
+#define RT5651_DEPOP_AUTO                       (0x0 << 13)
+#define RT5651_DEPOP_MAN                        (0x1 << 13)
+#define RT5651_RAMP_MASK                        (0x1 << 12)
+#define RT5651_RAMP_SFT                         12
+#define RT5651_RAMP_DIS                         (0x0 << 12)
+#define RT5651_RAMP_EN                          (0x1 << 12)
+#define RT5651_BPS_MASK                         (0x1 << 11)
+#define RT5651_BPS_SFT                          11
+#define RT5651_BPS_DIS                          (0x0 << 11)
+#define RT5651_BPS_EN                           (0x1 << 11)
+#define RT5651_FAST_UPDN_MASK                   (0x1 << 10)
+#define RT5651_FAST_UPDN_SFT                    10
+#define RT5651_FAST_UPDN_DIS                    (0x0 << 10)
+#define RT5651_FAST_UPDN_EN                     (0x1 << 10)
+#define RT5651_MRES_MASK                        (0x3 << 8)
+#define RT5651_MRES_SFT                         8
+#define RT5651_MRES_15MO                        (0x0 << 8)
+#define RT5651_MRES_25MO                        (0x1 << 8)
+#define RT5651_MRES_35MO                        (0x2 << 8)
+#define RT5651_MRES_45MO                        (0x3 << 8)
+#define RT5651_VLO_MASK                         (0x1 << 7)
+#define RT5651_VLO_SFT                          7
+#define RT5651_VLO_3V                           (0x0 << 7)
+#define RT5651_VLO_32V                          (0x1 << 7)
+#define RT5651_DIG_DP_MASK                      (0x1 << 6)
+#define RT5651_DIG_DP_SFT                       6
+#define RT5651_DIG_DP_DIS                       (0x0 << 6)
+#define RT5651_DIG_DP_EN                        (0x1 << 6)
+#define RT5651_DP_TH_MASK                       (0x3 << 4)
+#define RT5651_DP_TH_SFT                        4
+
+/* Depop Mode Control 3 (0x90) */
+#define RT5651_CP_SYS_MASK                      (0x7 << 12)
+#define RT5651_CP_SYS_SFT                       12
+#define RT5651_CP_FQ1_MASK                      (0x7 << 8)
+#define RT5651_CP_FQ1_SFT                       8
+#define RT5651_CP_FQ2_MASK                      (0x7 << 4)
+#define RT5651_CP_FQ2_SFT                       4
+#define RT5651_CP_FQ3_MASK                      (0x7)
+#define RT5651_CP_FQ3_SFT                       0
+#define RT5651_CP_FQ_1_5_KHZ                    0
+#define RT5651_CP_FQ_3_KHZ                      1
+#define RT5651_CP_FQ_6_KHZ                      2
+#define RT5651_CP_FQ_12_KHZ                     3
+#define RT5651_CP_FQ_24_KHZ                     4
+#define RT5651_CP_FQ_48_KHZ                     5
+#define RT5651_CP_FQ_96_KHZ                     6
+#define RT5651_CP_FQ_192_KHZ                    7
+
+/* HPOUT charge pump (0x91) */
+#define RT5651_OSW_L_MASK                       (0x1 << 11)
+#define RT5651_OSW_L_SFT                        11
+#define RT5651_OSW_L_DIS                        (0x0 << 11)
+#define RT5651_OSW_L_EN                         (0x1 << 11)
+#define RT5651_OSW_R_MASK                       (0x1 << 10)
+#define RT5651_OSW_R_SFT                        10
+#define RT5651_OSW_R_DIS                        (0x0 << 10)
+#define RT5651_OSW_R_EN                         (0x1 << 10)
+#define RT5651_PM_HP_MASK                       (0x3 << 8)
+#define RT5651_PM_HP_SFT                        8
+#define RT5651_PM_HP_LV                         (0x0 << 8)
+#define RT5651_PM_HP_MV                         (0x1 << 8)
+#define RT5651_PM_HP_HV                         (0x2 << 8)
+#define RT5651_IB_HP_MASK                       (0x3 << 6)
+#define RT5651_IB_HP_SFT                        6
+#define RT5651_IB_HP_125IL                      (0x0 << 6)
+#define RT5651_IB_HP_25IL                       (0x1 << 6)
+#define RT5651_IB_HP_5IL                        (0x2 << 6)
+#define RT5651_IB_HP_1IL                        (0x3 << 6)
+
+/* Micbias Control (0x93) */
+#define RT5651_MIC1_BS_MASK                     (0x1 << 15)
+#define RT5651_MIC1_BS_SFT                      15
+#define RT5651_MIC1_BS_9AV                      (0x0 << 15)
+#define RT5651_MIC1_BS_75AV                     (0x1 << 15)
+#define RT5651_MIC1_CLK_MASK                    (0x1 << 13)
+#define RT5651_MIC1_CLK_SFT                     13
+#define RT5651_MIC1_CLK_DIS                     (0x0 << 13)
+#define RT5651_MIC1_CLK_EN                      (0x1 << 13)
+#define RT5651_MIC1_OVCD_MASK                   (0x1 << 11)
+#define RT5651_MIC1_OVCD_SFT                    11
+#define RT5651_MIC1_OVCD_DIS                    (0x0 << 11)
+#define RT5651_MIC1_OVCD_EN                     (0x1 << 11)
+#define RT5651_MIC1_OVTH_MASK                   (0x3 << 9)
+#define RT5651_MIC1_OVTH_SFT                    9
+#define RT5651_MIC1_OVTH_600UA                  (0x0 << 9)
+#define RT5651_MIC1_OVTH_1500UA                 (0x1 << 9)
+#define RT5651_MIC1_OVTH_2000UA                 (0x2 << 9)
+#define RT5651_PWR_MB_MASK                      (0x1 << 5)
+#define RT5651_PWR_MB_SFT                       5
+#define RT5651_PWR_MB_PD                        (0x0 << 5)
+#define RT5651_PWR_MB_PU                        (0x1 << 5)
+#define RT5651_PWR_CLK12M_MASK                  (0x1 << 4)
+#define RT5651_PWR_CLK12M_SFT                   4
+#define RT5651_PWR_CLK12M_PD                    (0x0 << 4)
+#define RT5651_PWR_CLK12M_PU                    (0x1 << 4)
+
+/* Analog JD Control 1 (0x94) */
+#define RT5651_JD2_CMP_MASK                     (0x7 << 12)
+#define RT5651_JD2_CMP_SFT                      12
+#define RT5651_JD_PU                            (0x1 << 11)
+#define RT5651_JD_PU_SFT                        11
+#define RT5651_JD_PD                            (0x1 << 10)
+#define RT5651_JD_PD_SFT                        10
+#define RT5651_JD_MODE_SEL_MASK                 (0x3 << 8)
+#define RT5651_JD_MODE_SEL_SFT                  8
+#define RT5651_JD_MODE_SEL_M0                   (0x0 << 8)
+#define RT5651_JD_MODE_SEL_M1                   (0x1 << 8)
+#define RT5651_JD_MODE_SEL_M2                   (0x2 << 8)
+#define RT5651_JD_M_CMP                         (0x7 << 4)
+#define RT5651_JD_M_CMP_SFT                     4
+#define RT5651_JD_M_PU                          (0x1 << 3)
+#define RT5651_JD_M_PU_SFT                      3
+#define RT5651_JD_M_PD                          (0x1 << 2)
+#define RT5651_JD_M_PD_SFT                      2
+#define RT5651_JD_M_MODE_SEL_MASK               (0x3)
+#define RT5651_JD_M_MODE_SEL_SFT                0
+#define RT5651_JD_M_MODE_SEL_M0                 (0x0)
+#define RT5651_JD_M_MODE_SEL_M1                 (0x1)
+#define RT5651_JD_M_MODE_SEL_M2                 (0x2)
+
+/* Analog JD Control 2 (0x95) */
+#define RT5651_JD3_CMP_MASK                     (0x7 << 12)
+#define RT5651_JD3_CMP_SFT                      12
+
+/* EQ Control 1 (0xb0) */
+#define RT5651_EQ_SRC_MASK                      (0x1 << 15)
+#define RT5651_EQ_SRC_SFT                       15
+#define RT5651_EQ_SRC_DAC                       (0x0 << 15)
+#define RT5651_EQ_SRC_ADC                       (0x1 << 15)
+#define RT5651_EQ_UPD                           (0x1 << 14)
+#define RT5651_EQ_UPD_BIT                       14
+#define RT5651_EQ_CD_MASK                       (0x1 << 13)
+#define RT5651_EQ_CD_SFT                        13
+#define RT5651_EQ_CD_DIS                        (0x0 << 13)
+#define RT5651_EQ_CD_EN                         (0x1 << 13)
+#define RT5651_EQ_DITH_MASK                     (0x3 << 8)
+#define RT5651_EQ_DITH_SFT                      8
+#define RT5651_EQ_DITH_NOR                      (0x0 << 8)
+#define RT5651_EQ_DITH_LSB                      (0x1 << 8)
+#define RT5651_EQ_DITH_LSB_1                    (0x2 << 8)
+#define RT5651_EQ_DITH_LSB_2                    (0x3 << 8)
+#define RT5651_EQ_CD_F                          (0x1 << 7)
+#define RT5651_EQ_CD_F_BIT                      7
+#define RT5651_EQ_STA_HP2                       (0x1 << 6)
+#define RT5651_EQ_STA_HP2_BIT                   6
+#define RT5651_EQ_STA_HP1                       (0x1 << 5)
+#define RT5651_EQ_STA_HP1_BIT                   5
+#define RT5651_EQ_STA_BP4                       (0x1 << 4)
+#define RT5651_EQ_STA_BP4_BIT                   4
+#define RT5651_EQ_STA_BP3                       (0x1 << 3)
+#define RT5651_EQ_STA_BP3_BIT                   3
+#define RT5651_EQ_STA_BP2                       (0x1 << 2)
+#define RT5651_EQ_STA_BP2_BIT                   2
+#define RT5651_EQ_STA_BP1                       (0x1 << 1)
+#define RT5651_EQ_STA_BP1_BIT                   1
+#define RT5651_EQ_STA_LP                        (0x1)
+#define RT5651_EQ_STA_LP_BIT                    0
+
+/* EQ Control 2 (0xb1) */
+#define RT5651_EQ_HPF1_M_MASK                   (0x1 << 8)
+#define RT5651_EQ_HPF1_M_SFT                    8
+#define RT5651_EQ_HPF1_M_HI                     (0x0 << 8)
+#define RT5651_EQ_HPF1_M_1ST                    (0x1 << 8)
+#define RT5651_EQ_LPF1_M_MASK                   (0x1 << 7)
+#define RT5651_EQ_LPF1_M_SFT                    7
+#define RT5651_EQ_LPF1_M_LO                     (0x0 << 7)
+#define RT5651_EQ_LPF1_M_1ST                    (0x1 << 7)
+#define RT5651_EQ_HPF2_MASK                     (0x1 << 6)
+#define RT5651_EQ_HPF2_SFT                      6
+#define RT5651_EQ_HPF2_DIS                      (0x0 << 6)
+#define RT5651_EQ_HPF2_EN                       (0x1 << 6)
+#define RT5651_EQ_HPF1_MASK                     (0x1 << 5)
+#define RT5651_EQ_HPF1_SFT                      5
+#define RT5651_EQ_HPF1_DIS                      (0x0 << 5)
+#define RT5651_EQ_HPF1_EN                       (0x1 << 5)
+#define RT5651_EQ_BPF4_MASK                     (0x1 << 4)
+#define RT5651_EQ_BPF4_SFT                      4
+#define RT5651_EQ_BPF4_DIS                      (0x0 << 4)
+#define RT5651_EQ_BPF4_EN                       (0x1 << 4)
+#define RT5651_EQ_BPF3_MASK                     (0x1 << 3)
+#define RT5651_EQ_BPF3_SFT                      3
+#define RT5651_EQ_BPF3_DIS                      (0x0 << 3)
+#define RT5651_EQ_BPF3_EN                       (0x1 << 3)
+#define RT5651_EQ_BPF2_MASK                     (0x1 << 2)
+#define RT5651_EQ_BPF2_SFT                      2
+#define RT5651_EQ_BPF2_DIS                      (0x0 << 2)
+#define RT5651_EQ_BPF2_EN                       (0x1 << 2)
+#define RT5651_EQ_BPF1_MASK                     (0x1 << 1)
+#define RT5651_EQ_BPF1_SFT                      1
+#define RT5651_EQ_BPF1_DIS                      (0x0 << 1)
+#define RT5651_EQ_BPF1_EN                       (0x1 << 1)
+#define RT5651_EQ_LPF_MASK                      (0x1)
+#define RT5651_EQ_LPF_SFT                       0
+#define RT5651_EQ_LPF_DIS                       (0x0)
+#define RT5651_EQ_LPF_EN                        (0x1)
+#define RT5651_EQ_CTRL_MASK                     (0x7f)
+
+/* Memory Test (0xb2) */
+#define RT5651_MT_MASK                          (0x1 << 15)
+#define RT5651_MT_SFT                           15
+#define RT5651_MT_DIS                           (0x0 << 15)
+#define RT5651_MT_EN                            (0x1 << 15)
+
+/* ALC Control 1 (0xb4) */
+#define RT5651_ALC_P_MASK                       (0x1 << 15)
+#define RT5651_ALC_P_SFT                        15
+#define RT5651_ALC_P_DAC                        (0x0 << 15)
+#define RT5651_ALC_P_ADC                        (0x1 << 15)
+#define RT5651_ALC_MASK                         (0x1 << 14)
+#define RT5651_ALC_SFT                          14
+#define RT5651_ALC_DIS                          (0x0 << 14)
+#define RT5651_ALC_EN                           (0x1 << 14)
+#define RT5651_ALC_UPD                          (0x1 << 13)
+#define RT5651_ALC_UPD_BIT                      13
+#define RT5651_ALC_AR_MASK                      (0x1f << 8)
+#define RT5651_ALC_AR_SFT                       8
+#define RT5651_ALC_R_MASK                       (0x7 << 5)
+#define RT5651_ALC_R_SFT                        5
+#define RT5651_ALC_R_48K                        (0x1 << 5)
+#define RT5651_ALC_R_96K                        (0x2 << 5)
+#define RT5651_ALC_R_192K                       (0x3 << 5)
+#define RT5651_ALC_R_441K                       (0x5 << 5)
+#define RT5651_ALC_R_882K                       (0x6 << 5)
+#define RT5651_ALC_R_1764K                      (0x7 << 5)
+#define RT5651_ALC_RC_MASK                      (0x1f)
+#define RT5651_ALC_RC_SFT                       0
+
+/* ALC Control 2 (0xb5) */
+#define RT5651_ALC_POB_MASK                     (0x3f << 8)
+#define RT5651_ALC_POB_SFT                      8
+#define RT5651_ALC_DRC_MASK                     (0x1 << 7)
+#define RT5651_ALC_DRC_SFT                      7
+#define RT5651_ALC_DRC_DIS                      (0x0 << 7)
+#define RT5651_ALC_DRC_EN                       (0x1 << 7)
+#define RT5651_ALC_CPR_MASK                     (0x3 << 5)
+#define RT5651_ALC_CPR_SFT                      5
+#define RT5651_ALC_CPR_1_1                      (0x0 << 5)
+#define RT5651_ALC_CPR_1_2                      (0x1 << 5)
+#define RT5651_ALC_CPR_1_4                      (0x2 << 5)
+#define RT5651_ALC_CPR_1_8                      (0x3 << 5)
+#define RT5651_ALC_PRB_MASK                     (0x1f)
+#define RT5651_ALC_PRB_SFT                      0
+
+/* ALC Control 3 (0xb6) */
+#define RT5651_ALC_NGB_MASK                     (0xf << 12)
+#define RT5651_ALC_NGB_SFT                      12
+#define RT5651_ALC_TAR_MASK                     (0x1f << 7)
+#define RT5651_ALC_TAR_SFT                      7
+#define RT5651_ALC_NG_MASK                      (0x1 << 6)
+#define RT5651_ALC_NG_SFT                       6
+#define RT5651_ALC_NG_DIS                       (0x0 << 6)
+#define RT5651_ALC_NG_EN                        (0x1 << 6)
+#define RT5651_ALC_NGH_MASK                     (0x1 << 5)
+#define RT5651_ALC_NGH_SFT                      5
+#define RT5651_ALC_NGH_DIS                      (0x0 << 5)
+#define RT5651_ALC_NGH_EN                       (0x1 << 5)
+#define RT5651_ALC_NGT_MASK                     (0x1f)
+#define RT5651_ALC_NGT_SFT                      0
+
+/* Jack Detect Control 1 (0xbb) */
+#define RT5651_JD_MASK                          (0x7 << 13)
+#define RT5651_JD_SFT                           13
+#define RT5651_JD_DIS                           (0x0 << 13)
+#define RT5651_JD_GPIO1                         (0x1 << 13)
+#define RT5651_JD_GPIO2                         (0x2 << 13)
+#define RT5651_JD_GPIO3                         (0x3 << 13)
+#define RT5651_JD_GPIO4                         (0x4 << 13)
+#define RT5651_JD_GPIO5                         (0x5 << 13)
+#define RT5651_JD_GPIO6                         (0x6 << 13)
+#define RT5651_JD_HP_MASK                       (0x1 << 11)
+#define RT5651_JD_HP_SFT                        11
+#define RT5651_JD_HP_DIS                        (0x0 << 11)
+#define RT5651_JD_HP_EN                         (0x1 << 11)
+#define RT5651_JD_HP_TRG_MASK                   (0x1 << 10)
+#define RT5651_JD_HP_TRG_SFT                    10
+#define RT5651_JD_HP_TRG_LO                     (0x0 << 10)
+#define RT5651_JD_HP_TRG_HI                     (0x1 << 10)
+#define RT5651_JD_SPL_MASK                      (0x1 << 9)
+#define RT5651_JD_SPL_SFT                       9
+#define RT5651_JD_SPL_DIS                       (0x0 << 9)
+#define RT5651_JD_SPL_EN                        (0x1 << 9)
+#define RT5651_JD_SPL_TRG_MASK                  (0x1 << 8)
+#define RT5651_JD_SPL_TRG_SFT                   8
+#define RT5651_JD_SPL_TRG_LO                    (0x0 << 8)
+#define RT5651_JD_SPL_TRG_HI                    (0x1 << 8)
+#define RT5651_JD_SPR_MASK                      (0x1 << 7)
+#define RT5651_JD_SPR_SFT                       7
+#define RT5651_JD_SPR_DIS                       (0x0 << 7)
+#define RT5651_JD_SPR_EN                        (0x1 << 7)
+#define RT5651_JD_SPR_TRG_MASK                  (0x1 << 6)
+#define RT5651_JD_SPR_TRG_SFT                   6
+#define RT5651_JD_SPR_TRG_LO                    (0x0 << 6)
+#define RT5651_JD_SPR_TRG_HI                    (0x1 << 6)
+#define RT5651_JD_LO_MASK                       (0x1 << 3)
+#define RT5651_JD_LO_SFT                        3
+#define RT5651_JD_LO_DIS                        (0x0 << 3)
+#define RT5651_JD_LO_EN                         (0x1 << 3)
+#define RT5651_JD_LO_TRG_MASK                   (0x1 << 2)
+#define RT5651_JD_LO_TRG_SFT                    2
+#define RT5651_JD_LO_TRG_LO                     (0x0 << 2)
+#define RT5651_JD_LO_TRG_HI                     (0x1 << 2)
+
+/* Jack Detect Control 2 (0xbc) */
+#define RT5651_JD_TRG_SEL_MASK                  (0x7 << 9)
+#define RT5651_JD_TRG_SEL_SFT                   9
+#define RT5651_JD_TRG_SEL_GPIO                  (0x0 << 9)
+#define RT5651_JD_TRG_SEL_JD1_1                 (0x1 << 9)
+#define RT5651_JD_TRG_SEL_JD1_2                 (0x2 << 9)
+#define RT5651_JD_TRG_SEL_JD2                   (0x3 << 9)
+#define RT5651_JD_TRG_SEL_JD3                   (0x4 << 9)
+#define RT5651_JD3_IRQ_EN                       (0x1 << 8)
+#define RT5651_JD3_IRQ_EN_SFT                   8
+#define RT5651_JD3_EN_STKY                      (0x1 << 7)
+#define RT5651_JD3_EN_STKY_SFT                  7
+#define RT5651_JD3_INV                          (0x1 << 6)
+#define RT5651_JD3_INV_SFT                      6
+
+/* IRQ Control 1 (0xbd) */
+#define RT5651_IRQ_JD_MASK                      (0x1 << 15)
+#define RT5651_IRQ_JD_SFT                       15
+#define RT5651_IRQ_JD_BP                        (0x0 << 15)
+#define RT5651_IRQ_JD_NOR                       (0x1 << 15)
+#define RT5651_JD_STKY_MASK                     (0x1 << 13)
+#define RT5651_JD_STKY_SFT                      13
+#define RT5651_JD_STKY_DIS                      (0x0 << 13)
+#define RT5651_JD_STKY_EN                       (0x1 << 13)
+#define RT5651_JD_P_MASK                        (0x1 << 11)
+#define RT5651_JD_P_SFT                         11
+#define RT5651_JD_P_NOR                         (0x0 << 11)
+#define RT5651_JD_P_INV                         (0x1 << 11)
+#define RT5651_JD1_1_IRQ_EN                     (0x1 << 9)
+#define RT5651_JD1_1_IRQ_EN_SFT                 9
+#define RT5651_JD1_1_EN_STKY                    (0x1 << 8)
+#define RT5651_JD1_1_EN_STKY_SFT                        8
+#define RT5651_JD1_1_INV                        (0x1 << 7)
+#define RT5651_JD1_1_INV_SFT                    7
+#define RT5651_JD1_2_IRQ_EN                     (0x1 << 6)
+#define RT5651_JD1_2_IRQ_EN_SFT                 6
+#define RT5651_JD1_2_EN_STKY                    (0x1 << 5)
+#define RT5651_JD1_2_EN_STKY_SFT                        5
+#define RT5651_JD1_2_INV                        (0x1 << 4)
+#define RT5651_JD1_2_INV_SFT                    4
+#define RT5651_JD2_IRQ_EN                       (0x1 << 3)
+#define RT5651_JD2_IRQ_EN_SFT                   3
+#define RT5651_JD2_EN_STKY                      (0x1 << 2)
+#define RT5651_JD2_EN_STKY_SFT                  2
+#define RT5651_JD2_INV                          (0x1 << 1)
+#define RT5651_JD2_INV_SFT                      1
+
+/* IRQ Control 2 (0xbe) */
+#define RT5651_IRQ_MB1_OC_MASK                  (0x1 << 15)
+#define RT5651_IRQ_MB1_OC_SFT                   15
+#define RT5651_IRQ_MB1_OC_BP                    (0x0 << 15)
+#define RT5651_IRQ_MB1_OC_NOR                   (0x1 << 15)
+#define RT5651_MB1_OC_STKY_MASK                 (0x1 << 11)
+#define RT5651_MB1_OC_STKY_SFT                  11
+#define RT5651_MB1_OC_STKY_DIS                  (0x0 << 11)
+#define RT5651_MB1_OC_STKY_EN                   (0x1 << 11)
+#define RT5651_MB1_OC_P_MASK                    (0x1 << 7)
+#define RT5651_MB1_OC_P_SFT                     7
+#define RT5651_MB1_OC_P_NOR                     (0x0 << 7)
+#define RT5651_MB1_OC_P_INV                     (0x1 << 7)
+#define RT5651_MB2_OC_P_MASK                    (0x1 << 6)
+#define RT5651_MB1_OC_CLR                       (0x1 << 3)
+#define RT5651_MB1_OC_CLR_SFT                   3
+#define RT5651_STA_GPIO8                        (0x1)
+#define RT5651_STA_GPIO8_BIT                    0
+
+/* Internal Status and GPIO status (0xbf) */
+#define RT5651_STA_JD3                          (0x1 << 15)
+#define RT5651_STA_JD3_BIT                      15
+#define RT5651_STA_JD2                          (0x1 << 14)
+#define RT5651_STA_JD2_BIT                      14
+#define RT5651_STA_JD1_2                        (0x1 << 13)
+#define RT5651_STA_JD1_2_BIT                    13
+#define RT5651_STA_JD1_1                        (0x1 << 12)
+#define RT5651_STA_JD1_1_BIT                    12
+#define RT5651_STA_GP7                          (0x1 << 11)
+#define RT5651_STA_GP7_BIT                      11
+#define RT5651_STA_GP6                          (0x1 << 10)
+#define RT5651_STA_GP6_BIT                      10
+#define RT5651_STA_GP5                          (0x1 << 9)
+#define RT5651_STA_GP5_BIT                      9
+#define RT5651_STA_GP1                          (0x1 << 8)
+#define RT5651_STA_GP1_BIT                      8
+#define RT5651_STA_GP2                          (0x1 << 7)
+#define RT5651_STA_GP2_BIT                      7
+#define RT5651_STA_GP3                          (0x1 << 6)
+#define RT5651_STA_GP3_BIT                      6
+#define RT5651_STA_GP4                          (0x1 << 5)
+#define RT5651_STA_GP4_BIT                      5
+#define RT5651_STA_GP_JD                        (0x1 << 4)
+#define RT5651_STA_GP_JD_BIT                    4
+
+/* GPIO Control 1 (0xc0) */
+#define RT5651_GP1_PIN_MASK                     (0x1 << 15)
+#define RT5651_GP1_PIN_SFT                      15
+#define RT5651_GP1_PIN_GPIO1                    (0x0 << 15)
+#define RT5651_GP1_PIN_IRQ                      (0x1 << 15)
+#define RT5651_GP2_PIN_MASK                     (0x1 << 14)
+#define RT5651_GP2_PIN_SFT                      14
+#define RT5651_GP2_PIN_GPIO2                    (0x0 << 14)
+#define RT5651_GP2_PIN_DMIC1_SCL                (0x1 << 14)
+#define RT5651_GPIO_M_MASK                      (0x1 << 9)
+#define RT5651_GPIO_M_SFT                       9
+#define RT5651_GPIO_M_FLT                       (0x0 << 9)
+#define RT5651_GPIO_M_PH                        (0x1 << 9)
+#define RT5651_I2S2_SEL_MASK                    (0x1 << 8)
+#define RT5651_I2S2_SEL_SFT                     8
+#define RT5651_I2S2_SEL_I2S                     (0x0 << 8)
+#define RT5651_I2S2_SEL_GPIO                    (0x1 << 8)
+#define RT5651_GP5_PIN_MASK                     (0x1 << 7)
+#define RT5651_GP5_PIN_SFT                      7
+#define RT5651_GP5_PIN_GPIO5                    (0x0 << 7)
+#define RT5651_GP5_PIN_IRQ                      (0x1 << 7)
+#define RT5651_GP6_PIN_MASK                     (0x1 << 6)
+#define RT5651_GP6_PIN_SFT                      6
+#define RT5651_GP6_PIN_GPIO6                    (0x0 << 6)
+#define RT5651_GP6_PIN_DMIC_SDA                 (0x1 << 6)
+#define RT5651_GP7_PIN_MASK                     (0x1 << 5)
+#define RT5651_GP7_PIN_SFT                      5
+#define RT5651_GP7_PIN_GPIO7                    (0x0 << 5)
+#define RT5651_GP7_PIN_IRQ                      (0x1 << 5)
+#define RT5651_GP8_PIN_MASK                     (0x1 << 4)
+#define RT5651_GP8_PIN_SFT                      4
+#define RT5651_GP8_PIN_GPIO8                    (0x0 << 4)
+#define RT5651_GP8_PIN_DMIC_SDA                 (0x1 << 4)
+#define RT5651_GPIO_PDM_SEL_MASK                (0x1 << 3)
+#define RT5651_GPIO_PDM_SEL_SFT                 3
+#define RT5651_GPIO_PDM_SEL_GPIO                (0x0 << 3)
+#define RT5651_GPIO_PDM_SEL_PDM                 (0x1 << 3)
+
+/* GPIO Control 2 (0xc1) */
+#define RT5651_GP5_DR_MASK                      (0x1 << 14)
+#define RT5651_GP5_DR_SFT                       14
+#define RT5651_GP5_DR_IN                        (0x0 << 14)
+#define RT5651_GP5_DR_OUT                       (0x1 << 14)
+#define RT5651_GP5_OUT_MASK                     (0x1 << 13)
+#define RT5651_GP5_OUT_SFT                      13
+#define RT5651_GP5_OUT_LO                       (0x0 << 13)
+#define RT5651_GP5_OUT_HI                       (0x1 << 13)
+#define RT5651_GP5_P_MASK                       (0x1 << 12)
+#define RT5651_GP5_P_SFT                        12
+#define RT5651_GP5_P_NOR                        (0x0 << 12)
+#define RT5651_GP5_P_INV                        (0x1 << 12)
+#define RT5651_GP4_DR_MASK                      (0x1 << 11)
+#define RT5651_GP4_DR_SFT                       11
+#define RT5651_GP4_DR_IN                        (0x0 << 11)
+#define RT5651_GP4_DR_OUT                       (0x1 << 11)
+#define RT5651_GP4_OUT_MASK                     (0x1 << 10)
+#define RT5651_GP4_OUT_SFT                      10
+#define RT5651_GP4_OUT_LO                       (0x0 << 10)
+#define RT5651_GP4_OUT_HI                       (0x1 << 10)
+#define RT5651_GP4_P_MASK                       (0x1 << 9)
+#define RT5651_GP4_P_SFT                        9
+#define RT5651_GP4_P_NOR                        (0x0 << 9)
+#define RT5651_GP4_P_INV                        (0x1 << 9)
+#define RT5651_GP3_DR_MASK                      (0x1 << 8)
+#define RT5651_GP3_DR_SFT                       8
+#define RT5651_GP3_DR_IN                        (0x0 << 8)
+#define RT5651_GP3_DR_OUT                       (0x1 << 8)
+#define RT5651_GP3_OUT_MASK                     (0x1 << 7)
+#define RT5651_GP3_OUT_SFT                      7
+#define RT5651_GP3_OUT_LO                       (0x0 << 7)
+#define RT5651_GP3_OUT_HI                       (0x1 << 7)
+#define RT5651_GP3_P_MASK                       (0x1 << 6)
+#define RT5651_GP3_P_SFT                        6
+#define RT5651_GP3_P_NOR                        (0x0 << 6)
+#define RT5651_GP3_P_INV                        (0x1 << 6)
+#define RT5651_GP2_DR_MASK                      (0x1 << 5)
+#define RT5651_GP2_DR_SFT                       5
+#define RT5651_GP2_DR_IN                        (0x0 << 5)
+#define RT5651_GP2_DR_OUT                       (0x1 << 5)
+#define RT5651_GP2_OUT_MASK                     (0x1 << 4)
+#define RT5651_GP2_OUT_SFT                      4
+#define RT5651_GP2_OUT_LO                       (0x0 << 4)
+#define RT5651_GP2_OUT_HI                       (0x1 << 4)
+#define RT5651_GP2_P_MASK                       (0x1 << 3)
+#define RT5651_GP2_P_SFT                        3
+#define RT5651_GP2_P_NOR                        (0x0 << 3)
+#define RT5651_GP2_P_INV                        (0x1 << 3)
+#define RT5651_GP1_DR_MASK                      (0x1 << 2)
+#define RT5651_GP1_DR_SFT                       2
+#define RT5651_GP1_DR_IN                        (0x0 << 2)
+#define RT5651_GP1_DR_OUT                       (0x1 << 2)
+#define RT5651_GP1_OUT_MASK                     (0x1 << 1)
+#define RT5651_GP1_OUT_SFT                      1
+#define RT5651_GP1_OUT_LO                       (0x0 << 1)
+#define RT5651_GP1_OUT_HI                       (0x1 << 1)
+#define RT5651_GP1_P_MASK                       (0x1)
+#define RT5651_GP1_P_SFT                        0
+#define RT5651_GP1_P_NOR                        (0x0)
+#define RT5651_GP1_P_INV                        (0x1)
+
+/* GPIO Control 3 (0xc2) */
+#define RT5651_GP8_DR_MASK                      (0x1 << 8)
+#define RT5651_GP8_DR_SFT                       8
+#define RT5651_GP8_DR_IN                        (0x0 << 8)
+#define RT5651_GP8_DR_OUT                       (0x1 << 8)
+#define RT5651_GP8_OUT_MASK                     (0x1 << 7)
+#define RT5651_GP8_OUT_SFT                      7
+#define RT5651_GP8_OUT_LO                       (0x0 << 7)
+#define RT5651_GP8_OUT_HI                       (0x1 << 7)
+#define RT5651_GP8_P_MASK                       (0x1 << 6)
+#define RT5651_GP8_P_SFT                        6
+#define RT5651_GP8_P_NOR                        (0x0 << 6)
+#define RT5651_GP8_P_INV                        (0x1 << 6)
+#define RT5651_GP7_DR_MASK                      (0x1 << 5)
+#define RT5651_GP7_DR_SFT                       5
+#define RT5651_GP7_DR_IN                        (0x0 << 5)
+#define RT5651_GP7_DR_OUT                       (0x1 << 5)
+#define RT5651_GP7_OUT_MASK                     (0x1 << 4)
+#define RT5651_GP7_OUT_SFT                      4
+#define RT5651_GP7_OUT_LO                       (0x0 << 4)
+#define RT5651_GP7_OUT_HI                       (0x1 << 4)
+#define RT5651_GP7_P_MASK                       (0x1 << 3)
+#define RT5651_GP7_P_SFT                        3
+#define RT5651_GP7_P_NOR                        (0x0 << 3)
+#define RT5651_GP7_P_INV                        (0x1 << 3)
+#define RT5651_GP6_DR_MASK                      (0x1 << 2)
+#define RT5651_GP6_DR_SFT                       2
+#define RT5651_GP6_DR_IN                        (0x0 << 2)
+#define RT5651_GP6_DR_OUT                       (0x1 << 2)
+#define RT5651_GP6_OUT_MASK                     (0x1 << 1)
+#define RT5651_GP6_OUT_SFT                      1
+#define RT5651_GP6_OUT_LO                       (0x0 << 1)
+#define RT5651_GP6_OUT_HI                       (0x1 << 1)
+#define RT5651_GP6_P_MASK                       (0x1)
+#define RT5651_GP6_P_SFT                        0
+#define RT5651_GP6_P_NOR                        (0x0)
+#define RT5651_GP6_P_INV                        (0x1)
+
+/* Scramble Control (0xce) */
+#define RT5651_SCB_SWAP_MASK                    (0x1 << 15)
+#define RT5651_SCB_SWAP_SFT                     15
+#define RT5651_SCB_SWAP_DIS                     (0x0 << 15)
+#define RT5651_SCB_SWAP_EN                      (0x1 << 15)
+#define RT5651_SCB_MASK                         (0x1 << 14)
+#define RT5651_SCB_SFT                          14
+#define RT5651_SCB_DIS                          (0x0 << 14)
+#define RT5651_SCB_EN                           (0x1 << 14)
+
+/* Baseback Control (0xcf) */
+#define RT5651_BB_MASK                          (0x1 << 15)
+#define RT5651_BB_SFT                           15
+#define RT5651_BB_DIS                           (0x0 << 15)
+#define RT5651_BB_EN                            (0x1 << 15)
+#define RT5651_BB_CT_MASK                       (0x7 << 12)
+#define RT5651_BB_CT_SFT                        12
+#define RT5651_BB_CT_A                          (0x0 << 12)
+#define RT5651_BB_CT_B                          (0x1 << 12)
+#define RT5651_BB_CT_C                          (0x2 << 12)
+#define RT5651_BB_CT_D                          (0x3 << 12)
+#define RT5651_M_BB_L_MASK                      (0x1 << 9)
+#define RT5651_M_BB_L_SFT                       9
+#define RT5651_M_BB_R_MASK                      (0x1 << 8)
+#define RT5651_M_BB_R_SFT                       8
+#define RT5651_M_BB_HPF_L_MASK                  (0x1 << 7)
+#define RT5651_M_BB_HPF_L_SFT                   7
+#define RT5651_M_BB_HPF_R_MASK                  (0x1 << 6)
+#define RT5651_M_BB_HPF_R_SFT                   6
+#define RT5651_G_BB_BST_MASK                    (0x3f)
+#define RT5651_G_BB_BST_SFT                     0
+
+/* MP3 Plus Control 1 (0xd0) */
+#define RT5651_M_MP3_L_MASK                     (0x1 << 15)
+#define RT5651_M_MP3_L_SFT                      15
+#define RT5651_M_MP3_R_MASK                     (0x1 << 14)
+#define RT5651_M_MP3_R_SFT                      14
+#define RT5651_M_MP3_MASK                       (0x1 << 13)
+#define RT5651_M_MP3_SFT                        13
+#define RT5651_M_MP3_DIS                        (0x0 << 13)
+#define RT5651_M_MP3_EN                         (0x1 << 13)
+#define RT5651_EG_MP3_MASK                      (0x1f << 8)
+#define RT5651_EG_MP3_SFT                       8
+#define RT5651_MP3_HLP_MASK                     (0x1 << 7)
+#define RT5651_MP3_HLP_SFT                      7
+#define RT5651_MP3_HLP_DIS                      (0x0 << 7)
+#define RT5651_MP3_HLP_EN                       (0x1 << 7)
+#define RT5651_M_MP3_ORG_L_MASK                 (0x1 << 6)
+#define RT5651_M_MP3_ORG_L_SFT                  6
+#define RT5651_M_MP3_ORG_R_MASK                 (0x1 << 5)
+#define RT5651_M_MP3_ORG_R_SFT                  5
+
+/* MP3 Plus Control 2 (0xd1) */
+#define RT5651_MP3_WT_MASK                      (0x1 << 13)
+#define RT5651_MP3_WT_SFT                       13
+#define RT5651_MP3_WT_1_4                       (0x0 << 13)
+#define RT5651_MP3_WT_1_2                       (0x1 << 13)
+#define RT5651_OG_MP3_MASK                      (0x1f << 8)
+#define RT5651_OG_MP3_SFT                       8
+#define RT5651_HG_MP3_MASK                      (0x3f)
+#define RT5651_HG_MP3_SFT                       0
+
+/* 3D HP Control 1 (0xd2) */
+#define RT5651_3D_CF_MASK                       (0x1 << 15)
+#define RT5651_3D_CF_SFT                        15
+#define RT5651_3D_CF_DIS                        (0x0 << 15)
+#define RT5651_3D_CF_EN                         (0x1 << 15)
+#define RT5651_3D_HP_MASK                       (0x1 << 14)
+#define RT5651_3D_HP_SFT                        14
+#define RT5651_3D_HP_DIS                        (0x0 << 14)
+#define RT5651_3D_HP_EN                         (0x1 << 14)
+#define RT5651_3D_BT_MASK                       (0x1 << 13)
+#define RT5651_3D_BT_SFT                        13
+#define RT5651_3D_BT_DIS                        (0x0 << 13)
+#define RT5651_3D_BT_EN                         (0x1 << 13)
+#define RT5651_3D_1F_MIX_MASK                   (0x3 << 11)
+#define RT5651_3D_1F_MIX_SFT                    11
+#define RT5651_3D_HP_M_MASK                     (0x1 << 10)
+#define RT5651_3D_HP_M_SFT                      10
+#define RT5651_3D_HP_M_SUR                      (0x0 << 10)
+#define RT5651_3D_HP_M_FRO                      (0x1 << 10)
+#define RT5651_M_3D_HRTF_MASK                   (0x1 << 9)
+#define RT5651_M_3D_HRTF_SFT                    9
+#define RT5651_M_3D_D2H_MASK                    (0x1 << 8)
+#define RT5651_M_3D_D2H_SFT                     8
+#define RT5651_M_3D_D2R_MASK                    (0x1 << 7)
+#define RT5651_M_3D_D2R_SFT                     7
+#define RT5651_M_3D_REVB_MASK                   (0x1 << 6)
+#define RT5651_M_3D_REVB_SFT                    6
+
+/* Adjustable high pass filter control 1 (0xd3) */
+#define RT5651_2ND_HPF_MASK                     (0x1 << 15)
+#define RT5651_2ND_HPF_SFT                      15
+#define RT5651_2ND_HPF_DIS                      (0x0 << 15)
+#define RT5651_2ND_HPF_EN                       (0x1 << 15)
+#define RT5651_HPF_CF_L_MASK                    (0x7 << 12)
+#define RT5651_HPF_CF_L_SFT                     12
+#define RT5651_HPF_CF_R_MASK                    (0x7 << 8)
+#define RT5651_HPF_CF_R_SFT                     8
+#define RT5651_ZD_T_MASK                        (0x3 << 6)
+#define RT5651_ZD_T_SFT                         6
+#define RT5651_ZD_F_MASK                        (0x3 << 4)
+#define RT5651_ZD_F_SFT                         4
+#define RT5651_ZD_F_IM                          (0x0 << 4)
+#define RT5651_ZD_F_ZC_IM                       (0x1 << 4)
+#define RT5651_ZD_F_ZC_IOD                      (0x2 << 4)
+#define RT5651_ZD_F_UN                          (0x3 << 4)
+
+/* Adjustable high pass filter control 2 (0xd4) */
+#define RT5651_HPF_CF_L_NUM_MASK                (0x3f << 8)
+#define RT5651_HPF_CF_L_NUM_SFT                 8
+#define RT5651_HPF_CF_R_NUM_MASK                (0x3f)
+#define RT5651_HPF_CF_R_NUM_SFT                 0
+
+/* HP calibration control and Amp detection (0xd6) */
+#define RT5651_SI_DAC_MASK                      (0x1 << 11)
+#define RT5651_SI_DAC_SFT                       11
+#define RT5651_SI_DAC_AUTO                      (0x0 << 11)
+#define RT5651_SI_DAC_TEST                      (0x1 << 11)
+#define RT5651_DC_CAL_M_MASK                    (0x1 << 10)
+#define RT5651_DC_CAL_M_SFT                     10
+#define RT5651_DC_CAL_M_NOR                     (0x0 << 10)
+#define RT5651_DC_CAL_M_CAL                     (0x1 << 10)
+#define RT5651_DC_CAL_MASK                      (0x1 << 9)
+#define RT5651_DC_CAL_SFT                       9
+#define RT5651_DC_CAL_DIS                       (0x0 << 9)
+#define RT5651_DC_CAL_EN                        (0x1 << 9)
+#define RT5651_HPD_RCV_MASK                     (0x7 << 6)
+#define RT5651_HPD_RCV_SFT                      6
+#define RT5651_HPD_PS_MASK                      (0x1 << 5)
+#define RT5651_HPD_PS_SFT                       5
+#define RT5651_HPD_PS_DIS                       (0x0 << 5)
+#define RT5651_HPD_PS_EN                        (0x1 << 5)
+#define RT5651_CAL_M_MASK                       (0x1 << 4)
+#define RT5651_CAL_M_SFT                        4
+#define RT5651_CAL_M_DEP                        (0x0 << 4)
+#define RT5651_CAL_M_CAL                        (0x1 << 4)
+#define RT5651_CAL_MASK                         (0x1 << 3)
+#define RT5651_CAL_SFT                          3
+#define RT5651_CAL_DIS                          (0x0 << 3)
+#define RT5651_CAL_EN                           (0x1 << 3)
+#define RT5651_CAL_TEST_MASK                    (0x1 << 2)
+#define RT5651_CAL_TEST_SFT                     2
+#define RT5651_CAL_TEST_DIS                     (0x0 << 2)
+#define RT5651_CAL_TEST_EN                      (0x1 << 2)
+#define RT5651_CAL_P_MASK                       (0x3)
+#define RT5651_CAL_P_SFT                        0
+#define RT5651_CAL_P_NONE                       (0x0)
+#define RT5651_CAL_P_CAL                        (0x1)
+#define RT5651_CAL_P_DAC_CAL                    (0x2)
+
+/* Soft volume and zero cross control 1 (0xd9) */
+#define RT5651_SV_MASK                          (0x1 << 15)
+#define RT5651_SV_SFT                           15
+#define RT5651_SV_DIS                           (0x0 << 15)
+#define RT5651_SV_EN                            (0x1 << 15)
+#define RT5651_OUT_SV_MASK                      (0x1 << 13)
+#define RT5651_OUT_SV_SFT                       13
+#define RT5651_OUT_SV_DIS                       (0x0 << 13)
+#define RT5651_OUT_SV_EN                        (0x1 << 13)
+#define RT5651_HP_SV_MASK                       (0x1 << 12)
+#define RT5651_HP_SV_SFT                        12
+#define RT5651_HP_SV_DIS                        (0x0 << 12)
+#define RT5651_HP_SV_EN                         (0x1 << 12)
+#define RT5651_ZCD_DIG_MASK                     (0x1 << 11)
+#define RT5651_ZCD_DIG_SFT                      11
+#define RT5651_ZCD_DIG_DIS                      (0x0 << 11)
+#define RT5651_ZCD_DIG_EN                       (0x1 << 11)
+#define RT5651_ZCD_MASK                         (0x1 << 10)
+#define RT5651_ZCD_SFT                          10
+#define RT5651_ZCD_PD                           (0x0 << 10)
+#define RT5651_ZCD_PU                           (0x1 << 10)
+#define RT5651_M_ZCD_MASK                       (0x3f << 4)
+#define RT5651_M_ZCD_SFT                        4
+#define RT5651_M_ZCD_OM_L                       (0x1 << 7)
+#define RT5651_M_ZCD_OM_R                       (0x1 << 6)
+#define RT5651_M_ZCD_RM_L                       (0x1 << 5)
+#define RT5651_M_ZCD_RM_R                       (0x1 << 4)
+#define RT5651_SV_DLY_MASK                      (0xf)
+#define RT5651_SV_DLY_SFT                       0
+
+/* Soft volume and zero cross control 2 (0xda) */
+#define RT5651_ZCD_HP_MASK                      (0x1 << 15)
+#define RT5651_ZCD_HP_SFT                       15
+#define RT5651_ZCD_HP_DIS                       (0x0 << 15)
+#define RT5651_ZCD_HP_EN                        (0x1 << 15)
+
+/* Digital Misc Control (0xfa) */
+#define RT5651_I2S2_MS_SP_MASK                  (0x1 << 8)
+#define RT5651_I2S2_MS_SP_SEL                   8
+#define RT5651_I2S2_MS_SP_64                    (0x0 << 8)
+#define RT5651_I2S2_MS_SP_50                    (0x1 << 8)
+#define RT5651_CLK_DET_EN                       (0x1 << 3)
+#define RT5651_CLK_DET_EN_SFT                   3
+#define RT5651_AMP_DET_EN                       (0x1 << 1)
+#define RT5651_AMP_DET_EN_SFT                   1
+#define RT5651_D_GATE_EN                        (0x1)
+#define RT5651_D_GATE_EN_SFT                    0
+
+/* Codec Private Register definition */
+/* 3D Speaker Control (0x63) */
+#define RT5651_3D_SPK_MASK                      (0x1 << 15)
+#define RT5651_3D_SPK_SFT                       15
+#define RT5651_3D_SPK_DIS                       (0x0 << 15)
+#define RT5651_3D_SPK_EN                        (0x1 << 15)
+#define RT5651_3D_SPK_M_MASK                    (0x3 << 13)
+#define RT5651_3D_SPK_M_SFT                     13
+#define RT5651_3D_SPK_CG_MASK                   (0x1f << 8)
+#define RT5651_3D_SPK_CG_SFT                    8
+#define RT5651_3D_SPK_SG_MASK                   (0x1f)
+#define RT5651_3D_SPK_SG_SFT                    0
+
+/* Wind Noise Detection Control 1 (0x6c) */
+#define RT5651_WND_MASK                         (0x1 << 15)
+#define RT5651_WND_SFT                          15
+#define RT5651_WND_DIS                          (0x0 << 15)
+#define RT5651_WND_EN                           (0x1 << 15)
+
+/* Wind Noise Detection Control 2 (0x6d) */
+#define RT5651_WND_FC_NW_MASK                   (0x3f << 10)
+#define RT5651_WND_FC_NW_SFT                    10
+#define RT5651_WND_FC_WK_MASK                   (0x3f << 4)
+#define RT5651_WND_FC_WK_SFT                    4
+
+/* Wind Noise Detection Control 3 (0x6e) */
+#define RT5651_HPF_FC_MASK                      (0x3f << 6)
+#define RT5651_HPF_FC_SFT                       6
+#define RT5651_WND_FC_ST_MASK                   (0x3f)
+#define RT5651_WND_FC_ST_SFT                    0
+
+/* Wind Noise Detection Control 4 (0x6f) */
+#define RT5651_WND_TH_LO_MASK                   (0x3ff)
+#define RT5651_WND_TH_LO_SFT                    0
+
+/* Wind Noise Detection Control 5 (0x70) */
+#define RT5651_WND_TH_HI_MASK                   (0x3ff)
+#define RT5651_WND_TH_HI_SFT                    0
+
+/* Wind Noise Detection Control 8 (0x73) */
+#define RT5651_WND_WIND_MASK                    (0x1 << 13) /* Read-Only */
+#define RT5651_WND_WIND_SFT                     13
+#define RT5651_WND_STRONG_MASK                  (0x1 << 12) /* Read-Only */
+#define RT5651_WND_STRONG_SFT                   12
+enum {
+        RT5651_NO_WIND,
+        RT5651_BREEZE,
+        RT5651_STORM,
+};
+
+/* Dipole Speaker Interface (0x75) */
+#define RT5651_DP_ATT_MASK                      (0x3 << 14)
+#define RT5651_DP_ATT_SFT                       14
+#define RT5651_DP_SPK_MASK                      (0x1 << 10)
+#define RT5651_DP_SPK_SFT                       10
+#define RT5651_DP_SPK_DIS                       (0x0 << 10)
+#define RT5651_DP_SPK_EN                        (0x1 << 10)
+
+/* EQ Pre Volume Control (0xb3) */
+#define RT5651_EQ_PRE_VOL_MASK                  (0xffff)
+#define RT5651_EQ_PRE_VOL_SFT                   0
+
+/* EQ Post Volume Control (0xb4) */
+#define RT5651_EQ_PST_VOL_MASK                  (0xffff)
+#define RT5651_EQ_PST_VOL_SFT                   0
+
+/* System Clock Source */
+enum {
+        RT5651_SCLK_S_MCLK,
+        RT5651_SCLK_S_PLL1,
+        RT5651_SCLK_S_RCCLK,
+};
+
+/* PLL1 Source */
+enum {
+        RT5651_PLL1_S_MCLK,
+        RT5651_PLL1_S_BCLK1,
+        RT5651_PLL1_S_BCLK2,
+};
+
+enum {
+        RT5651_AIF1,
+        RT5651_AIF2,
+        RT5651_AIFS,
+};
+
+struct rt5651_pll_code {
+        bool m_bp; /* Indicates bypass m code or not. */
+        int m_code;
+        int n_code;
+        int k_code;
+};
+
+struct rt5651_priv {
+        struct snd_soc_codec *codec;
+        struct rt5651_platform_data pdata;
+        struct regmap *regmap;
+
+        int sysclk;
+        int sysclk_src;
+        int lrck[RT5651_AIFS];
+        int bclk[RT5651_AIFS];
+        int master[RT5651_AIFS];
+
+        struct rt5651_pll_code pll_code;
+        int pll_src;
+        int pll_in;
+        int pll_out;
+
+        int dmic_en;
+        bool hp_mute;
+};
+
+#endif /* __RT5651_H__ */
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index d3ed1be5a186..9626ee0417cd 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -296,7 +296,7 @@ static int dac_info_volsw(struct snd_kcontrol *kcontrol,
 static int dac_get_volsw(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         int reg;
         int l;
         int r;
@@ -349,7 +349,7 @@ static int dac_get_volsw(struct snd_kcontrol *kcontrol,
 static int dac_put_volsw(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         int reg;
         int l;
         int r;
@@ -1322,7 +1322,7 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
                         return ret;
         }
 
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies),
+        ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(sgtl5000->supplies),
                                  sgtl5000->supplies);
         if (ret)
                 goto err_ldo_remove;
@@ -1330,16 +1330,13 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)
         ret = regulator_bulk_enable(ARRAY_SIZE(sgtl5000->supplies),
                                         sgtl5000->supplies);
         if (ret)
-                goto err_regulator_free;
+                goto err_ldo_remove;
 
         /* wait for all power rails bring up */
         udelay(10);
 
         return 0;
 
-err_regulator_free:
-        regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies),
-                                sgtl5000->supplies);
 err_ldo_remove:
         if (!external_vddd)
                 ldo_regulator_remove(codec);
@@ -1409,8 +1406,6 @@ static int sgtl5000_probe(struct snd_soc_codec *codec)
 err:
         regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies),
                                                 sgtl5000->supplies);
-        regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies),
-                                sgtl5000->supplies);
         ldo_regulator_remove(codec);
 
         return ret;
@@ -1424,8 +1419,6 @@ static int sgtl5000_remove(struct snd_soc_codec *codec)
 
         regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies),
                                                 sgtl5000->supplies);
-        regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies),
-                                sgtl5000->supplies);
         ldo_regulator_remove(codec);
 
         return 0;
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c
index 244c097cd905..f26befb0c297 100644
--- a/sound/soc/codecs/si476x.c
+++ b/sound/soc/codecs/si476x.c
@@ -208,13 +208,6 @@ out:
         return err;
 }
 
-static int si476x_codec_probe(struct snd_soc_codec *codec)
-{
-        struct regmap *regmap = dev_get_regmap(codec->dev->parent, NULL);
-
-        return snd_soc_codec_set_cache_io(codec, regmap);
-}
-
 static struct snd_soc_dai_ops si476x_dai_ops = {
         .hw_params      = si476x_codec_hw_params,
         .set_fmt        = si476x_codec_set_dai_fmt,
@@ -238,8 +231,13 @@ static struct snd_soc_dai_driver si476x_dai = {
         .ops            = &si476x_dai_ops,
 };
 
+static struct regmap *si476x_get_regmap(struct device *dev)
+{
+        return dev_get_regmap(dev->parent, NULL);
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_si476x = {
-        .probe  = si476x_codec_probe,
+        .get_regmap = si476x_get_regmap,
         .dapm_widgets = si476x_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets),
         .dapm_routes = si476x_dapm_routes,
diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c
index 58e7c1f23771..c5177bc5df82 100644
--- a/sound/soc/codecs/sirf-audio-codec.c
+++ b/sound/soc/codecs/sirf-audio-codec.c
@@ -279,13 +279,63 @@ static const struct snd_soc_dapm_route sirf_audio_codec_map[] = {
         {"Mic input mode mux", "Differential", "MICIN1"},
 };
 
+static void sirf_audio_codec_tx_enable(struct sirf_audio_codec *sirf_audio_codec)
+{
+        regmap_update_bits(sirf_audio_codec->regmap, AUDIO_PORT_IC_TXFIFO_OP,
+                AUDIO_FIFO_RESET, AUDIO_FIFO_RESET);
+        regmap_update_bits(sirf_audio_codec->regmap, AUDIO_PORT_IC_TXFIFO_OP,
+                AUDIO_FIFO_RESET, ~AUDIO_FIFO_RESET);
+        regmap_write(sirf_audio_codec->regmap, AUDIO_PORT_IC_TXFIFO_INT_MSK, 0);
+        regmap_write(sirf_audio_codec->regmap, AUDIO_PORT_IC_TXFIFO_OP, 0);
+        regmap_update_bits(sirf_audio_codec->regmap, AUDIO_PORT_IC_TXFIFO_OP,
+                AUDIO_FIFO_START, AUDIO_FIFO_START);
+        regmap_update_bits(sirf_audio_codec->regmap,
+                AUDIO_PORT_IC_CODEC_TX_CTRL, IC_TX_ENABLE, IC_TX_ENABLE);
+}
+
+static void sirf_audio_codec_tx_disable(struct sirf_audio_codec *sirf_audio_codec)
+{
+        regmap_write(sirf_audio_codec->regmap, AUDIO_PORT_IC_TXFIFO_OP, 0);
+        regmap_update_bits(sirf_audio_codec->regmap,
+                AUDIO_PORT_IC_CODEC_TX_CTRL, IC_TX_ENABLE, ~IC_TX_ENABLE);
+}
+
+static void sirf_audio_codec_rx_enable(struct sirf_audio_codec *sirf_audio_codec,
+        int channels)
+{
+        regmap_update_bits(sirf_audio_codec->regmap, AUDIO_PORT_IC_RXFIFO_OP,
+                AUDIO_FIFO_RESET, AUDIO_FIFO_RESET);
+        regmap_update_bits(sirf_audio_codec->regmap, AUDIO_PORT_IC_RXFIFO_OP,
+                AUDIO_FIFO_RESET, ~AUDIO_FIFO_RESET);
+        regmap_write(sirf_audio_codec->regmap,
+                AUDIO_PORT_IC_RXFIFO_INT_MSK, 0);
+        regmap_write(sirf_audio_codec->regmap, AUDIO_PORT_IC_RXFIFO_OP, 0);
+        regmap_update_bits(sirf_audio_codec->regmap, AUDIO_PORT_IC_RXFIFO_OP,
+                AUDIO_FIFO_START, AUDIO_FIFO_START);
+        if (channels == 1)
+                regmap_update_bits(sirf_audio_codec->regmap,
+                        AUDIO_PORT_IC_CODEC_RX_CTRL,
+                        IC_RX_ENABLE_MONO, IC_RX_ENABLE_MONO);
+        else
+                regmap_update_bits(sirf_audio_codec->regmap,
+                        AUDIO_PORT_IC_CODEC_RX_CTRL,
+                        IC_RX_ENABLE_STEREO, IC_RX_ENABLE_STEREO);
+}
+
+static void sirf_audio_codec_rx_disable(struct sirf_audio_codec *sirf_audio_codec)
+{
+        regmap_update_bits(sirf_audio_codec->regmap,
+                        AUDIO_PORT_IC_CODEC_RX_CTRL,
+                        IC_RX_ENABLE_STEREO, ~IC_RX_ENABLE_STEREO);
+}
+
 static int sirf_audio_codec_trigger(struct snd_pcm_substream *substream,
                 int cmd,
                 struct snd_soc_dai *dai)
 {
-        int playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
         struct snd_soc_codec *codec = dai->codec;
-        u32 val = 0;
+        struct sirf_audio_codec *sirf_audio_codec = snd_soc_codec_get_drvdata(codec);
+        int playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
 
         /*
          * This is a workaround, When stop playback,
@@ -295,20 +345,28 @@ static int sirf_audio_codec_trigger(struct snd_pcm_substream *substream,
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                if (playback) {
+                        snd_soc_update_bits(codec, AUDIO_IC_CODEC_CTRL0,
+                                IC_HSLEN | IC_HSREN, 0);
+                        sirf_audio_codec_tx_disable(sirf_audio_codec);
+                } else
+                        sirf_audio_codec_rx_disable(sirf_audio_codec);
                 break;
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                if (playback)
-                        val = IC_HSLEN | IC_HSREN;
+                if (playback) {
+                        sirf_audio_codec_tx_enable(sirf_audio_codec);
+                        snd_soc_update_bits(codec, AUDIO_IC_CODEC_CTRL0,
+                                IC_HSLEN | IC_HSREN, IC_HSLEN | IC_HSREN);
+                } else
+                        sirf_audio_codec_rx_enable(sirf_audio_codec,
+                                substream->runtime->channels);
                 break;
         default:
                 return -EINVAL;
         }
 
-        if (playback)
-                snd_soc_update_bits(codec, AUDIO_IC_CODEC_CTRL0,
-                        IC_HSLEN | IC_HSREN, val);
         return 0;
 }
 
@@ -392,7 +450,7 @@ static const struct regmap_config sirf_audio_codec_regmap_config = {
         .reg_bits = 32,
         .reg_stride = 4,
         .val_bits = 32,
-        .max_register = AUDIO_IC_CODEC_CTRL3,
+        .max_register = AUDIO_PORT_IC_RXFIFO_INT_MSK,
         .cache_type = REGCACHE_NONE,
 };
 
diff --git a/sound/soc/codecs/sirf-audio-codec.h b/sound/soc/codecs/sirf-audio-codec.h
index d4c187b8e54a..ba1adc03839f 100644
--- a/sound/soc/codecs/sirf-audio-codec.h
+++ b/sound/soc/codecs/sirf-audio-codec.h
@@ -72,4 +72,54 @@
 #define IC_RXPGAR               0x7B
 #define IC_RXPGAL               0x7B
 
+#define AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK     0x3F
+#define AUDIO_PORT_TX_FIFO_SC_OFFSET    0
+#define AUDIO_PORT_TX_FIFO_LC_OFFSET    10
+#define AUDIO_PORT_TX_FIFO_HC_OFFSET    20
+
+#define TX_FIFO_SC(x)           (((x) & AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK) \
+                                << AUDIO_PORT_TX_FIFO_SC_OFFSET)
+#define TX_FIFO_LC(x)           (((x) & AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK) \
+                                << AUDIO_PORT_TX_FIFO_LC_OFFSET)
+#define TX_FIFO_HC(x)           (((x) & AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK) \
+                                << AUDIO_PORT_TX_FIFO_HC_OFFSET)
+
+#define AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK     0x0F
+#define AUDIO_PORT_RX_FIFO_SC_OFFSET    0
+#define AUDIO_PORT_RX_FIFO_LC_OFFSET    10
+#define AUDIO_PORT_RX_FIFO_HC_OFFSET    20
+
+#define RX_FIFO_SC(x)           (((x) & AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK) \
+                                << AUDIO_PORT_RX_FIFO_SC_OFFSET)
+#define RX_FIFO_LC(x)           (((x) & AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK) \
+                                << AUDIO_PORT_RX_FIFO_LC_OFFSET)
+#define RX_FIFO_HC(x)           (((x) & AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK) \
+                                << AUDIO_PORT_RX_FIFO_HC_OFFSET)
+#define AUDIO_PORT_IC_CODEC_TX_CTRL             (0x00F4)
+#define AUDIO_PORT_IC_CODEC_RX_CTRL             (0x00F8)
+
+#define AUDIO_PORT_IC_TXFIFO_OP                 (0x00FC)
+#define AUDIO_PORT_IC_TXFIFO_LEV_CHK            (0x0100)
+#define AUDIO_PORT_IC_TXFIFO_STS                (0x0104)
+#define AUDIO_PORT_IC_TXFIFO_INT                (0x0108)
+#define AUDIO_PORT_IC_TXFIFO_INT_MSK            (0x010C)
+
+#define AUDIO_PORT_IC_RXFIFO_OP                 (0x0110)
+#define AUDIO_PORT_IC_RXFIFO_LEV_CHK            (0x0114)
+#define AUDIO_PORT_IC_RXFIFO_STS                (0x0118)
+#define AUDIO_PORT_IC_RXFIFO_INT                (0x011C)
+#define AUDIO_PORT_IC_RXFIFO_INT_MSK            (0x0120)
+
+#define AUDIO_FIFO_START                (1 << 0)
+#define AUDIO_FIFO_RESET                (1 << 1)
+
+#define AUDIO_FIFO_FULL                 (1 << 0)
+#define AUDIO_FIFO_EMPTY                (1 << 1)
+#define AUDIO_FIFO_OFLOW                (1 << 2)
+#define AUDIO_FIFO_UFLOW                (1 << 3)
+
+#define IC_TX_ENABLE            (0x03)
+#define IC_RX_ENABLE_MONO       (0x01)
+#define IC_RX_ENABLE_STEREO     (0x03)
+
 #endif /*__SIRF_AUDIO_CODEC_H*/
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 12577749b17b..0579d187135b 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -243,7 +243,7 @@ static int sta32x_coefficient_info(struct snd_kcontrol *kcontrol,
 static int sta32x_coefficient_get(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         int numcoef = kcontrol->private_value >> 16;
         int index = kcontrol->private_value & 0xffff;
         unsigned int cfud;
@@ -272,7 +272,7 @@ static int sta32x_coefficient_get(struct snd_kcontrol *kcontrol,
 static int sta32x_coefficient_put(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
         int numcoef = kcontrol->private_value >> 16;
         int index = kcontrol->private_value & 0xffff;
diff --git a/sound/soc/codecs/sta350.c b/sound/soc/codecs/sta350.c
new file mode 100644
index 000000000000..cc97dd52aa9c
--- /dev/null
+++ b/sound/soc/codecs/sta350.c
@@ -0,0 +1,1311 @@
+/*
+ * Codec driver for ST STA350 2.1-channel high-efficiency digital audio system
+ *
+ * Copyright: 2014 Raumfeld GmbH
+ * Author: Sven Brandau <info@brandau.biz>
+ *
+ * based on code from:
+ *      Raumfeld GmbH
+ *        Johannes Stezenbach <js@sig21.net>
+ *      Wolfson Microelectronics PLC.
+ *        Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *      Freescale Semiconductor, Inc.
+ *        Timur Tabi <timur@freescale.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s:%d: " fmt, __func__, __LINE__
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/i2c.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+#include <linux/gpio/consumer.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+
+#include <sound/sta350.h>
+#include "sta350.h"
+
+#define STA350_RATES (SNDRV_PCM_RATE_32000 | \
+                      SNDRV_PCM_RATE_44100 | \
+                      SNDRV_PCM_RATE_48000 | \
+                      SNDRV_PCM_RATE_88200 | \
+                      SNDRV_PCM_RATE_96000 | \
+                      SNDRV_PCM_RATE_176400 | \
+                      SNDRV_PCM_RATE_192000)
+
+#define STA350_FORMATS \
+        (SNDRV_PCM_FMTBIT_S16_LE  | SNDRV_PCM_FMTBIT_S16_BE  | \
+         SNDRV_PCM_FMTBIT_S18_3LE | SNDRV_PCM_FMTBIT_S18_3BE | \
+         SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S20_3BE | \
+         SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_3BE | \
+         SNDRV_PCM_FMTBIT_S24_LE  | SNDRV_PCM_FMTBIT_S24_BE  | \
+         SNDRV_PCM_FMTBIT_S32_LE  | SNDRV_PCM_FMTBIT_S32_BE)
+
+/* Power-up register defaults */
+static const struct reg_default sta350_regs[] = {
+        {  0x0, 0x63 },
+        {  0x1, 0x80 },
+        {  0x2, 0xdf },
+        {  0x3, 0x40 },
+        {  0x4, 0xc2 },
+        {  0x5, 0x5c },
+        {  0x6, 0x00 },
+        {  0x7, 0xff },
+        {  0x8, 0x60 },
+        {  0x9, 0x60 },
+        {  0xa, 0x60 },
+        {  0xb, 0x00 },
+        {  0xc, 0x00 },
+        {  0xd, 0x00 },
+        {  0xe, 0x00 },
+        {  0xf, 0x40 },
+        { 0x10, 0x80 },
+        { 0x11, 0x77 },
+        { 0x12, 0x6a },
+        { 0x13, 0x69 },
+        { 0x14, 0x6a },
+        { 0x15, 0x69 },
+        { 0x16, 0x00 },
+        { 0x17, 0x00 },
+        { 0x18, 0x00 },
+        { 0x19, 0x00 },
+        { 0x1a, 0x00 },
+        { 0x1b, 0x00 },
+        { 0x1c, 0x00 },
+        { 0x1d, 0x00 },
+        { 0x1e, 0x00 },
+        { 0x1f, 0x00 },
+        { 0x20, 0x00 },
+        { 0x21, 0x00 },
+        { 0x22, 0x00 },
+        { 0x23, 0x00 },
+        { 0x24, 0x00 },
+        { 0x25, 0x00 },
+        { 0x26, 0x00 },
+        { 0x27, 0x2a },
+        { 0x28, 0xc0 },
+        { 0x29, 0xf3 },
+        { 0x2a, 0x33 },
+        { 0x2b, 0x00 },
+        { 0x2c, 0x0c },
+        { 0x31, 0x00 },
+        { 0x36, 0x00 },
+        { 0x37, 0x00 },
+        { 0x38, 0x00 },
+        { 0x39, 0x01 },
+        { 0x3a, 0xee },
+        { 0x3b, 0xff },
+        { 0x3c, 0x7e },
+        { 0x3d, 0xc0 },
+        { 0x3e, 0x26 },
+        { 0x3f, 0x00 },
+        { 0x48, 0x00 },
+        { 0x49, 0x00 },
+        { 0x4a, 0x00 },
+        { 0x4b, 0x04 },
+        { 0x4c, 0x00 },
+};
+
+static const struct regmap_range sta350_write_regs_range[] = {
+        regmap_reg_range(STA350_CONFA,  STA350_AUTO2),
+        regmap_reg_range(STA350_C1CFG,  STA350_FDRC2),
+        regmap_reg_range(STA350_EQCFG,  STA350_EVOLRES),
+        regmap_reg_range(STA350_NSHAPE, STA350_MISC2),
+};
+
+static const struct regmap_range sta350_read_regs_range[] = {
+        regmap_reg_range(STA350_CONFA,  STA350_AUTO2),
+        regmap_reg_range(STA350_C1CFG,  STA350_STATUS),
+        regmap_reg_range(STA350_EQCFG,  STA350_EVOLRES),
+        regmap_reg_range(STA350_NSHAPE, STA350_MISC2),
+};
+
+static const struct regmap_range sta350_volatile_regs_range[] = {
+        regmap_reg_range(STA350_CFADDR2, STA350_CFUD),
+        regmap_reg_range(STA350_STATUS,  STA350_STATUS),
+};
+
+static const struct regmap_access_table sta350_write_regs = {
+        .yes_ranges =   sta350_write_regs_range,
+        .n_yes_ranges = ARRAY_SIZE(sta350_write_regs_range),
+};
+
+static const struct regmap_access_table sta350_read_regs = {
+        .yes_ranges =   sta350_read_regs_range,
+        .n_yes_ranges = ARRAY_SIZE(sta350_read_regs_range),
+};
+
+static const struct regmap_access_table sta350_volatile_regs = {
+        .yes_ranges =   sta350_volatile_regs_range,
+        .n_yes_ranges = ARRAY_SIZE(sta350_volatile_regs_range),
+};
+
+/* regulator power supply names */
+static const char * const sta350_supply_names[] = {
+        "vdd-dig",      /* digital supply, 3.3V */
+        "vdd-pll",      /* pll supply, 3.3V */
+        "vcc"           /* power amp supply, 5V - 26V */
+};
+
+/* codec private data */
+struct sta350_priv {
+        struct regmap *regmap;
+        struct regulator_bulk_data supplies[ARRAY_SIZE(sta350_supply_names)];
+        struct sta350_platform_data *pdata;
+
+        unsigned int mclk;
+        unsigned int format;
+
+        u32 coef_shadow[STA350_COEF_COUNT];
+        int shutdown;
+
+        struct gpio_desc *gpiod_nreset;
+        struct gpio_desc *gpiod_power_down;
+
+        struct mutex coeff_lock;
+};
+
+static const DECLARE_TLV_DB_SCALE(mvol_tlv, -12750, 50, 1);
+static const DECLARE_TLV_DB_SCALE(chvol_tlv, -7950, 50, 1);
+static const DECLARE_TLV_DB_SCALE(tone_tlv, -1200, 200, 0);
+
+static const char * const sta350_drc_ac[] = {
+        "Anti-Clipping", "Dynamic Range Compression"
+};
+static const char * const sta350_auto_gc_mode[] = {
+        "User", "AC no clipping", "AC limited clipping (10%)",
+        "DRC nighttime listening mode"
+};
+static const char * const sta350_auto_xo_mode[] = {
+        "User", "80Hz", "100Hz", "120Hz", "140Hz", "160Hz", "180Hz",
+        "200Hz", "220Hz", "240Hz", "260Hz", "280Hz", "300Hz", "320Hz",
+        "340Hz", "360Hz"
+};
+static const char * const sta350_binary_output[] = {
+        "FFX 3-state output - normal operation", "Binary output"
+};
+static const char * const sta350_limiter_select[] = {
+        "Limiter Disabled", "Limiter #1", "Limiter #2"
+};
+static const char * const sta350_limiter_attack_rate[] = {
+        "3.1584", "2.7072", "2.2560", "1.8048", "1.3536", "0.9024",
+        "0.4512", "0.2256", "0.1504", "0.1123", "0.0902", "0.0752",
+        "0.0645", "0.0564", "0.0501", "0.0451"
+};
+static const char * const sta350_limiter_release_rate[] = {
+        "0.5116", "0.1370", "0.0744", "0.0499", "0.0360", "0.0299",
+        "0.0264", "0.0208", "0.0198", "0.0172", "0.0147", "0.0137",
+        "0.0134", "0.0117", "0.0110", "0.0104"
+};
+static const char * const sta350_noise_shaper_type[] = {
+        "Third order", "Fourth order"
+};
+
+static DECLARE_TLV_DB_RANGE(sta350_limiter_ac_attack_tlv,
+        0, 7, TLV_DB_SCALE_ITEM(-1200, 200, 0),
+        8, 16, TLV_DB_SCALE_ITEM(300, 100, 0),
+);
+
+static DECLARE_TLV_DB_RANGE(sta350_limiter_ac_release_tlv,
+        0, 0, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 0),
+        1, 1, TLV_DB_SCALE_ITEM(-2900, 0, 0),
+        2, 2, TLV_DB_SCALE_ITEM(-2000, 0, 0),
+        3, 8, TLV_DB_SCALE_ITEM(-1400, 200, 0),
+        8, 16, TLV_DB_SCALE_ITEM(-700, 100, 0),
+);
+
+static DECLARE_TLV_DB_RANGE(sta350_limiter_drc_attack_tlv,
+        0, 7, TLV_DB_SCALE_ITEM(-3100, 200, 0),
+        8, 13, TLV_DB_SCALE_ITEM(-1600, 100, 0),
+        14, 16, TLV_DB_SCALE_ITEM(-1000, 300, 0),
+);
+
+static DECLARE_TLV_DB_RANGE(sta350_limiter_drc_release_tlv,
+        0, 0, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 0),
+        1, 2, TLV_DB_SCALE_ITEM(-3800, 200, 0),
+        3, 4, TLV_DB_SCALE_ITEM(-3300, 200, 0),
+        5, 12, TLV_DB_SCALE_ITEM(-3000, 200, 0),
+        13, 16, TLV_DB_SCALE_ITEM(-1500, 300, 0),
+);
+
+static SOC_ENUM_SINGLE_DECL(sta350_drc_ac_enum,
+                            STA350_CONFD, STA350_CONFD_DRC_SHIFT,
+                            sta350_drc_ac);
+static SOC_ENUM_SINGLE_DECL(sta350_noise_shaper_enum,
+                            STA350_CONFE, STA350_CONFE_NSBW_SHIFT,
+                            sta350_noise_shaper_type);
+static SOC_ENUM_SINGLE_DECL(sta350_auto_gc_enum,
+                            STA350_AUTO1, STA350_AUTO1_AMGC_SHIFT,
+                            sta350_auto_gc_mode);
+static SOC_ENUM_SINGLE_DECL(sta350_auto_xo_enum,
+                            STA350_AUTO2, STA350_AUTO2_XO_SHIFT,
+                            sta350_auto_xo_mode);
+static SOC_ENUM_SINGLE_DECL(sta350_binary_output_ch1_enum,
+                            STA350_C1CFG, STA350_CxCFG_BO_SHIFT,
+                            sta350_binary_output);
+static SOC_ENUM_SINGLE_DECL(sta350_binary_output_ch2_enum,
+                            STA350_C2CFG, STA350_CxCFG_BO_SHIFT,
+                            sta350_binary_output);
+static SOC_ENUM_SINGLE_DECL(sta350_binary_output_ch3_enum,
+                            STA350_C3CFG, STA350_CxCFG_BO_SHIFT,
+                            sta350_binary_output);
+static SOC_ENUM_SINGLE_DECL(sta350_limiter_ch1_enum,
+                            STA350_C1CFG, STA350_CxCFG_LS_SHIFT,
+                            sta350_limiter_select);
+static SOC_ENUM_SINGLE_DECL(sta350_limiter_ch2_enum,
+                            STA350_C2CFG, STA350_CxCFG_LS_SHIFT,
+                            sta350_limiter_select);
+static SOC_ENUM_SINGLE_DECL(sta350_limiter_ch3_enum,
+                            STA350_C3CFG, STA350_CxCFG_LS_SHIFT,
+                            sta350_limiter_select);
+static SOC_ENUM_SINGLE_DECL(sta350_limiter1_attack_rate_enum,
+                            STA350_L1AR, STA350_LxA_SHIFT,
+                            sta350_limiter_attack_rate);
+static SOC_ENUM_SINGLE_DECL(sta350_limiter2_attack_rate_enum,
+                            STA350_L2AR, STA350_LxA_SHIFT,
+                            sta350_limiter_attack_rate);
+static SOC_ENUM_SINGLE_DECL(sta350_limiter1_release_rate_enum,
+                            STA350_L1AR, STA350_LxR_SHIFT,
+                            sta350_limiter_release_rate);
+static SOC_ENUM_SINGLE_DECL(sta350_limiter2_release_rate_enum,
+                            STA350_L2AR, STA350_LxR_SHIFT,
+                            sta350_limiter_release_rate);
+
+/*
+ * byte array controls for setting biquad, mixer, scaling coefficients;
+ * for biquads all five coefficients need to be set in one go,
+ * mixer and pre/postscale coefs can be set individually;
+ * each coef is 24bit, the bytes are ordered in the same way
+ * as given in the STA350 data sheet (big endian; b1, b2, a1, a2, b0)
+ */
+
+static int sta350_coefficient_info(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_info *uinfo)
+{
+        int numcoef = kcontrol->private_value >> 16;
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
+        uinfo->count = 3 * numcoef;
+        return 0;
+}
+
+static int sta350_coefficient_get(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+        struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+        int numcoef = kcontrol->private_value >> 16;
+        int index = kcontrol->private_value & 0xffff;
+        unsigned int cfud, val;
+        int i, ret = 0;
+
+        mutex_lock(&sta350->coeff_lock);
+
+        /* preserve reserved bits in STA350_CFUD */
+        regmap_read(sta350->regmap, STA350_CFUD, &cfud);
+        cfud &= 0xf0;
+        /*
+         * chip documentation does not say if the bits are self clearing,
+         * so do it explicitly
+         */
+        regmap_write(sta350->regmap, STA350_CFUD, cfud);
+
+        regmap_write(sta350->regmap, STA350_CFADDR2, index);
+        if (numcoef == 1) {
+                regmap_write(sta350->regmap, STA350_CFUD, cfud | 0x04);
+        } else if (numcoef == 5) {
+                regmap_write(sta350->regmap, STA350_CFUD, cfud | 0x08);
+        } else {
+                ret = -EINVAL;
+                goto exit_unlock;
+        }
+
+        for (i = 0; i < 3 * numcoef; i++) {
+                regmap_read(sta350->regmap, STA350_B1CF1 + i, &val);
+                ucontrol->value.bytes.data[i] = val;
+        }
+
+exit_unlock:
+        mutex_unlock(&sta350->coeff_lock);
+
+        return ret;
+}
+
+static int sta350_coefficient_put(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
+        struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+        int numcoef = kcontrol->private_value >> 16;
+        int index = kcontrol->private_value & 0xffff;
+        unsigned int cfud;
+        int i;
+
+        /* preserve reserved bits in STA350_CFUD */
+        regmap_read(sta350->regmap, STA350_CFUD, &cfud);
+        cfud &= 0xf0;
+        /*
+         * chip documentation does not say if the bits are self clearing,
+         * so do it explicitly
+         */
+        regmap_write(sta350->regmap, STA350_CFUD, cfud);
+
+        regmap_write(sta350->regmap, STA350_CFADDR2, index);
+        for (i = 0; i < numcoef && (index + i < STA350_COEF_COUNT); i++)
+                sta350->coef_shadow[index + i] =
+                          (ucontrol->value.bytes.data[3 * i] << 16)
+                        | (ucontrol->value.bytes.data[3 * i + 1] << 8)
+                        | (ucontrol->value.bytes.data[3 * i + 2]);
+        for (i = 0; i < 3 * numcoef; i++)
+                regmap_write(sta350->regmap, STA350_B1CF1 + i,
+                             ucontrol->value.bytes.data[i]);
+        if (numcoef == 1)
+                regmap_write(sta350->regmap, STA350_CFUD, cfud | 0x01);
+        else if (numcoef == 5)
+                regmap_write(sta350->regmap, STA350_CFUD, cfud | 0x02);
+        else
+                return -EINVAL;
+
+        return 0;
+}
+
+static int sta350_sync_coef_shadow(struct snd_soc_codec *codec)
+{
+        struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+        unsigned int cfud;
+        int i;
+
+        /* preserve reserved bits in STA350_CFUD */
+        regmap_read(sta350->regmap, STA350_CFUD, &cfud);
+        cfud &= 0xf0;
+
+        for (i = 0; i < STA350_COEF_COUNT; i++) {
+                regmap_write(sta350->regmap, STA350_CFADDR2, i);
+                regmap_write(sta350->regmap, STA350_B1CF1,
+                             (sta350->coef_shadow[i] >> 16) & 0xff);
+                regmap_write(sta350->regmap, STA350_B1CF2,
+                             (sta350->coef_shadow[i] >> 8) & 0xff);
+                regmap_write(sta350->regmap, STA350_B1CF3,
+                             (sta350->coef_shadow[i]) & 0xff);
+                /*
+                 * chip documentation does not say if the bits are
+                 * self-clearing, so do it explicitly
+                 */
+                regmap_write(sta350->regmap, STA350_CFUD, cfud);
+                regmap_write(sta350->regmap, STA350_CFUD, cfud | 0x01);
+        }
+        return 0;
+}
+
+static int sta350_cache_sync(struct snd_soc_codec *codec)
+{
+        struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+        unsigned int mute;
+        int rc;
+
+        /* mute during register sync */
+        regmap_read(sta350->regmap, STA350_CFUD, &mute);
+        regmap_write(sta350->regmap, STA350_MMUTE, mute | STA350_MMUTE_MMUTE);
+        sta350_sync_coef_shadow(codec);
+        rc = regcache_sync(sta350->regmap);
+        regmap_write(sta350->regmap, STA350_MMUTE, mute);
+        return rc;
+}
+
+#define SINGLE_COEF(xname, index) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = sta350_coefficient_info, \
+        .get = sta350_coefficient_get,\
+        .put = sta350_coefficient_put, \
+        .private_value = index | (1 << 16) }
+
+#define BIQUAD_COEFS(xname, index) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = sta350_coefficient_info, \
+        .get = sta350_coefficient_get,\
+        .put = sta350_coefficient_put, \
+        .private_value = index | (5 << 16) }
+
+static const struct snd_kcontrol_new sta350_snd_controls[] = {
+SOC_SINGLE_TLV("Master Volume", STA350_MVOL, 0, 0xff, 1, mvol_tlv),
+/* VOL */
+SOC_SINGLE_TLV("Ch1 Volume", STA350_C1VOL, 0, 0xff, 1, chvol_tlv),
+SOC_SINGLE_TLV("Ch2 Volume", STA350_C2VOL, 0, 0xff, 1, chvol_tlv),
+SOC_SINGLE_TLV("Ch3 Volume", STA350_C3VOL, 0, 0xff, 1, chvol_tlv),
+/* CONFD */
+SOC_SINGLE("High Pass Filter Bypass Switch",
+           STA350_CONFD, STA350_CONFD_HPB_SHIFT, 1, 1),
+SOC_SINGLE("De-emphasis Filter Switch",
+           STA350_CONFD, STA350_CONFD_DEMP_SHIFT, 1, 0),
+SOC_SINGLE("DSP Bypass Switch",
+           STA350_CONFD, STA350_CONFD_DSPB_SHIFT, 1, 0),
+SOC_SINGLE("Post-scale Link Switch",
+           STA350_CONFD, STA350_CONFD_PSL_SHIFT, 1, 0),
+SOC_SINGLE("Biquad Coefficient Link Switch",
+           STA350_CONFD, STA350_CONFD_BQL_SHIFT, 1, 0),
+SOC_ENUM("Compressor/Limiter Switch", sta350_drc_ac_enum),
+SOC_ENUM("Noise Shaper Bandwidth", sta350_noise_shaper_enum),
+SOC_SINGLE("Zero-detect Mute Enable Switch",
+           STA350_CONFD, STA350_CONFD_ZDE_SHIFT, 1, 0),
+SOC_SINGLE("Submix Mode Switch",
+           STA350_CONFD, STA350_CONFD_SME_SHIFT, 1, 0),
+/* CONFE */
+SOC_SINGLE("Zero Cross Switch", STA350_CONFE, STA350_CONFE_ZCE_SHIFT, 1, 0),
+SOC_SINGLE("Soft Ramp Switch", STA350_CONFE, STA350_CONFE_SVE_SHIFT, 1, 0),
+/* MUTE */
+SOC_SINGLE("Master Switch", STA350_MMUTE, STA350_MMUTE_MMUTE_SHIFT, 1, 1),
+SOC_SINGLE("Ch1 Switch", STA350_MMUTE, STA350_MMUTE_C1M_SHIFT, 1, 1),
+SOC_SINGLE("Ch2 Switch", STA350_MMUTE, STA350_MMUTE_C2M_SHIFT, 1, 1),
+SOC_SINGLE("Ch3 Switch", STA350_MMUTE, STA350_MMUTE_C3M_SHIFT, 1, 1),
+/* AUTOx */
+SOC_ENUM("Automode GC", sta350_auto_gc_enum),
+SOC_ENUM("Automode XO", sta350_auto_xo_enum),
+/* CxCFG */
+SOC_SINGLE("Ch1 Tone Control Bypass Switch",
+           STA350_C1CFG, STA350_CxCFG_TCB_SHIFT, 1, 0),
+SOC_SINGLE("Ch2 Tone Control Bypass Switch",
+           STA350_C2CFG, STA350_CxCFG_TCB_SHIFT, 1, 0),
+SOC_SINGLE("Ch1 EQ Bypass Switch",
+           STA350_C1CFG, STA350_CxCFG_EQBP_SHIFT, 1, 0),
+SOC_SINGLE("Ch2 EQ Bypass Switch",
+           STA350_C2CFG, STA350_CxCFG_EQBP_SHIFT, 1, 0),
+SOC_SINGLE("Ch1 Master Volume Bypass Switch",
+           STA350_C1CFG, STA350_CxCFG_VBP_SHIFT, 1, 0),
+SOC_SINGLE("Ch2 Master Volume Bypass Switch",
+           STA350_C1CFG, STA350_CxCFG_VBP_SHIFT, 1, 0),
+SOC_SINGLE("Ch3 Master Volume Bypass Switch",
+           STA350_C1CFG, STA350_CxCFG_VBP_SHIFT, 1, 0),
+SOC_ENUM("Ch1 Binary Output Select", sta350_binary_output_ch1_enum),
+SOC_ENUM("Ch2 Binary Output Select", sta350_binary_output_ch2_enum),
+SOC_ENUM("Ch3 Binary Output Select", sta350_binary_output_ch3_enum),
+SOC_ENUM("Ch1 Limiter Select", sta350_limiter_ch1_enum),
+SOC_ENUM("Ch2 Limiter Select", sta350_limiter_ch2_enum),
+SOC_ENUM("Ch3 Limiter Select", sta350_limiter_ch3_enum),
+/* TONE */
+SOC_SINGLE_RANGE_TLV("Bass Tone Control Volume",
+                     STA350_TONE, STA350_TONE_BTC_SHIFT, 1, 13, 0, tone_tlv),
+SOC_SINGLE_RANGE_TLV("Treble Tone Control Volume",
+                     STA350_TONE, STA350_TONE_TTC_SHIFT, 1, 13, 0, tone_tlv),
+SOC_ENUM("Limiter1 Attack Rate (dB/ms)", sta350_limiter1_attack_rate_enum),
+SOC_ENUM("Limiter2 Attack Rate (dB/ms)", sta350_limiter2_attack_rate_enum),
+SOC_ENUM("Limiter1 Release Rate (dB/ms)", sta350_limiter1_release_rate_enum),
+SOC_ENUM("Limiter2 Release Rate (dB/ms)", sta350_limiter2_release_rate_enum),
+
+/*
+ * depending on mode, the attack/release thresholds have
+ * two different enum definitions; provide both
+ */
+SOC_SINGLE_TLV("Limiter1 Attack Threshold (AC Mode)",
+               STA350_L1ATRT, STA350_LxA_SHIFT,
+               16, 0, sta350_limiter_ac_attack_tlv),
+SOC_SINGLE_TLV("Limiter2 Attack Threshold (AC Mode)",
+               STA350_L2ATRT, STA350_LxA_SHIFT,
+               16, 0, sta350_limiter_ac_attack_tlv),
+SOC_SINGLE_TLV("Limiter1 Release Threshold (AC Mode)",
+               STA350_L1ATRT, STA350_LxR_SHIFT,
+               16, 0, sta350_limiter_ac_release_tlv),
+SOC_SINGLE_TLV("Limiter2 Release Threshold (AC Mode)",
+               STA350_L2ATRT, STA350_LxR_SHIFT,
+               16, 0, sta350_limiter_ac_release_tlv),
+SOC_SINGLE_TLV("Limiter1 Attack Threshold (DRC Mode)",
+               STA350_L1ATRT, STA350_LxA_SHIFT,
+               16, 0, sta350_limiter_drc_attack_tlv),
+SOC_SINGLE_TLV("Limiter2 Attack Threshold (DRC Mode)",
+               STA350_L2ATRT, STA350_LxA_SHIFT,
+               16, 0, sta350_limiter_drc_attack_tlv),
+SOC_SINGLE_TLV("Limiter1 Release Threshold (DRC Mode)",
+               STA350_L1ATRT, STA350_LxR_SHIFT,
+               16, 0, sta350_limiter_drc_release_tlv),
+SOC_SINGLE_TLV("Limiter2 Release Threshold (DRC Mode)",
+               STA350_L2ATRT, STA350_LxR_SHIFT,
+               16, 0, sta350_limiter_drc_release_tlv),
+
+BIQUAD_COEFS("Ch1 - Biquad 1", 0),
+BIQUAD_COEFS("Ch1 - Biquad 2", 5),
+BIQUAD_COEFS("Ch1 - Biquad 3", 10),
+BIQUAD_COEFS("Ch1 - Biquad 4", 15),
+BIQUAD_COEFS("Ch2 - Biquad 1", 20),
+BIQUAD_COEFS("Ch2 - Biquad 2", 25),
+BIQUAD_COEFS("Ch2 - Biquad 3", 30),
+BIQUAD_COEFS("Ch2 - Biquad 4", 35),
+BIQUAD_COEFS("High-pass", 40),
+BIQUAD_COEFS("Low-pass", 45),
+SINGLE_COEF("Ch1 - Prescale", 50),
+SINGLE_COEF("Ch2 - Prescale", 51),
+SINGLE_COEF("Ch1 - Postscale", 52),
+SINGLE_COEF("Ch2 - Postscale", 53),
+SINGLE_COEF("Ch3 - Postscale", 54),
+SINGLE_COEF("Thermal warning - Postscale", 55),
+SINGLE_COEF("Ch1 - Mix 1", 56),
+SINGLE_COEF("Ch1 - Mix 2", 57),
+SINGLE_COEF("Ch2 - Mix 1", 58),
+SINGLE_COEF("Ch2 - Mix 2", 59),
+SINGLE_COEF("Ch3 - Mix 1", 60),
+SINGLE_COEF("Ch3 - Mix 2", 61),
+};
+
+static const struct snd_soc_dapm_widget sta350_dapm_widgets[] = {
+SND_SOC_DAPM_DAC("DAC", NULL, SND_SOC_NOPM, 0, 0),
+SND_SOC_DAPM_OUTPUT("LEFT"),
+SND_SOC_DAPM_OUTPUT("RIGHT"),
+SND_SOC_DAPM_OUTPUT("SUB"),
+};
+
+static const struct snd_soc_dapm_route sta350_dapm_routes[] = {
+        { "LEFT", NULL, "DAC" },
+        { "RIGHT", NULL, "DAC" },
+        { "SUB", NULL, "DAC" },
+        { "DAC", NULL, "Playback" },
+};
+
+/* MCLK interpolation ratio per fs */
+static struct {
+        int fs;
+        int ir;
+} interpolation_ratios[] = {
+        { 32000, 0 },
+        { 44100, 0 },
+        { 48000, 0 },
+        { 88200, 1 },
+        { 96000, 1 },
+        { 176400, 2 },
+        { 192000, 2 },
+};
+
+/* MCLK to fs clock ratios */
+static int mcs_ratio_table[3][6] = {
+        { 768, 512, 384, 256, 128, 576 },
+        { 384, 256, 192, 128,  64,   0 },
+        { 192, 128,  96,  64,  32,   0 },
+};
+
+/**
+ * sta350_set_dai_sysclk - configure MCLK
+ * @codec_dai: the codec DAI
+ * @clk_id: the clock ID (ignored)
+ * @freq: the MCLK input frequency
+ * @dir: the clock direction (ignored)
+ *
+ * The value of MCLK is used to determine which sample rates are supported
+ * by the STA350, based on the mcs_ratio_table.
+ *
+ * This function must be called by the machine driver's 'startup' function,
+ * otherwise the list of supported sample rates will not be available in
+ * time for ALSA.
+ */
+static int sta350_set_dai_sysclk(struct snd_soc_dai *codec_dai,
+                                 int clk_id, unsigned int freq, int dir)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+
+        dev_dbg(codec->dev, "mclk=%u\n", freq);
+        sta350->mclk = freq;
+
+        return 0;
+}
+
+/**
+ * sta350_set_dai_fmt - configure the codec for the selected audio format
+ * @codec_dai: the codec DAI
+ * @fmt: a SND_SOC_DAIFMT_x value indicating the data format
+ *
+ * This function takes a bitmask of SND_SOC_DAIFMT_x bits and programs the
+ * codec accordingly.
+ */
+static int sta350_set_dai_fmt(struct snd_soc_dai *codec_dai,
+                              unsigned int fmt)
+{
+        struct snd_soc_codec *codec = codec_dai->codec;
+        struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+        unsigned int confb = 0;
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBS_CFS:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_I2S:
+        case SND_SOC_DAIFMT_RIGHT_J:
+        case SND_SOC_DAIFMT_LEFT_J:
+                sta350->format = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                confb |= STA350_CONFB_C2IM;
+                break;
+        case SND_SOC_DAIFMT_NB_IF:
+                confb |= STA350_CONFB_C1IM;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return regmap_update_bits(sta350->regmap, STA350_CONFB,
+                                  STA350_CONFB_C1IM | STA350_CONFB_C2IM, confb);
+}
+
+/**
+ * sta350_hw_params - program the STA350 with the given hardware parameters.
+ * @substream: the audio stream
+ * @params: the hardware parameters to set
+ * @dai: the SOC DAI (ignored)
+ *
+ * This function programs the hardware with the values provided.
+ * Specifically, the sample rate and the data format.
+ */
+static int sta350_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 sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+        int i, mcs = -EINVAL, ir = -EINVAL;
+        unsigned int confa, confb;
+        unsigned int rate, ratio;
+        int ret;
+
+        if (!sta350->mclk) {
+                dev_err(codec->dev,
+                        "sta350->mclk is unset. Unable to determine ratio\n");
+                return -EIO;
+        }
+
+        rate = params_rate(params);
+        ratio = sta350->mclk / rate;
+        dev_dbg(codec->dev, "rate: %u, ratio: %u\n", rate, ratio);
+
+        for (i = 0; i < ARRAY_SIZE(interpolation_ratios); i++) {
+                if (interpolation_ratios[i].fs == rate) {
+                        ir = interpolation_ratios[i].ir;
+                        break;
+                }
+        }
+
+        if (ir < 0) {
+                dev_err(codec->dev, "Unsupported samplerate: %u\n", rate);
+                return -EINVAL;
+        }
+
+        for (i = 0; i < 6; i++) {
+                if (mcs_ratio_table[ir][i] == ratio) {
+                        mcs = i;
+                        break;
+                }
+        }
+
+        if (mcs < 0) {
+                dev_err(codec->dev, "Unresolvable ratio: %u\n", ratio);
+                return -EINVAL;
+        }
+
+        confa = (ir << STA350_CONFA_IR_SHIFT) |
+                (mcs << STA350_CONFA_MCS_SHIFT);
+        confb = 0;
+
+        switch (params_width(params)) {
+        case 24:
+                dev_dbg(codec->dev, "24bit\n");
+                /* fall through */
+        case 32:
+                dev_dbg(codec->dev, "24bit or 32bit\n");
+                switch (sta350->format) {
+                case SND_SOC_DAIFMT_I2S:
+                        confb |= 0x0;
+                        break;
+                case SND_SOC_DAIFMT_LEFT_J:
+                        confb |= 0x1;
+                        break;
+                case SND_SOC_DAIFMT_RIGHT_J:
+                        confb |= 0x2;
+                        break;
+                }
+
+                break;
+        case 20:
+                dev_dbg(codec->dev, "20bit\n");
+                switch (sta350->format) {
+                case SND_SOC_DAIFMT_I2S:
+                        confb |= 0x4;
+                        break;
+                case SND_SOC_DAIFMT_LEFT_J:
+                        confb |= 0x5;
+                        break;
+                case SND_SOC_DAIFMT_RIGHT_J:
+                        confb |= 0x6;
+                        break;
+                }
+
+                break;
+        case 18:
+                dev_dbg(codec->dev, "18bit\n");
+                switch (sta350->format) {
+                case SND_SOC_DAIFMT_I2S:
+                        confb |= 0x8;
+                        break;
+                case SND_SOC_DAIFMT_LEFT_J:
+                        confb |= 0x9;
+                        break;
+                case SND_SOC_DAIFMT_RIGHT_J:
+                        confb |= 0xa;
+                        break;
+                }
+
+                break;
+        case 16:
+                dev_dbg(codec->dev, "16bit\n");
+                switch (sta350->format) {
+                case SND_SOC_DAIFMT_I2S:
+                        confb |= 0x0;
+                        break;
+                case SND_SOC_DAIFMT_LEFT_J:
+                        confb |= 0xd;
+                        break;
+                case SND_SOC_DAIFMT_RIGHT_J:
+                        confb |= 0xe;
+                        break;
+                }
+
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        ret = regmap_update_bits(sta350->regmap, STA350_CONFA,
+                                 STA350_CONFA_MCS_MASK | STA350_CONFA_IR_MASK,
+                                 confa);
+        if (ret < 0)
+                return ret;
+
+        ret = regmap_update_bits(sta350->regmap, STA350_CONFB,
+                                 STA350_CONFB_SAI_MASK | STA350_CONFB_SAIFB,
+                                 confb);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int sta350_startup_sequence(struct sta350_priv *sta350)
+{
+        if (sta350->gpiod_power_down)
+                gpiod_set_value(sta350->gpiod_power_down, 1);
+
+        if (sta350->gpiod_nreset) {
+                gpiod_set_value(sta350->gpiod_nreset, 0);
+                mdelay(1);
+                gpiod_set_value(sta350->gpiod_nreset, 1);
+                mdelay(1);
+        }
+
+        return 0;
+}
+
+/**
+ * sta350_set_bias_level - DAPM callback
+ * @codec: the codec device
+ * @level: DAPM power level
+ *
+ * This is called by ALSA to put the codec into low power mode
+ * or to wake it up.  If the codec is powered off completely
+ * all registers must be restored after power on.
+ */
+static int sta350_set_bias_level(struct snd_soc_codec *codec,
+                                 enum snd_soc_bias_level level)
+{
+        struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+        int ret;
+
+        dev_dbg(codec->dev, "level = %d\n", level);
+        switch (level) {
+        case SND_SOC_BIAS_ON:
+                break;
+
+        case SND_SOC_BIAS_PREPARE:
+                /* Full power on */
+                regmap_update_bits(sta350->regmap, STA350_CONFF,
+                                   STA350_CONFF_PWDN | STA350_CONFF_EAPD,
+                                   STA350_CONFF_PWDN | STA350_CONFF_EAPD);
+                break;
+
+        case SND_SOC_BIAS_STANDBY:
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
+                        ret = regulator_bulk_enable(
+                                ARRAY_SIZE(sta350->supplies),
+                                sta350->supplies);
+                        if (ret < 0) {
+                                dev_err(codec->dev,
+                                        "Failed to enable supplies: %d\n",
+                                        ret);
+                                return ret;
+                        }
+                        sta350_startup_sequence(sta350);
+                        sta350_cache_sync(codec);
+                }
+
+                /* Power down */
+                regmap_update_bits(sta350->regmap, STA350_CONFF,
+                                   STA350_CONFF_PWDN | STA350_CONFF_EAPD,
+                                   0);
+
+                break;
+
+        case SND_SOC_BIAS_OFF:
+                /* The chip runs through the power down sequence for us */
+                regmap_update_bits(sta350->regmap, STA350_CONFF,
+                                   STA350_CONFF_PWDN | STA350_CONFF_EAPD, 0);
+
+                /* power down: low */
+                if (sta350->gpiod_power_down)
+                        gpiod_set_value(sta350->gpiod_power_down, 0);
+
+                if (sta350->gpiod_nreset)
+                        gpiod_set_value(sta350->gpiod_nreset, 0);
+
+                regulator_bulk_disable(ARRAY_SIZE(sta350->supplies),
+                                       sta350->supplies);
+                break;
+        }
+        codec->dapm.bias_level = level;
+        return 0;
+}
+
+static const struct snd_soc_dai_ops sta350_dai_ops = {
+        .hw_params      = sta350_hw_params,
+        .set_sysclk     = sta350_set_dai_sysclk,
+        .set_fmt        = sta350_set_dai_fmt,
+};
+
+static struct snd_soc_dai_driver sta350_dai = {
+        .name = "sta350-hifi",
+        .playback = {
+                .stream_name = "Playback",
+                .channels_min = 2,
+                .channels_max = 2,
+                .rates = STA350_RATES,
+                .formats = STA350_FORMATS,
+        },
+        .ops = &sta350_dai_ops,
+};
+
+#ifdef CONFIG_PM
+static int sta350_suspend(struct snd_soc_codec *codec)
+{
+        sta350_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        return 0;
+}
+
+static int sta350_resume(struct snd_soc_codec *codec)
+{
+        sta350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+        return 0;
+}
+#else
+#define sta350_suspend NULL
+#define sta350_resume NULL
+#endif
+
+static int sta350_probe(struct snd_soc_codec *codec)
+{
+        struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+        struct sta350_platform_data *pdata = sta350->pdata;
+        int i, ret = 0, thermal = 0;
+
+        ret = regulator_bulk_enable(ARRAY_SIZE(sta350->supplies),
+                                    sta350->supplies);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
+                return ret;
+        }
+
+        ret = sta350_startup_sequence(sta350);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to startup device\n");
+                return ret;
+        }
+
+        /* CONFA */
+        if (!pdata->thermal_warning_recovery)
+                thermal |= STA350_CONFA_TWAB;
+        if (!pdata->thermal_warning_adjustment)
+                thermal |= STA350_CONFA_TWRB;
+        if (!pdata->fault_detect_recovery)
+                thermal |= STA350_CONFA_FDRB;
+        regmap_update_bits(sta350->regmap, STA350_CONFA,
+                           STA350_CONFA_TWAB | STA350_CONFA_TWRB |
+                           STA350_CONFA_FDRB,
+                           thermal);
+
+        /* CONFC */
+        regmap_update_bits(sta350->regmap, STA350_CONFC,
+                           STA350_CONFC_OM_MASK,
+                           pdata->ffx_power_output_mode
+                                << STA350_CONFC_OM_SHIFT);
+        regmap_update_bits(sta350->regmap, STA350_CONFC,
+                           STA350_CONFC_CSZ_MASK,
+                           pdata->drop_compensation_ns
+                                << STA350_CONFC_CSZ_SHIFT);
+        regmap_update_bits(sta350->regmap,
+                           STA350_CONFC,
+                           STA350_CONFC_OCRB,
+                           pdata->oc_warning_adjustment ?
+                                STA350_CONFC_OCRB : 0);
+
+        /* CONFE */
+        regmap_update_bits(sta350->regmap, STA350_CONFE,
+                           STA350_CONFE_MPCV,
+                           pdata->max_power_use_mpcc ?
+                                STA350_CONFE_MPCV : 0);
+        regmap_update_bits(sta350->regmap, STA350_CONFE,
+                           STA350_CONFE_MPC,
+                           pdata->max_power_correction ?
+                                STA350_CONFE_MPC : 0);
+        regmap_update_bits(sta350->regmap, STA350_CONFE,
+                           STA350_CONFE_AME,
+                           pdata->am_reduction_mode ?
+                                STA350_CONFE_AME : 0);
+        regmap_update_bits(sta350->regmap, STA350_CONFE,
+                           STA350_CONFE_PWMS,
+                           pdata->odd_pwm_speed_mode ?
+                                STA350_CONFE_PWMS : 0);
+        regmap_update_bits(sta350->regmap, STA350_CONFE,
+                           STA350_CONFE_DCCV,
+                           pdata->distortion_compensation ?
+                                STA350_CONFE_DCCV : 0);
+        /*  CONFF */
+        regmap_update_bits(sta350->regmap, STA350_CONFF,
+                           STA350_CONFF_IDE,
+                           pdata->invalid_input_detect_mute ?
+                                STA350_CONFF_IDE : 0);
+        regmap_update_bits(sta350->regmap, STA350_CONFF,
+                           STA350_CONFF_OCFG_MASK,
+                           pdata->output_conf
+                                << STA350_CONFF_OCFG_SHIFT);
+
+        /* channel to output mapping */
+        regmap_update_bits(sta350->regmap, STA350_C1CFG,
+                           STA350_CxCFG_OM_MASK,
+                           pdata->ch1_output_mapping
+                                << STA350_CxCFG_OM_SHIFT);
+        regmap_update_bits(sta350->regmap, STA350_C2CFG,
+                           STA350_CxCFG_OM_MASK,
+                           pdata->ch2_output_mapping
+                                << STA350_CxCFG_OM_SHIFT);
+        regmap_update_bits(sta350->regmap, STA350_C3CFG,
+                           STA350_CxCFG_OM_MASK,
+                           pdata->ch3_output_mapping
+                                << STA350_CxCFG_OM_SHIFT);
+
+        /* miscellaneous registers */
+        regmap_update_bits(sta350->regmap, STA350_MISC1,
+                           STA350_MISC1_CPWMEN,
+                           pdata->activate_mute_output ?
+                                STA350_MISC1_CPWMEN : 0);
+        regmap_update_bits(sta350->regmap, STA350_MISC1,
+                           STA350_MISC1_BRIDGOFF,
+                           pdata->bridge_immediate_off ?
+                                STA350_MISC1_BRIDGOFF : 0);
+        regmap_update_bits(sta350->regmap, STA350_MISC1,
+                           STA350_MISC1_NSHHPEN,
+                           pdata->noise_shape_dc_cut ?
+                                STA350_MISC1_NSHHPEN : 0);
+        regmap_update_bits(sta350->regmap, STA350_MISC1,
+                           STA350_MISC1_RPDNEN,
+                           pdata->powerdown_master_vol ?
+                                STA350_MISC1_RPDNEN: 0);
+
+        regmap_update_bits(sta350->regmap, STA350_MISC2,
+                           STA350_MISC2_PNDLSL_MASK,
+                           pdata->powerdown_delay_divider
+                                << STA350_MISC2_PNDLSL_SHIFT);
+
+        /* initialize coefficient shadow RAM with reset values */
+        for (i = 4; i <= 49; i += 5)
+                sta350->coef_shadow[i] = 0x400000;
+        for (i = 50; i <= 54; i++)
+                sta350->coef_shadow[i] = 0x7fffff;
+        sta350->coef_shadow[55] = 0x5a9df7;
+        sta350->coef_shadow[56] = 0x7fffff;
+        sta350->coef_shadow[59] = 0x7fffff;
+        sta350->coef_shadow[60] = 0x400000;
+        sta350->coef_shadow[61] = 0x400000;
+
+        sta350_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+        /* Bias level configuration will have done an extra enable */
+        regulator_bulk_disable(ARRAY_SIZE(sta350->supplies), sta350->supplies);
+
+        return 0;
+}
+
+static int sta350_remove(struct snd_soc_codec *codec)
+{
+        struct sta350_priv *sta350 = snd_soc_codec_get_drvdata(codec);
+
+        sta350_set_bias_level(codec, SND_SOC_BIAS_OFF);
+        regulator_bulk_disable(ARRAY_SIZE(sta350->supplies), sta350->supplies);
+
+        return 0;
+}
+
+static const struct snd_soc_codec_driver sta350_codec = {
+        .probe =                sta350_probe,
+        .remove =               sta350_remove,
+        .suspend =              sta350_suspend,
+        .resume =               sta350_resume,
+        .set_bias_level =       sta350_set_bias_level,
+        .controls =             sta350_snd_controls,
+        .num_controls =         ARRAY_SIZE(sta350_snd_controls),
+        .dapm_widgets =         sta350_dapm_widgets,
+        .num_dapm_widgets =     ARRAY_SIZE(sta350_dapm_widgets),
+        .dapm_routes =          sta350_dapm_routes,
+        .num_dapm_routes =      ARRAY_SIZE(sta350_dapm_routes),
+};
+
+static const struct regmap_config sta350_regmap = {
+        .reg_bits =             8,
+        .val_bits =             8,
+        .max_register =         STA350_MISC2,
+        .reg_defaults =         sta350_regs,
+        .num_reg_defaults =     ARRAY_SIZE(sta350_regs),
+        .cache_type =           REGCACHE_RBTREE,
+        .wr_table =             &sta350_write_regs,
+        .rd_table =             &sta350_read_regs,
+        .volatile_table =       &sta350_volatile_regs,
+};
+
+#ifdef CONFIG_OF
+static const struct of_device_id st350_dt_ids[] = {
+        { .compatible = "st,sta350", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, st350_dt_ids);
+
+static const char * const sta350_ffx_modes[] = {
+        [STA350_FFX_PM_DROP_COMP]               = "drop-compensation",
+        [STA350_FFX_PM_TAPERED_COMP]            = "tapered-compensation",
+        [STA350_FFX_PM_FULL_POWER]              = "full-power-mode",
+        [STA350_FFX_PM_VARIABLE_DROP_COMP]      = "variable-drop-compensation",
+};
+
+static int sta350_probe_dt(struct device *dev, struct sta350_priv *sta350)
+{
+        struct device_node *np = dev->of_node;
+        struct sta350_platform_data *pdata;
+        const char *ffx_power_mode;
+        u16 tmp;
+        u8 tmp8;
+
+        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                return -ENOMEM;
+
+        of_property_read_u8(np, "st,output-conf",
+                            &pdata->output_conf);
+        of_property_read_u8(np, "st,ch1-output-mapping",
+                            &pdata->ch1_output_mapping);
+        of_property_read_u8(np, "st,ch2-output-mapping",
+                            &pdata->ch2_output_mapping);
+        of_property_read_u8(np, "st,ch3-output-mapping",
+                            &pdata->ch3_output_mapping);
+
+        if (of_get_property(np, "st,thermal-warning-recovery", NULL))
+                pdata->thermal_warning_recovery = 1;
+        if (of_get_property(np, "st,thermal-warning-adjustment", NULL))
+                pdata->thermal_warning_adjustment = 1;
+        if (of_get_property(np, "st,fault-detect-recovery", NULL))
+                pdata->fault_detect_recovery = 1;
+
+        pdata->ffx_power_output_mode = STA350_FFX_PM_VARIABLE_DROP_COMP;
+        if (!of_property_read_string(np, "st,ffx-power-output-mode",
+                                     &ffx_power_mode)) {
+                int i, mode = -EINVAL;
+
+                for (i = 0; i < ARRAY_SIZE(sta350_ffx_modes); i++)
+                        if (!strcasecmp(ffx_power_mode, sta350_ffx_modes[i]))
+                                mode = i;
+
+                if (mode < 0)
+                        dev_warn(dev, "Unsupported ffx output mode: %s\n",
+                                 ffx_power_mode);
+                else
+                        pdata->ffx_power_output_mode = mode;
+        }
+
+        tmp = 140;
+        of_property_read_u16(np, "st,drop-compensation-ns", &tmp);
+        pdata->drop_compensation_ns = clamp_t(u16, tmp, 0, 300) / 20;
+
+        if (of_get_property(np, "st,overcurrent-warning-adjustment", NULL))
+                pdata->oc_warning_adjustment = 1;
+
+        /* CONFE */
+        if (of_get_property(np, "st,max-power-use-mpcc", NULL))
+                pdata->max_power_use_mpcc = 1;
+
+        if (of_get_property(np, "st,max-power-correction", NULL))
+                pdata->max_power_correction = 1;
+
+        if (of_get_property(np, "st,am-reduction-mode", NULL))
+                pdata->am_reduction_mode = 1;
+
+        if (of_get_property(np, "st,odd-pwm-speed-mode", NULL))
+                pdata->odd_pwm_speed_mode = 1;
+
+        if (of_get_property(np, "st,distortion-compensation", NULL))
+                pdata->distortion_compensation = 1;
+
+        /* CONFF */
+        if (of_get_property(np, "st,invalid-input-detect-mute", NULL))
+                pdata->invalid_input_detect_mute = 1;
+
+        /* MISC */
+        if (of_get_property(np, "st,activate-mute-output", NULL))
+                pdata->activate_mute_output = 1;
+
+        if (of_get_property(np, "st,bridge-immediate-off", NULL))
+                pdata->bridge_immediate_off = 1;
+
+        if (of_get_property(np, "st,noise-shape-dc-cut", NULL))
+                pdata->noise_shape_dc_cut = 1;
+
+        if (of_get_property(np, "st,powerdown-master-volume", NULL))
+                pdata->powerdown_master_vol = 1;
+
+        if (!of_property_read_u8(np, "st,powerdown-delay-divider", &tmp8)) {
+                if (is_power_of_2(tmp8) && tmp8 >= 1 && tmp8 <= 128)
+                        pdata->powerdown_delay_divider = ilog2(tmp8);
+                else
+                        dev_warn(dev, "Unsupported powerdown delay divider %d\n",
+                                 tmp8);
+        }
+
+        sta350->pdata = pdata;
+
+        return 0;
+}
+#endif
+
+static int sta350_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
+{
+        struct device *dev = &i2c->dev;
+        struct sta350_priv *sta350;
+        int ret, i;
+
+        sta350 = devm_kzalloc(dev, sizeof(struct sta350_priv), GFP_KERNEL);
+        if (!sta350)
+                return -ENOMEM;
+
+        mutex_init(&sta350->coeff_lock);
+        sta350->pdata = dev_get_platdata(dev);
+
+#ifdef CONFIG_OF
+        if (dev->of_node) {
+                ret = sta350_probe_dt(dev, sta350);
+                if (ret < 0)
+                        return ret;
+        }
+#endif
+
+        /* GPIOs */
+        sta350->gpiod_nreset = devm_gpiod_get(dev, "reset");
+        if (IS_ERR(sta350->gpiod_nreset)) {
+                ret = PTR_ERR(sta350->gpiod_nreset);
+                if (ret != -ENOENT && ret != -ENOSYS)
+                        return ret;
+
+                sta350->gpiod_nreset = NULL;
+        } else {
+                gpiod_direction_output(sta350->gpiod_nreset, 0);
+        }
+
+        sta350->gpiod_power_down = devm_gpiod_get(dev, "power-down");
+        if (IS_ERR(sta350->gpiod_power_down)) {
+                ret = PTR_ERR(sta350->gpiod_power_down);
+                if (ret != -ENOENT && ret != -ENOSYS)
+                        return ret;
+
+                sta350->gpiod_power_down = NULL;
+        } else {
+                gpiod_direction_output(sta350->gpiod_power_down, 0);
+        }
+
+        /* regulators */
+        for (i = 0; i < ARRAY_SIZE(sta350->supplies); i++)
+                sta350->supplies[i].supply = sta350_supply_names[i];
+
+        ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(sta350->supplies),
+                                      sta350->supplies);
+        if (ret < 0) {
+                dev_err(dev, "Failed to request supplies: %d\n", ret);
+                return ret;
+        }
+
+        sta350->regmap = devm_regmap_init_i2c(i2c, &sta350_regmap);
+        if (IS_ERR(sta350->regmap)) {
+                ret = PTR_ERR(sta350->regmap);
+                dev_err(dev, "Failed to init regmap: %d\n", ret);
+                return ret;
+        }
+
+        i2c_set_clientdata(i2c, sta350);
+
+        ret = snd_soc_register_codec(dev, &sta350_codec, &sta350_dai, 1);
+        if (ret < 0)
+                dev_err(dev, "Failed to register codec (%d)\n", ret);
+
+        return ret;
+}
+
+static int sta350_i2c_remove(struct i2c_client *client)
+{
+        snd_soc_unregister_codec(&client->dev);
+        return 0;
+}
+
+static const struct i2c_device_id sta350_i2c_id[] = {
+        { "sta350", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, sta350_i2c_id);
+
+static struct i2c_driver sta350_i2c_driver = {
+        .driver = {
+                .name = "sta350",
+                .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(st350_dt_ids),
+        },
+        .probe =    sta350_i2c_probe,
+        .remove =   sta350_i2c_remove,
+        .id_table = sta350_i2c_id,
+};
+
+module_i2c_driver(sta350_i2c_driver);
+
+MODULE_DESCRIPTION("ASoC STA350 driver");
+MODULE_AUTHOR("Sven Brandau <info@brandau.biz>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/sta350.h b/sound/soc/codecs/sta350.h
new file mode 100644
index 000000000000..fb7285290779
--- /dev/null
+++ b/sound/soc/codecs/sta350.h
@@ -0,0 +1,238 @@
+/*
+ * Codec driver for ST STA350 2.1-channel high-efficiency digital audio system
+ *
+ * Copyright: 2011 Raumfeld GmbH
+ * Author: Sven Brandau <info@brandau.biz>
+ *
+ * based on code from:
+ *      Raumfeld GmbH
+ *        Johannes Stezenbach <js@sig21.net>
+ *      Wolfson Microelectronics PLC.
+ *        Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#ifndef _ASOC_STA_350_H
+#define _ASOC_STA_350_H
+
+/* STA50 register addresses */
+
+#define STA350_REGISTER_COUNT   0x4D
+#define STA350_COEF_COUNT 62
+
+#define STA350_CONFA    0x00
+#define STA350_CONFB    0x01
+#define STA350_CONFC    0x02
+#define STA350_CONFD    0x03
+#define STA350_CONFE    0x04
+#define STA350_CONFF    0x05
+#define STA350_MMUTE    0x06
+#define STA350_MVOL     0x07
+#define STA350_C1VOL    0x08
+#define STA350_C2VOL    0x09
+#define STA350_C3VOL    0x0a
+#define STA350_AUTO1    0x0b
+#define STA350_AUTO2    0x0c
+#define STA350_AUTO3    0x0d
+#define STA350_C1CFG    0x0e
+#define STA350_C2CFG    0x0f
+#define STA350_C3CFG    0x10
+#define STA350_TONE     0x11
+#define STA350_L1AR     0x12
+#define STA350_L1ATRT   0x13
+#define STA350_L2AR     0x14
+#define STA350_L2ATRT   0x15
+#define STA350_CFADDR2  0x16
+#define STA350_B1CF1    0x17
+#define STA350_B1CF2    0x18
+#define STA350_B1CF3    0x19
+#define STA350_B2CF1    0x1a
+#define STA350_B2CF2    0x1b
+#define STA350_B2CF3    0x1c
+#define STA350_A1CF1    0x1d
+#define STA350_A1CF2    0x1e
+#define STA350_A1CF3    0x1f
+#define STA350_A2CF1    0x20
+#define STA350_A2CF2    0x21
+#define STA350_A2CF3    0x22
+#define STA350_B0CF1    0x23
+#define STA350_B0CF2    0x24
+#define STA350_B0CF3    0x25
+#define STA350_CFUD     0x26
+#define STA350_MPCC1    0x27
+#define STA350_MPCC2    0x28
+#define STA350_DCC1     0x29
+#define STA350_DCC2     0x2a
+#define STA350_FDRC1    0x2b
+#define STA350_FDRC2    0x2c
+#define STA350_STATUS   0x2d
+/* reserved: 0x2d - 0x30 */
+#define STA350_EQCFG    0x31
+#define STA350_EATH1    0x32
+#define STA350_ERTH1    0x33
+#define STA350_EATH2    0x34
+#define STA350_ERTH2    0x35
+#define STA350_CONFX    0x36
+#define STA350_SVCA     0x37
+#define STA350_SVCB     0x38
+#define STA350_RMS0A    0x39
+#define STA350_RMS0B    0x3a
+#define STA350_RMS0C    0x3b
+#define STA350_RMS1A    0x3c
+#define STA350_RMS1B    0x3d
+#define STA350_RMS1C    0x3e
+#define STA350_EVOLRES  0x3f
+/* reserved: 0x40 - 0x47 */
+#define STA350_NSHAPE   0x48
+#define STA350_CTXB4B1  0x49
+#define STA350_CTXB7B5  0x4a
+#define STA350_MISC1    0x4b
+#define STA350_MISC2    0x4c
+
+/* 0x00 CONFA */
+#define STA350_CONFA_MCS_MASK   0x03
+#define STA350_CONFA_MCS_SHIFT  0
+#define STA350_CONFA_IR_MASK    0x18
+#define STA350_CONFA_IR_SHIFT   3
+#define STA350_CONFA_TWRB       BIT(5)
+#define STA350_CONFA_TWAB       BIT(6)
+#define STA350_CONFA_FDRB       BIT(7)
+
+/* 0x01 CONFB */
+#define STA350_CONFB_SAI_MASK   0x0f
+#define STA350_CONFB_SAI_SHIFT  0
+#define STA350_CONFB_SAIFB      BIT(4)
+#define STA350_CONFB_DSCKE      BIT(5)
+#define STA350_CONFB_C1IM       BIT(6)
+#define STA350_CONFB_C2IM       BIT(7)
+
+/* 0x02 CONFC */
+#define STA350_CONFC_OM_MASK    0x03
+#define STA350_CONFC_OM_SHIFT   0
+#define STA350_CONFC_CSZ_MASK   0x3c
+#define STA350_CONFC_CSZ_SHIFT  2
+#define STA350_CONFC_OCRB       BIT(7)
+
+/* 0x03 CONFD */
+#define STA350_CONFD_HPB_SHIFT  0
+#define STA350_CONFD_DEMP_SHIFT 1
+#define STA350_CONFD_DSPB_SHIFT 2
+#define STA350_CONFD_PSL_SHIFT  3
+#define STA350_CONFD_BQL_SHIFT  4
+#define STA350_CONFD_DRC_SHIFT  5
+#define STA350_CONFD_ZDE_SHIFT  6
+#define STA350_CONFD_SME_SHIFT  7
+
+/* 0x04 CONFE */
+#define STA350_CONFE_MPCV       BIT(0)
+#define STA350_CONFE_MPCV_SHIFT 0
+#define STA350_CONFE_MPC        BIT(1)
+#define STA350_CONFE_MPC_SHIFT  1
+#define STA350_CONFE_NSBW       BIT(2)
+#define STA350_CONFE_NSBW_SHIFT 2
+#define STA350_CONFE_AME        BIT(3)
+#define STA350_CONFE_AME_SHIFT  3
+#define STA350_CONFE_PWMS       BIT(4)
+#define STA350_CONFE_PWMS_SHIFT 4
+#define STA350_CONFE_DCCV       BIT(5)
+#define STA350_CONFE_DCCV_SHIFT 5
+#define STA350_CONFE_ZCE        BIT(6)
+#define STA350_CONFE_ZCE_SHIFT  6
+#define STA350_CONFE_SVE        BIT(7)
+#define STA350_CONFE_SVE_SHIFT  7
+
+/* 0x05 CONFF */
+#define STA350_CONFF_OCFG_MASK  0x03
+#define STA350_CONFF_OCFG_SHIFT 0
+#define STA350_CONFF_IDE        BIT(2)
+#define STA350_CONFF_BCLE       BIT(3)
+#define STA350_CONFF_LDTE       BIT(4)
+#define STA350_CONFF_ECLE       BIT(5)
+#define STA350_CONFF_PWDN       BIT(6)
+#define STA350_CONFF_EAPD       BIT(7)
+
+/* 0x06 MMUTE */
+#define STA350_MMUTE_MMUTE              0x01
+#define STA350_MMUTE_MMUTE_SHIFT        0
+#define STA350_MMUTE_C1M                0x02
+#define STA350_MMUTE_C1M_SHIFT          1
+#define STA350_MMUTE_C2M                0x04
+#define STA350_MMUTE_C2M_SHIFT          2
+#define STA350_MMUTE_C3M                0x08
+#define STA350_MMUTE_C3M_SHIFT          3
+#define STA350_MMUTE_LOC_MASK           0xC0
+#define STA350_MMUTE_LOC_SHIFT          6
+
+/* 0x0b AUTO1 */
+#define STA350_AUTO1_AMGC_MASK  0x30
+#define STA350_AUTO1_AMGC_SHIFT 4
+
+/* 0x0c AUTO2 */
+#define STA350_AUTO2_AMAME      0x01
+#define STA350_AUTO2_AMAM_MASK  0x0e
+#define STA350_AUTO2_AMAM_SHIFT 1
+#define STA350_AUTO2_XO_MASK    0xf0
+#define STA350_AUTO2_XO_SHIFT   4
+
+/* 0x0d AUTO3 */
+#define STA350_AUTO3_PEQ_MASK   0x1f
+#define STA350_AUTO3_PEQ_SHIFT  0
+
+/* 0x0e 0x0f 0x10 CxCFG */
+#define STA350_CxCFG_TCB_SHIFT  0
+#define STA350_CxCFG_EQBP_SHIFT 1
+#define STA350_CxCFG_VBP_SHIFT  2
+#define STA350_CxCFG_BO_SHIFT   3
+#define STA350_CxCFG_LS_SHIFT   4
+#define STA350_CxCFG_OM_MASK    0xc0
+#define STA350_CxCFG_OM_SHIFT   6
+
+/* 0x11 TONE */
+#define STA350_TONE_BTC_SHIFT   0
+#define STA350_TONE_TTC_SHIFT   4
+
+/* 0x12 0x13 0x14 0x15 limiter attack/release */
+#define STA350_LxA_SHIFT        0
+#define STA350_LxR_SHIFT        4
+
+/* 0x26 CFUD */
+#define STA350_CFUD_W1          0x01
+#define STA350_CFUD_WA          0x02
+#define STA350_CFUD_R1          0x04
+#define STA350_CFUD_RA          0x08
+
+
+/* biquad filter coefficient table offsets */
+#define STA350_C1_BQ_BASE       0
+#define STA350_C2_BQ_BASE       20
+#define STA350_CH_BQ_NUM        4
+#define STA350_BQ_NUM_COEF      5
+#define STA350_XO_HP_BQ_BASE    40
+#define STA350_XO_LP_BQ_BASE    45
+#define STA350_C1_PRESCALE      50
+#define STA350_C2_PRESCALE      51
+#define STA350_C1_POSTSCALE     52
+#define STA350_C2_POSTSCALE     53
+#define STA350_C3_POSTSCALE     54
+#define STA350_TW_POSTSCALE     55
+#define STA350_C1_MIX1          56
+#define STA350_C1_MIX2          57
+#define STA350_C2_MIX1          58
+#define STA350_C2_MIX2          59
+#define STA350_C3_MIX1          60
+#define STA350_C3_MIX2          61
+
+/* miscellaneous register 1 */
+#define STA350_MISC1_CPWMEN     BIT(2)
+#define STA350_MISC1_BRIDGOFF   BIT(5)
+#define STA350_MISC1_NSHHPEN    BIT(6)
+#define STA350_MISC1_RPDNEN     BIT(7)
+
+/* miscellaneous register 2 */
+#define STA350_MISC2_PNDLSL_MASK        0x1c
+#define STA350_MISC2_PNDLSL_SHIFT       2
+
+#endif /* _ASOC_STA_350_H */
diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
index a895a5e4bdf2..d48491a4a19d 100644
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -272,7 +272,7 @@ static int tas5086_set_deemph(struct snd_soc_codec *codec)
 static int tas5086_get_deemph(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = priv->deemph;
@@ -283,7 +283,7 @@ static int tas5086_get_deemph(struct snd_kcontrol *kcontrol,
 static int tas5086_put_deemph(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
 
         priv->deemph = ucontrol->value.enumerated.item[0];
diff --git a/sound/soc/codecs/tlv320aic23-i2c.c b/sound/soc/codecs/tlv320aic23-i2c.c
index b73c94ebcc2a..f13701995482 100644
--- a/sound/soc/codecs/tlv320aic23-i2c.c
+++ b/sound/soc/codecs/tlv320aic23-i2c.c
@@ -13,6 +13,7 @@
 
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/regmap.h>
 #include <sound/soc.h>
 
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index 20864ee8793b..686b8b85b956 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -82,7 +82,7 @@ static const DECLARE_TLV_DB_SCALE(sidetone_vol_tlv, -1800, 300, 0);
 static int snd_soc_tlv320aic23_put_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         u16 val, reg;
 
         val = (ucontrol->value.integer.value[0] & 0x07);
@@ -105,7 +105,7 @@ static int snd_soc_tlv320aic23_put_volsw(struct snd_kcontrol *kcontrol,
 static int snd_soc_tlv320aic23_get_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         u16 val;
 
         val = snd_soc_read(codec, TLV320AIC23_ANLG) & (0x1C0);
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index d1929de641e2..23419109ecac 100644
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -28,6 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
+#include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/slab.h>
 #include <sound/core.h>
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 6bfc8a17331b..df3a7506c023 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -442,7 +442,7 @@ static int dac33_playback_event(struct snd_soc_dapm_widget *w,
 static int dac33_get_fifo_mode(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = dac33->fifo_mode;
@@ -453,7 +453,7 @@ static int dac33_get_fifo_mode(struct snd_kcontrol *kcontrol,
 static int dac33_set_fifo_mode(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec);
         int ret = 0;
 
@@ -1540,7 +1540,7 @@ static int dac33_i2c_probe(struct i2c_client *client,
         for (i = 0; i < ARRAY_SIZE(dac33->supplies); i++)
                 dac33->supplies[i].supply = dac33_supply_names[i];
 
-        ret = regulator_bulk_get(&client->dev, ARRAY_SIZE(dac33->supplies),
+        ret = devm_regulator_bulk_get(&client->dev, ARRAY_SIZE(dac33->supplies),
                                  dac33->supplies);
 
         if (ret != 0) {
@@ -1551,11 +1551,9 @@ static int dac33_i2c_probe(struct i2c_client *client,
         ret = snd_soc_register_codec(&client->dev,
                         &soc_codec_dev_tlv320dac33, &dac33_dai, 1);
         if (ret < 0)
-                goto err_register;
+                goto err_get;
 
         return ret;
-err_register:
-        regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
 err_get:
         if (dac33->power_gpio >= 0)
                 gpio_free(dac33->power_gpio);
@@ -1573,8 +1571,6 @@ static int dac33_i2c_remove(struct i2c_client *client)
         if (dac33->power_gpio >= 0)
                 gpio_free(dac33->power_gpio);
 
-        regulator_bulk_free(ARRAY_SIZE(dac33->supplies), dac33->supplies);
-
         snd_soc_unregister_codec(&client->dev);
         return 0;
 }
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index b27c396037d4..8fc5a647453b 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -30,6 +30,7 @@
 #include <sound/tpa6130a2-plat.h>
 #include <sound/soc.h>
 #include <sound/tlv.h>
+#include <linux/of.h>
 #include <linux/of_gpio.h>
 
 #include "tpa6130a2.h"
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 975e0f760ac1..69e12a311ba2 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -830,7 +830,7 @@ static int snd_soc_get_volsw_twl4030(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int shift = mc->shift;
         unsigned int rshift = mc->rshift;
@@ -859,7 +859,7 @@ static int snd_soc_put_volsw_twl4030(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int shift = mc->shift;
         unsigned int rshift = mc->rshift;
@@ -888,7 +888,7 @@ static int snd_soc_get_volsw_r2_twl4030(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         unsigned int shift = mc->shift;
@@ -915,7 +915,7 @@ static int snd_soc_put_volsw_r2_twl4030(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         unsigned int shift = mc->shift;
@@ -956,7 +956,7 @@ static SOC_ENUM_SINGLE_DECL(twl4030_op_modes_enum,
 static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
 
         if (twl4030->configured) {
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index bd3a20647fdf..0f6067f04e29 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -484,7 +484,7 @@ static SOC_ENUM_SINGLE_EXT_DECL(twl6040_power_mode_enum,
 static int twl6040_headset_power_get_enum(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = priv->hs_power_mode;
@@ -495,7 +495,7 @@ static int twl6040_headset_power_get_enum(struct snd_kcontrol *kcontrol,
 static int twl6040_headset_power_put_enum(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
         int high_perf = ucontrol->value.enumerated.item[0];
         int ret = 0;
@@ -512,7 +512,7 @@ static int twl6040_headset_power_put_enum(struct snd_kcontrol *kcontrol,
 static int twl6040_pll_get_enum(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = priv->pll_power_mode;
@@ -523,7 +523,7 @@ static int twl6040_pll_get_enum(struct snd_kcontrol *kcontrol,
 static int twl6040_pll_put_enum(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
 
         priv->pll_power_mode = ucontrol->value.enumerated.item[0];
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 6be5f80b65f1..4ead0dc02b87 100644
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -172,7 +172,7 @@ out:
 static int snd_wl1273_get_audio_route(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = wl1273->mode;
@@ -190,7 +190,7 @@ static const char * const wl1273_audio_route[] = { "Bt", "FmRx", "FmTx" };
 static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
 
         if (wl1273->mode == ucontrol->value.integer.value[0])
@@ -214,7 +214,7 @@ static SOC_ENUM_SINGLE_EXT_DECL(wl1273_enum, wl1273_audio_route);
 static int snd_wl1273_fm_audio_get(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
 
         dev_dbg(codec->dev, "%s: enter.\n", __func__);
@@ -227,7 +227,7 @@ static int snd_wl1273_fm_audio_get(struct snd_kcontrol *kcontrol,
 static int snd_wl1273_fm_audio_put(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
         int val, r = 0;
 
@@ -251,7 +251,7 @@ static SOC_ENUM_SINGLE_EXT_DECL(wl1273_audio_enum, wl1273_audio_strings);
 static int snd_wl1273_fm_volume_get(struct snd_kcontrol *kcontrol,
                                     struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
 
         dev_dbg(codec->dev, "%s: enter.\n", __func__);
@@ -264,7 +264,7 @@ static int snd_wl1273_fm_volume_get(struct snd_kcontrol *kcontrol,
 static int snd_wl1273_fm_volume_put(struct snd_kcontrol *kcontrol,
                                     struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
         int r;
 
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index 83a2c872925c..a4c352cc3464 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -607,7 +607,7 @@ static int wm2000_anc_set_mode(struct wm2000_priv *wm2000)
 static int wm2000_anc_mode_get(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
 
         ucontrol->value.enumerated.item[0] = wm2000->anc_active;
@@ -618,7 +618,7 @@ static int wm2000_anc_mode_get(struct snd_kcontrol *kcontrol,
 static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
         int anc_active = ucontrol->value.enumerated.item[0];
         int ret;
@@ -640,7 +640,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol,
 static int wm2000_speaker_get(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
 
         ucontrol->value.enumerated.item[0] = wm2000->spk_ena;
@@ -651,7 +651,7 @@ static int wm2000_speaker_get(struct snd_kcontrol *kcontrol,
 static int wm2000_speaker_put(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
         int val = ucontrol->value.enumerated.item[0];
         int ret;
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
index 2e721e06671b..cdea9d9c1631 100644
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -1083,7 +1083,7 @@ static int wm2200_mixer_values[] = {
 
 #define WM2200_MUX_CTL_DECL(name) \
         const struct snd_kcontrol_new name##_mux =      \
-                SOC_DAPM_VALUE_ENUM("Route", name##_enum)
+                SOC_DAPM_ENUM("Route", name##_enum)
 
 #define WM2200_MIXER_ENUMS(name, base_reg) \
         static WM2200_MUX_ENUM_DECL(name##_in1_enum, base_reg);      \
@@ -1207,7 +1207,7 @@ WM2200_MIXER_ENUMS(LHPF1, WM2200_LHPF1MIX_INPUT_1_SOURCE);
 WM2200_MIXER_ENUMS(LHPF2, WM2200_LHPF2MIX_INPUT_1_SOURCE);
 
 #define WM2200_MUX(name, ctrl) \
-        SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
+        SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
 
 #define WM2200_MIXER_WIDGETS(name, name_str)    \
         WM2200_MUX(name_str " Input 1", &name##_in1_mux), \
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index eca983fad891..91a9ea2a2056 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -390,7 +390,7 @@ static int wm5100_mixer_values[] = {
 
 #define WM5100_MUX_CTL_DECL(name) \
         const struct snd_kcontrol_new name##_mux =      \
-                SOC_DAPM_VALUE_ENUM("Route", name##_enum)
+                SOC_DAPM_ENUM("Route", name##_enum)
 
 #define WM5100_MIXER_ENUMS(name, base_reg) \
         static WM5100_MUX_ENUM_DECL(name##_in1_enum, base_reg);      \
@@ -448,7 +448,7 @@ WM5100_MIXER_ENUMS(LHPF3, WM5100_HPLP3MIX_INPUT_1_SOURCE);
 WM5100_MIXER_ENUMS(LHPF4, WM5100_HPLP4MIX_INPUT_1_SOURCE);
 
 #define WM5100_MUX(name, ctrl) \
-        SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
+        SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
 
 #define WM5100_MIXER_WIDGETS(name, name_str)    \
         WM5100_MUX(name_str " Input 1", &name##_in1_mux), \
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index dcf1d12cfef8..289b64d89abd 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -764,8 +764,8 @@ SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode),
 SOC_ENUM("LHPF3 Mode", arizona_lhpf3_mode),
 SOC_ENUM("LHPF4 Mode", arizona_lhpf4_mode),
 
-SOC_VALUE_ENUM("ISRC1 FSL", arizona_isrc_fsl[0]),
-SOC_VALUE_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),
+SOC_ENUM("ISRC1 FSL", arizona_isrc_fsl[0]),
+SOC_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),
 
 ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE),
@@ -814,9 +814,9 @@ SOC_DOUBLE_R_TLV("SPKDAT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_5L,
                  ARIZONA_DAC_DIGITAL_VOLUME_5R, ARIZONA_OUT5L_VOL_SHIFT,
                  0xbf, 0, digital_tlv),
 
-SOC_VALUE_ENUM("HPOUT1 OSR", wm5102_hpout_osr[0]),
-SOC_VALUE_ENUM("HPOUT2 OSR", wm5102_hpout_osr[1]),
-SOC_VALUE_ENUM("EPOUT OSR", wm5102_hpout_osr[2]),
+SOC_ENUM("HPOUT1 OSR", wm5102_hpout_osr[0]),
+SOC_ENUM("HPOUT2 OSR", wm5102_hpout_osr[1]),
+SOC_ENUM("EPOUT OSR", wm5102_hpout_osr[2]),
 
 SOC_DOUBLE("HPOUT1 DRE Switch", ARIZONA_DRE_ENABLE,
            ARIZONA_DRE1L_ENA_SHIFT, ARIZONA_DRE1R_ENA_SHIFT, 1, 0),
@@ -970,7 +970,7 @@ static const struct soc_enum wm5102_aec_loopback =
                               wm5102_aec_loopback_values);
 
 static const struct snd_kcontrol_new wm5102_aec_loopback_mux =
-        SOC_DAPM_VALUE_ENUM("AEC Loopback", wm5102_aec_loopback);
+        SOC_DAPM_ENUM("AEC Loopback", wm5102_aec_loopback);
 
 static const struct snd_soc_dapm_widget wm5102_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
@@ -1204,7 +1204,7 @@ SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,
 
 ARIZONA_DSP_WIDGETS(DSP1, "DSP1"),
 
-SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
+SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
                        ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,
                        &wm5102_aec_loopback_mux),
 
@@ -1760,10 +1760,6 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
         struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
         int ret;
 
-        ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap);
-        if (ret != 0)
-                return ret;
-
         ret = snd_soc_add_codec_controls(codec, wm_adsp2_fw_controls, 2);
         if (ret != 0)
                 return ret;
@@ -1802,9 +1798,17 @@ static unsigned int wm5102_digital_vu[] = {
         ARIZONA_DAC_DIGITAL_VOLUME_5R,
 };
 
+static struct regmap *wm5102_get_regmap(struct device *dev)
+{
+        struct wm5102_priv *priv = dev_get_drvdata(dev);
+
+        return priv->core.arizona->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_wm5102 = {
         .probe = wm5102_codec_probe,
         .remove = wm5102_codec_remove,
+        .get_regmap = wm5102_get_regmap,
 
         .idle_bias_off = true,
 
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index df5a38dd8328..2e5fcb559e90 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -324,13 +324,13 @@ SOC_ENUM("LHPF2 Mode", arizona_lhpf2_mode),
 SOC_ENUM("LHPF3 Mode", arizona_lhpf3_mode),
 SOC_ENUM("LHPF4 Mode", arizona_lhpf4_mode),
 
-SOC_VALUE_ENUM("ISRC1 FSL", arizona_isrc_fsl[0]),
-SOC_VALUE_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),
-SOC_VALUE_ENUM("ISRC3 FSL", arizona_isrc_fsl[2]),
-SOC_VALUE_ENUM("ISRC1 FSH", arizona_isrc_fsh[0]),
-SOC_VALUE_ENUM("ISRC2 FSH", arizona_isrc_fsh[1]),
-SOC_VALUE_ENUM("ISRC3 FSH", arizona_isrc_fsh[2]),
-SOC_VALUE_ENUM("ASRC RATE 1", arizona_asrc_rate1),
+SOC_ENUM("ISRC1 FSL", arizona_isrc_fsl[0]),
+SOC_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),
+SOC_ENUM("ISRC3 FSL", arizona_isrc_fsl[2]),
+SOC_ENUM("ISRC1 FSH", arizona_isrc_fsh[0]),
+SOC_ENUM("ISRC2 FSH", arizona_isrc_fsh[1]),
+SOC_ENUM("ISRC3 FSH", arizona_isrc_fsh[2]),
+SOC_ENUM("ASRC RATE 1", arizona_asrc_rate1),
 
 ARIZONA_MIXER_CONTROLS("DSP1L", ARIZONA_DSP1LMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE),
@@ -367,6 +367,11 @@ SOC_SINGLE("HPOUT2 SC Protect Switch", ARIZONA_HP2_SHORT_CIRCUIT_CTRL,
 SOC_SINGLE("HPOUT3 SC Protect Switch", ARIZONA_HP3_SHORT_CIRCUIT_CTRL,
            ARIZONA_HP3_SC_ENA_SHIFT, 1, 0),
 
+SOC_SINGLE("SPKDAT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_5L,
+           ARIZONA_OUT5_OSR_SHIFT, 1, 0),
+SOC_SINGLE("SPKDAT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_6L,
+           ARIZONA_OUT6_OSR_SHIFT, 1, 0),
+
 SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L,
              ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1),
 SOC_DOUBLE_R("HPOUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,
@@ -592,7 +597,7 @@ static const struct soc_enum wm5110_aec_loopback =
                               wm5110_aec_loopback_values);
 
 static const struct snd_kcontrol_new wm5110_aec_loopback_mux =
-        SOC_DAPM_VALUE_ENUM("AEC Loopback", wm5110_aec_loopback);
+        SOC_DAPM_ENUM("AEC Loopback", wm5110_aec_loopback);
 
 static const struct snd_soc_dapm_widget wm5110_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
@@ -774,7 +779,7 @@ SND_SOC_DAPM_PGA("ISRC3DEC3", ARIZONA_ISRC_3_CTRL_3,
 SND_SOC_DAPM_PGA("ISRC3DEC4", ARIZONA_ISRC_3_CTRL_3,
                  ARIZONA_ISRC3_DEC3_ENA_SHIFT, 0, NULL, 0),
 
-SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
+SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
                        ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,
                        &wm5110_aec_loopback_mux),
 
@@ -1589,10 +1594,6 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
 
         priv->core.arizona->dapm = &codec->dapm;
 
-        ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap);
-        if (ret != 0)
-                return ret;
-
         arizona_init_spk(codec);
         arizona_init_gpio(codec);
 
@@ -1633,9 +1634,17 @@ static unsigned int wm5110_digital_vu[] = {
         ARIZONA_DAC_DIGITAL_VOLUME_6R,
 };
 
+static struct regmap *wm5110_get_regmap(struct device *dev)
+{
+        struct wm5110_priv *priv = dev_get_drvdata(dev);
+
+        return priv->core.arizona->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_wm5110 = {
         .probe = wm5110_codec_probe,
         .remove = wm5110_codec_remove,
+        .get_regmap = wm5110_get_regmap,
 
         .idle_bias_off = true,
 
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 757256bf7672..392285edb595 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -302,7 +302,7 @@ static int pga_event(struct snd_soc_dapm_widget *w,
 static int wm8350_put_volsw_2r_vu(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8350_data *wm8350_priv = snd_soc_codec_get_drvdata(codec);
         struct wm8350_output *out = NULL;
         struct soc_mixer_control *mc =
@@ -345,7 +345,7 @@ static int wm8350_put_volsw_2r_vu(struct snd_kcontrol *kcontrol,
 static int wm8350_get_volsw_2r(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8350_data *wm8350_priv = snd_soc_codec_get_drvdata(codec);
         struct wm8350_output *out1 = &wm8350_priv->out1;
         struct wm8350_output *out2 = &wm8350_priv->out2;
@@ -1505,8 +1505,6 @@ static  int wm8350_codec_probe(struct snd_soc_codec *codec)
         if (ret != 0)
                 return ret;
 
-        snd_soc_codec_set_cache_io(codec, wm8350->regmap);
-
         /* Put the codec into reset if it wasn't already */
         wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);
 
@@ -1608,11 +1606,19 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
         return 0;
 }
 
+static struct regmap *wm8350_get_regmap(struct device *dev)
+{
+        struct wm8350 *wm8350 = dev_get_platdata(dev);
+
+        return wm8350->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_wm8350 = {
         .probe =        wm8350_codec_probe,
         .remove =       wm8350_codec_remove,
         .suspend =      wm8350_suspend,
         .resume =       wm8350_resume,
+        .get_regmap =   wm8350_get_regmap,
         .set_bias_level = wm8350_set_bias_level,
 
         .controls = wm8350_snd_controls,
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 146564feaea0..06e913d3fea1 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -93,7 +93,7 @@ static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0);
 static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         int reg = mc->reg;
@@ -1318,8 +1318,6 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)
         priv->wm8400 = wm8400;
         priv->codec = codec;
 
-        snd_soc_codec_set_cache_io(codec, wm8400->regmap);
-
         ret = devm_regulator_bulk_get(wm8400->dev,
                                  ARRAY_SIZE(power), &power[0]);
         if (ret != 0) {
@@ -1361,11 +1359,19 @@ static int  wm8400_codec_remove(struct snd_soc_codec *codec)
         return 0;
 }
 
+static struct regmap *wm8400_get_regmap(struct device *dev)
+{
+        struct wm8400 *wm8400 = dev_get_platdata(dev);
+
+        return wm8400->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_wm8400 = {
         .probe =        wm8400_codec_probe,
         .remove =       wm8400_codec_remove,
         .suspend =      wm8400_suspend,
         .resume =       wm8400_resume,
+        .get_regmap =   wm8400_get_regmap,
         .set_bias_level = wm8400_set_bias_level,
 
         .controls = wm8400_snd_controls,
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index af7ed8b5d4e1..7665ff6aea6d 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -252,7 +252,7 @@ static int wm8580_out_vu(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index d74f43975b90..5ada61611324 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -119,7 +119,7 @@ static int wm8731_set_deemph(struct snd_soc_codec *codec)
 static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8731->deemph;
@@ -130,7 +130,7 @@ static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
 static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
         int deemph = ucontrol->value.enumerated.item[0];
         int ret = 0;
@@ -586,7 +586,7 @@ static int wm8731_probe(struct snd_soc_codec *codec)
         for (i = 0; i < ARRAY_SIZE(wm8731->supplies); i++)
                 wm8731->supplies[i].supply = wm8731_supply_names[i];
 
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8731->supplies),
+        ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8731->supplies),
                                  wm8731->supplies);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
@@ -597,7 +597,7 @@ static int wm8731_probe(struct snd_soc_codec *codec)
                                     wm8731->supplies);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
-                goto err_regulator_get;
+                return ret;
         }
 
         ret = wm8731_reset(codec);
@@ -624,8 +624,6 @@ static int wm8731_probe(struct snd_soc_codec *codec)
 
 err_regulator_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
-err_regulator_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
 
         return ret;
 }
@@ -638,7 +636,6 @@ static int wm8731_remove(struct snd_soc_codec *codec)
         wm8731_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
         regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
-        regulator_bulk_free(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);
 
         return 0;
 }
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index cbb8d55052a4..53e57b4049a8 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -234,7 +234,7 @@ SOC_ENUM_SINGLE(WM8753_OUTCTL, 2, 2, wm8753_rout2_phase),
 static int wm8753_get_dai(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = wm8753->dai_func;
@@ -244,7 +244,7 @@ static int wm8753_get_dai(struct snd_kcontrol *kcontrol,
 static int wm8753_set_dai(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
         u16 ioctl;
 
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index ee76f0fb4299..bbcad9ff3c98 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -106,7 +106,7 @@ static int txsrc_get(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec;
         unsigned int src;
 
-        codec = snd_kcontrol_chip(kcontrol);
+        codec = snd_soc_kcontrol_codec(kcontrol);
         src = snd_soc_read(codec, WM8804_SPDTX4);
         if (src & 0x40)
                 ucontrol->value.integer.value[0] = 1;
@@ -122,7 +122,7 @@ static int txsrc_put(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec;
         unsigned int src, txpwr;
 
-        codec = snd_kcontrol_chip(kcontrol);
+        codec = snd_soc_kcontrol_codec(kcontrol);
 
         if (ucontrol->value.integer.value[0] != 0
                         && ucontrol->value.integer.value[0] != 1)
@@ -535,7 +535,6 @@ static int wm8804_remove(struct snd_soc_codec *codec)
         for (i = 0; i < ARRAY_SIZE(wm8804->supplies); ++i)
                 regulator_unregister_notifier(wm8804->supplies[i].consumer,
                                               &wm8804->disable_nb[i]);
-        regulator_bulk_free(ARRAY_SIZE(wm8804->supplies), wm8804->supplies);
         return 0;
 }
 
@@ -549,7 +548,7 @@ static int wm8804_probe(struct snd_soc_codec *codec)
         for (i = 0; i < ARRAY_SIZE(wm8804->supplies); i++)
                 wm8804->supplies[i].supply = wm8804_supply_names[i];
 
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8804->supplies),
+        ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8804->supplies),
                                  wm8804->supplies);
         if (ret) {
                 dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
@@ -574,7 +573,7 @@ static int wm8804_probe(struct snd_soc_codec *codec)
                                     wm8804->supplies);
         if (ret) {
                 dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
-                goto err_reg_get;
+                return ret;
         }
 
         id1 = snd_soc_read(codec, WM8804_RST_DEVID1);
@@ -619,8 +618,6 @@ static int wm8804_probe(struct snd_soc_codec *codec)
 
 err_reg_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8804->supplies), wm8804->supplies);
-err_reg_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8804->supplies), wm8804->supplies);
         return ret;
 }
 
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index b0084a127d18..b84940c359a1 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -439,7 +439,7 @@ static int wm8903_set_deemph(struct snd_soc_codec *codec)
 static int wm8903_get_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8903->deemph;
@@ -450,7 +450,7 @@ static int wm8903_get_deemph(struct snd_kcontrol *kcontrol,
 static int wm8903_put_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
         int deemph = ucontrol->value.enumerated.item[0];
         int ret = 0;
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 49c35c36935e..f7c549949c54 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -391,7 +391,7 @@ static void wm8904_set_drc(struct snd_soc_codec *codec)
 static int wm8904_put_drc_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
         struct wm8904_pdata *pdata = wm8904->pdata;
         int value = ucontrol->value.integer.value[0];
@@ -409,7 +409,7 @@ static int wm8904_put_drc_enum(struct snd_kcontrol *kcontrol,
 static int wm8904_get_drc_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8904->drc_cfg;
@@ -462,7 +462,7 @@ static void wm8904_set_retune_mobile(struct snd_soc_codec *codec)
 static int wm8904_put_retune_mobile_enum(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
         struct wm8904_pdata *pdata = wm8904->pdata;
         int value = ucontrol->value.integer.value[0];
@@ -480,7 +480,7 @@ static int wm8904_put_retune_mobile_enum(struct snd_kcontrol *kcontrol,
 static int wm8904_get_retune_mobile_enum(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8904->retune_mobile_cfg;
@@ -520,7 +520,7 @@ static int wm8904_set_deemph(struct snd_soc_codec *codec)
 static int wm8904_get_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8904->deemph;
@@ -530,7 +530,7 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol,
 static int wm8904_put_deemph(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
         int deemph = ucontrol->value.enumerated.item[0];
 
@@ -570,7 +570,7 @@ static SOC_ENUM_SINGLE_DECL(hpf_mode, WM8904_ADC_DIGITAL_0, 5,
 static int wm8904_adc_osr_put(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int val;
         int ret;
 
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index fecd4e4f4c57..2a35108f233d 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -390,7 +390,7 @@ static int wm8955_set_deemph(struct snd_soc_codec *codec)
 static int wm8955_get_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8955->deemph;
@@ -400,7 +400,7 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol,
 static int wm8955_put_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);
         int deemph = ucontrol->value.enumerated.item[0];
 
@@ -898,7 +898,7 @@ static int wm8955_probe(struct snd_soc_codec *codec)
         for (i = 0; i < ARRAY_SIZE(wm8955->supplies); i++)
                 wm8955->supplies[i].supply = wm8955_supply_names[i];
 
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8955->supplies),
+        ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8955->supplies),
                                  wm8955->supplies);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
@@ -909,7 +909,7 @@ static int wm8955_probe(struct snd_soc_codec *codec)
                                     wm8955->supplies);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
-                goto err_get;
+                return ret;
         }
 
         ret = wm8955_reset(codec);
@@ -961,17 +961,12 @@ static int wm8955_probe(struct snd_soc_codec *codec)
 
 err_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8955->supplies), wm8955->supplies);
-err_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8955->supplies), wm8955->supplies);
         return ret;
 }
 
 static int wm8955_remove(struct snd_soc_codec *codec)
 {
-        struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);
-
         wm8955_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        regulator_bulk_free(ARRAY_SIZE(wm8955->supplies), wm8955->supplies);
         return 0;
 }
 
diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index 7ac2e511403c..b2ebb104d879 100644
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -456,7 +456,7 @@ static int wm8958_dsp2_busy(struct wm8994_priv *wm8994, int aif)
 static int wm8958_put_mbc_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = wm8994->wm8994;
         int value = ucontrol->value.integer.value[0];
@@ -478,7 +478,7 @@ static int wm8958_put_mbc_enum(struct snd_kcontrol *kcontrol,
 static int wm8958_get_mbc_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8994->mbc_cfg;
@@ -500,7 +500,7 @@ static int wm8958_mbc_get(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         int mbc = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = wm8994->mbc_ena[mbc];
@@ -512,7 +512,7 @@ static int wm8958_mbc_put(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         int mbc = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         if (wm8994->mbc_ena[mbc] == ucontrol->value.integer.value[0])
@@ -546,7 +546,7 @@ static int wm8958_mbc_put(struct snd_kcontrol *kcontrol,
 static int wm8958_put_vss_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = wm8994->wm8994;
         int value = ucontrol->value.integer.value[0];
@@ -568,7 +568,7 @@ static int wm8958_put_vss_enum(struct snd_kcontrol *kcontrol,
 static int wm8958_get_vss_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8994->vss_cfg;
@@ -579,7 +579,7 @@ static int wm8958_get_vss_enum(struct snd_kcontrol *kcontrol,
 static int wm8958_put_vss_hpf_enum(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = wm8994->wm8994;
         int value = ucontrol->value.integer.value[0];
@@ -601,7 +601,7 @@ static int wm8958_put_vss_hpf_enum(struct snd_kcontrol *kcontrol,
 static int wm8958_get_vss_hpf_enum(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8994->vss_hpf_cfg;
@@ -623,7 +623,7 @@ static int wm8958_vss_get(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         int vss = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = wm8994->vss_ena[vss];
@@ -635,7 +635,7 @@ static int wm8958_vss_put(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         int vss = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         if (wm8994->vss_ena[vss] == ucontrol->value.integer.value[0])
@@ -684,7 +684,7 @@ static int wm8958_hpf_get(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         int hpf = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         if (hpf < 3)
@@ -699,7 +699,7 @@ static int wm8958_hpf_put(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         int hpf = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         if (hpf < 3) {
@@ -746,7 +746,7 @@ static int wm8958_hpf_put(struct snd_kcontrol *kcontrol,
 static int wm8958_put_enh_eq_enum(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = wm8994->wm8994;
         int value = ucontrol->value.integer.value[0];
@@ -768,7 +768,7 @@ static int wm8958_put_enh_eq_enum(struct snd_kcontrol *kcontrol,
 static int wm8958_get_enh_eq_enum(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8994->enh_eq_cfg;
@@ -790,7 +790,7 @@ static int wm8958_enh_eq_get(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         int eq = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = wm8994->enh_eq_ena[eq];
@@ -802,7 +802,7 @@ static int wm8958_enh_eq_put(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
         int eq = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
         if (wm8994->enh_eq_ena[eq] == ucontrol->value.integer.value[0])
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index d04e9cad445c..a145d0431b63 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -178,7 +178,7 @@ static int wm8960_set_deemph(struct snd_soc_codec *codec)
 static int wm8960_get_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.enumerated.item[0] = wm8960->deemph;
@@ -188,7 +188,7 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol,
 static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
         int deemph = ucontrol->value.enumerated.item[0];
 
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index ecd26dd2e442..ca2fda9d72be 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -74,11 +74,9 @@ struct wm8962_priv {
         struct regulator_bulk_data supplies[WM8962_NUM_SUPPLIES];
         struct notifier_block disable_nb[WM8962_NUM_SUPPLIES];
 
-#if IS_ENABLED(CONFIG_INPUT)
         struct input_dev *beep;
         struct work_struct beep_work;
         int beep_rate;
-#endif
 
 #ifdef CONFIG_GPIOLIB
         struct gpio_chip gpio_chip;
@@ -1552,7 +1550,7 @@ static int wm8962_dsp2_ena_get(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
         int shift = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
 
         ucontrol->value.integer.value[0] = !!(wm8962->dsp2_ena & 1 << shift);
@@ -1564,7 +1562,7 @@ static int wm8962_dsp2_ena_put(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
         int shift = kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
         int old = wm8962->dsp2_ena;
         int ret = 0;
@@ -1602,7 +1600,7 @@ out:
 static int wm8962_put_hp_sw(struct snd_kcontrol *kcontrol,
                             struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         int ret;
 
         /* Apply the update (if any) */
@@ -1632,7 +1630,7 @@ static int wm8962_put_hp_sw(struct snd_kcontrol *kcontrol,
 static int wm8962_put_spk_sw(struct snd_kcontrol *kcontrol,
                             struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         int ret;
 
         /* Apply the update (if any) */
@@ -3154,7 +3152,6 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
 }
 EXPORT_SYMBOL_GPL(wm8962_mic_detect);
 
-#if IS_ENABLED(CONFIG_INPUT)
 static int beep_rates[] = {
         500, 1000, 2000, 4000,
 };
@@ -3286,15 +3283,6 @@ static void wm8962_free_beep(struct snd_soc_codec *codec)
 
         snd_soc_update_bits(codec, WM8962_BEEP_GENERATOR_1, WM8962_BEEP_ENA,0);
 }
-#else
-static void wm8962_init_beep(struct snd_soc_codec *codec)
-{
-}
-
-static void wm8962_free_beep(struct snd_soc_codec *codec)
-{
-}
-#endif
 
 static void wm8962_set_gpio_mode(struct wm8962_priv *wm8962, int gpio)
 {
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index 2b9bfa53efbf..19d5baa38f5c 100644
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -552,7 +552,7 @@ static const struct snd_soc_dapm_route wm8983_audio_map[] = {
 static int eqmode_get(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg;
 
         reg = snd_soc_read(codec, WM8983_EQ1_LOW_SHELF);
@@ -567,7 +567,7 @@ static int eqmode_get(struct snd_kcontrol *kcontrol,
 static int eqmode_put(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int regpwr2, regpwr3;
         unsigned int reg_eq;
 
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index 5473dc969585..0f5780c09f3a 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -526,7 +526,7 @@ static const struct snd_soc_dapm_route wm8985_dapm_routes[] = {
 static int eqmode_get(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg;
 
         reg = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF);
@@ -541,7 +541,7 @@ static int eqmode_get(struct snd_kcontrol *kcontrol,
 static int eqmode_put(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int regpwr2, regpwr3;
         unsigned int reg_eq;
 
@@ -984,7 +984,6 @@ static int wm8985_remove(struct snd_soc_codec *codec)
 
         wm8985 = snd_soc_codec_get_drvdata(codec);
         wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
-        regulator_bulk_free(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
         return 0;
 }
 
@@ -999,7 +998,7 @@ static int wm8985_probe(struct snd_soc_codec *codec)
         for (i = 0; i < ARRAY_SIZE(wm8985->supplies); i++)
                 wm8985->supplies[i].supply = wm8985_supply_names[i];
 
-        ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8985->supplies),
+        ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8985->supplies),
                                  wm8985->supplies);
         if (ret) {
                 dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
@@ -1010,7 +1009,7 @@ static int wm8985_probe(struct snd_soc_codec *codec)
                                     wm8985->supplies);
         if (ret) {
                 dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
-                goto err_reg_get;
+                return ret;
         }
 
         ret = wm8985_reset(codec);
@@ -1032,8 +1031,6 @@ static int wm8985_probe(struct snd_soc_codec *codec)
 
 err_reg_enable:
         regulator_bulk_disable(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
-err_reg_get:
-        regulator_bulk_free(ARRAY_SIZE(wm8985->supplies), wm8985->supplies);
         return ret;
 }
 
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index 3a1ae4f5164d..d3fea46d58e8 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -268,7 +268,7 @@ static const struct soc_enum wm8988_lline_enum =
                               wm8988_line_texts,
                               wm8988_line_values);
 static const struct snd_kcontrol_new wm8988_left_line_controls =
-        SOC_DAPM_VALUE_ENUM("Route", wm8988_lline_enum);
+        SOC_DAPM_ENUM("Route", wm8988_lline_enum);
 
 static const struct soc_enum wm8988_rline_enum =
         SOC_VALUE_ENUM_SINGLE(WM8988_ROUTM1, 0, 7,
@@ -276,7 +276,7 @@ static const struct soc_enum wm8988_rline_enum =
                               wm8988_line_texts,
                               wm8988_line_values);
 static const struct snd_kcontrol_new wm8988_right_line_controls =
-        SOC_DAPM_VALUE_ENUM("Route", wm8988_lline_enum);
+        SOC_DAPM_ENUM("Route", wm8988_lline_enum);
 
 /* Left Mixer */
 static const struct snd_kcontrol_new wm8988_left_mixer_controls[] = {
@@ -304,7 +304,7 @@ static const struct soc_enum wm8988_lpga_enum =
                               wm8988_pga_sel,
                               wm8988_pga_val);
 static const struct snd_kcontrol_new wm8988_left_pga_controls =
-        SOC_DAPM_VALUE_ENUM("Route", wm8988_lpga_enum);
+        SOC_DAPM_ENUM("Route", wm8988_lpga_enum);
 
 /* Right PGA Mux */
 static const struct soc_enum wm8988_rpga_enum =
@@ -313,7 +313,7 @@ static const struct soc_enum wm8988_rpga_enum =
                               wm8988_pga_sel,
                               wm8988_pga_val);
 static const struct snd_kcontrol_new wm8988_right_pga_controls =
-        SOC_DAPM_VALUE_ENUM("Route", wm8988_rpga_enum);
+        SOC_DAPM_ENUM("Route", wm8988_rpga_enum);
 
 /* Differential Mux */
 static const char *wm8988_diff_sel[] = {"Line 1", "Line 2"};
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index c413c1991453..b5c1f0f07058 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -132,7 +132,7 @@ static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0);
 static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         int reg = mc->reg;
diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c
index 844cc4a60d66..b8fd284fc0c0 100644
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
@@ -154,7 +154,7 @@ static const unsigned int out_sidetone_tlv[] = {
 static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         int reg = kcontrol->private_value & 0xff;
         int ret;
         u16 val;
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 6303537f54c6..247b39013fba 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -298,7 +298,7 @@ static int wm8994_put_drc_sw(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         int mask, ret;
 
         /* Can't enable both ADC and DAC paths simultaneously */
@@ -355,7 +355,7 @@ static int wm8994_get_drc(const char *name)
 static int wm8994_put_drc_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = wm8994->wm8994;
         struct wm8994_pdata *pdata = &control->pdata;
@@ -378,7 +378,7 @@ static int wm8994_put_drc_enum(struct snd_kcontrol *kcontrol,
 static int wm8994_get_drc_enum(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         int drc = wm8994_get_drc(kcontrol->id.name);
 
@@ -462,7 +462,7 @@ static int wm8994_get_retune_mobile_block(const char *name)
 static int wm8994_put_retune_mobile_enum(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         struct wm8994 *control = wm8994->wm8994;
         struct wm8994_pdata *pdata = &control->pdata;
@@ -485,7 +485,7 @@ static int wm8994_put_retune_mobile_enum(struct snd_kcontrol *kcontrol,
 static int wm8994_get_retune_mobile_enum(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
         int block = wm8994_get_retune_mobile_block(kcontrol->id.name);
 
@@ -1347,10 +1347,10 @@ static const char *adc_mux_text[] = {
 static SOC_ENUM_SINGLE_VIRT_DECL(adc_enum, adc_mux_text);
 
 static const struct snd_kcontrol_new adcl_mux =
-        SOC_DAPM_ENUM_VIRT("ADCL Mux", adc_enum);
+        SOC_DAPM_ENUM("ADCL Mux", adc_enum);
 
 static const struct snd_kcontrol_new adcr_mux =
-        SOC_DAPM_ENUM_VIRT("ADCR Mux", adc_enum);
+        SOC_DAPM_ENUM("ADCR Mux", adc_enum);
 
 static const struct snd_kcontrol_new left_speaker_mixer[] = {
 SOC_DAPM_SINGLE("DAC2 Switch", WM8994_SPEAKER_MIXER, 9, 1, 0),
@@ -1651,15 +1651,15 @@ SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),
 };
 
 static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = {
-SND_SOC_DAPM_VIRT_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
+SND_SOC_DAPM_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
                         adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
-SND_SOC_DAPM_VIRT_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
+SND_SOC_DAPM_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
                         adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
 };
 
 static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = {
-SND_SOC_DAPM_VIRT_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
-SND_SOC_DAPM_VIRT_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
+SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
+SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
 };
 
 static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {
@@ -3999,8 +3999,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 
         wm8994->hubs.codec = codec;
 
-        snd_soc_codec_set_cache_io(codec, control->regmap);
-
         mutex_init(&wm8994->accdet_lock);
         INIT_DELAYED_WORK(&wm8994->jackdet_bootstrap,
                           wm1811_jackdet_bootstrap);
@@ -4434,11 +4432,19 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec)
         return 0;
 }
 
+static struct regmap *wm8994_get_regmap(struct device *dev)
+{
+        struct wm8994 *control = dev_get_drvdata(dev->parent);
+
+        return control->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_wm8994 = {
         .probe =        wm8994_codec_probe,
         .remove =       wm8994_codec_remove,
         .suspend =      wm8994_codec_suspend,
         .resume =       wm8994_codec_resume,
+        .get_regmap =   wm8994_get_regmap,
         .set_bias_level = wm8994_set_bias_level,
 };
 
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index d3152cf5bd56..863a2c38bcb5 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -885,10 +885,10 @@ static const char *adc_mux_text[] = {
 static SOC_ENUM_SINGLE_VIRT_DECL(adc_enum, adc_mux_text);
 
 static const struct snd_kcontrol_new adcl_mux =
-        SOC_DAPM_ENUM_VIRT("ADCL Mux", adc_enum);
+        SOC_DAPM_ENUM("ADCL Mux", adc_enum);
 
 static const struct snd_kcontrol_new adcr_mux =
-        SOC_DAPM_ENUM_VIRT("ADCR Mux", adc_enum);
+        SOC_DAPM_ENUM("ADCR Mux", adc_enum);
 
 static const char *spk_src_text[] = {
         "DAC1L", "DAC1R", "DAC2L", "DAC2R"
@@ -948,10 +948,8 @@ static const struct snd_soc_dapm_widget wm8995_dapm_widgets[] = {
         SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", "AIF1 Capture",
                 0, WM8995_POWER_MANAGEMENT_3, 10, 0),
 
-        SND_SOC_DAPM_VIRT_MUX("ADCL Mux", SND_SOC_NOPM, 1, 0,
-                &adcl_mux),
-        SND_SOC_DAPM_VIRT_MUX("ADCR Mux", SND_SOC_NOPM, 0, 0,
-                &adcr_mux),
+        SND_SOC_DAPM_MUX("ADCL Mux", SND_SOC_NOPM, 1, 0, &adcl_mux),
+        SND_SOC_DAPM_MUX("ADCR Mux", SND_SOC_NOPM, 0, 0, &adcr_mux),
 
         SND_SOC_DAPM_ADC("DMIC2L", NULL, WM8995_POWER_MANAGEMENT_3, 5, 0),
         SND_SOC_DAPM_ADC("DMIC2R", NULL, WM8995_POWER_MANAGEMENT_3, 4, 0),
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index c6cbb3b8ace9..69266332760e 100644
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -412,7 +412,7 @@ static int wm8996_get_retune_mobile_block(const char *name)
 static int wm8996_put_retune_mobile_enum(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
         struct wm8996_pdata *pdata = &wm8996->pdata;
         int block = wm8996_get_retune_mobile_block(kcontrol->id.name);
@@ -434,7 +434,7 @@ static int wm8996_put_retune_mobile_enum(struct snd_kcontrol *kcontrol,
 static int wm8996_get_retune_mobile_enum(struct snd_kcontrol *kcontrol,
                                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
         int block = wm8996_get_retune_mobile_block(kcontrol->id.name);
 
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 004186b6bd48..bb9b47b956aa 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -245,8 +245,8 @@ SND_SOC_BYTES("LHPF2 Coefficients", ARIZONA_HPLPF2_2, 1),
 SND_SOC_BYTES("LHPF3 Coefficients", ARIZONA_HPLPF3_2, 1),
 SND_SOC_BYTES("LHPF4 Coefficients", ARIZONA_HPLPF4_2, 1),
 
-SOC_VALUE_ENUM("ISRC1 FSL", arizona_isrc_fsl[0]),
-SOC_VALUE_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),
+SOC_ENUM("ISRC1 FSL", arizona_isrc_fsl[0]),
+SOC_ENUM("ISRC2 FSL", arizona_isrc_fsl[1]),
 
 ARIZONA_MIXER_CONTROLS("Mic", ARIZONA_MICMIX_INPUT_1_SOURCE),
 ARIZONA_MIXER_CONTROLS("Noise", ARIZONA_NOISEMIX_INPUT_1_SOURCE),
@@ -286,8 +286,8 @@ SOC_DOUBLE_R_TLV("SPKDAT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_5L,
                  ARIZONA_DAC_DIGITAL_VOLUME_5R, ARIZONA_OUT5L_VOL_SHIFT,
                  0xbf, 0, digital_tlv),
 
-SOC_VALUE_ENUM("HPOUT1 OSR", wm8997_hpout_osr[0]),
-SOC_VALUE_ENUM("EPOUT OSR", wm8997_hpout_osr[1]),
+SOC_ENUM("HPOUT1 OSR", wm8997_hpout_osr[0]),
+SOC_ENUM("EPOUT OSR", wm8997_hpout_osr[1]),
 
 SOC_ENUM("Output Ramp Up", arizona_out_vi_ramp),
 SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),
@@ -405,7 +405,7 @@ static const struct soc_enum wm8997_aec_loopback =
                               wm8997_aec_loopback_values);
 
 static const struct snd_kcontrol_new wm8997_aec_loopback_mux =
-        SOC_DAPM_VALUE_ENUM("AEC Loopback", wm8997_aec_loopback);
+        SOC_DAPM_ENUM("AEC Loopback", wm8997_aec_loopback);
 
 static const struct snd_soc_dapm_widget wm8997_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,
@@ -604,7 +604,7 @@ SND_SOC_DAPM_AIF_IN("SLIMRX8", NULL, 0,
                     ARIZONA_SLIMBUS_RX_CHANNEL_ENABLE,
                     ARIZONA_SLIMRX8_ENA_SHIFT, 0),
 
-SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
+SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,
                        ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,
                        &wm8997_aec_loopback_mux),
 
@@ -1051,11 +1051,6 @@ static struct snd_soc_dai_driver wm8997_dai[] = {
 static int wm8997_codec_probe(struct snd_soc_codec *codec)
 {
         struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);
-        int ret;
-
-        ret = snd_soc_codec_set_cache_io(codec, priv->core.arizona->regmap);
-        if (ret != 0)
-                return ret;
 
         arizona_init_spk(codec);
 
@@ -1086,9 +1081,17 @@ static unsigned int wm8997_digital_vu[] = {
         ARIZONA_DAC_DIGITAL_VOLUME_5R,
 };
 
+static struct regmap *wm8997_get_regmap(struct device *dev)
+{
+        struct wm8997_priv *priv = dev_get_drvdata(dev);
+
+        return priv->core.arizona->regmap;
+}
+
 static struct snd_soc_codec_driver soc_codec_dev_wm8997 = {
         .probe = wm8997_codec_probe,
         .remove = wm8997_codec_remove,
+        .get_regmap =   wm8997_get_regmap,
 
         .idle_bias_off = true,
 
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index d18eff31fbbc..185eb97769e7 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -340,7 +340,7 @@ static SOC_ENUM_SINGLE_DECL(speaker_mode, WM9081_ANALOGUE_SPEAKER_2, 6,
 static int speaker_mode_get(struct snd_kcontrol *kcontrol,
                             struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg;
 
         reg = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_2);
@@ -361,7 +361,7 @@ static int speaker_mode_get(struct snd_kcontrol *kcontrol,
 static int speaker_mode_put(struct snd_kcontrol *kcontrol,
                             struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         unsigned int reg_pwr = snd_soc_read(codec, WM9081_POWER_MANAGEMENT);
         unsigned int reg2 = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_2);
 
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index bb5f7b4e3ebb..ff15eec3ab2f 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -242,7 +242,7 @@ struct wm_coeff_ctl {
 static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         struct wm_adsp *adsp = snd_soc_codec_get_drvdata(codec);
 
@@ -254,7 +254,7 @@ static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol,
 static int wm_adsp_fw_put(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         struct wm_adsp *adsp = snd_soc_codec_get_drvdata(codec);
 
@@ -1625,7 +1625,7 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
                 break;
         default:
                 break;
-        };
+        }
 
         return 0;
 }
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index b6209662ab13..916817fe6632 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -337,7 +337,7 @@ static void enable_dc_servo(struct snd_soc_codec *codec)
 static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
         int ret;
 
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index a8ec1fc3e4d0..50a098749b9e 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -18,7 +18,7 @@ config SND_DAVINCI_SOC_GENERIC_EVM
 
 config SND_AM33XX_SOC_EVM
         tristate "SoC Audio for the AM33XX chip based boards"
-        depends on SND_DAVINCI_SOC && SOC_AM33XX
+        depends on SND_DAVINCI_SOC && SOC_AM33XX && I2C
         select SND_DAVINCI_SOC_GENERIC_EVM
         help
           Say Y or M if you want to add support for SoC audio on AM33XX
@@ -28,7 +28,7 @@ config SND_AM33XX_SOC_EVM
 
 config SND_DAVINCI_SOC_EVM
         tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"
-        depends on SND_DAVINCI_SOC
+        depends on SND_DAVINCI_SOC && I2C
         depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM
         select SND_DAVINCI_SOC_GENERIC_EVM
         help
@@ -56,7 +56,7 @@ endchoice
 
 config  SND_DM6467_SOC_EVM
         tristate "SoC Audio support for DaVinci DM6467 EVM"
-        depends on SND_DAVINCI_SOC && MACH_DAVINCI_DM6467_EVM
+        depends on SND_DAVINCI_SOC && MACH_DAVINCI_DM6467_EVM && I2C
         select SND_DAVINCI_SOC_GENERIC_EVM
         select SND_SOC_SPDIF
 
@@ -65,7 +65,7 @@ config  SND_DM6467_SOC_EVM
 
 config  SND_DA830_SOC_EVM
         tristate "SoC Audio support for DA830/OMAP-L137 EVM"
-        depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA830_EVM
+        depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA830_EVM && I2C
         select SND_DAVINCI_SOC_GENERIC_EVM
 
         help
@@ -74,7 +74,7 @@ config  SND_DA830_SOC_EVM
 
 config  SND_DA850_SOC_EVM
         tristate "SoC Audio support for DA850/OMAP-L138 EVM"
-        depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA850_EVM
+        depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA850_EVM && I2C
         select SND_DAVINCI_SOC_GENERIC_EVM
         help
           Say Y if you want to add support for SoC audio on TI
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index ebe82947bab3..7682af31d6e6 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -757,7 +757,6 @@ static int davinci_i2s_remove(struct platform_device *pdev)
         struct davinci_mcbsp_dev *dev = dev_get_drvdata(&pdev->dev);
 
         snd_soc_unregister_component(&pdev->dev);
-        davinci_soc_platform_unregister(&pdev->dev);
 
         clk_disable(dev->clk);
         clk_put(dev->clk);
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 4f75cac462d1..14058dc6eaf8 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -36,6 +36,9 @@
 
 #include "davinci-pcm.h"
 #include "davinci-mcasp.h"
+#include "../omap/omap-pcm.h"
+
+#define MCASP_MAX_AFIFO_DEPTH   64
 
 struct davinci_mcasp_context {
         u32     txfmtctl;
@@ -269,25 +272,51 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
 {
         struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(cpu_dai);
         int ret = 0;
+        u32 data_delay;
+        bool fs_pol_rising;
+        bool inv_fs = false;
 
         pm_runtime_get_sync(mcasp->dev);
         switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_DSP_A:
+                mcasp_clr_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXDUR);
+                mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRDUR);
+                /* 1st data bit occur one ACLK cycle after the frame sync */
+                data_delay = 1;
+                break;
         case SND_SOC_DAIFMT_DSP_B:
         case SND_SOC_DAIFMT_AC97:
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXDUR);
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRDUR);
+                /* No delay after FS */
+                data_delay = 0;
                 break;
-        default:
+        case SND_SOC_DAIFMT_I2S:
                 /* configure a full-word SYNC pulse (LRCLK) */
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXDUR);
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRDUR);
-
-                /* make 1st data bit occur one ACLK cycle after the frame sync */
-                mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMT_REG, FSXDLY(1));
-                mcasp_set_bits(mcasp, DAVINCI_MCASP_RXFMT_REG, FSRDLY(1));
+                /* 1st data bit occur one ACLK cycle after the frame sync */
+                data_delay = 1;
+                /* FS need to be inverted */
+                inv_fs = true;
                 break;
+        case SND_SOC_DAIFMT_LEFT_J:
+                /* configure a full-word SYNC pulse (LRCLK) */
+                mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXDUR);
+                mcasp_set_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRDUR);
+                /* No delay after FS */
+                data_delay = 0;
+                break;
+        default:
+                ret = -EINVAL;
+                goto out;
         }
 
+        mcasp_mod_bits(mcasp, DAVINCI_MCASP_TXFMT_REG, FSXDLY(data_delay),
+                       FSXDLY(3));
+        mcasp_mod_bits(mcasp, DAVINCI_MCASP_RXFMT_REG, FSRDLY(data_delay),
+                       FSRDLY(3));
+
         switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
         case SND_SOC_DAIFMT_CBS_CFS:
                 /* codec is clock and frame slave */
@@ -325,7 +354,6 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                                ACLKX | AHCLKX | AFSX | ACLKR | AHCLKR | AFSR);
                 mcasp->bclk_master = 0;
                 break;
-
         default:
                 ret = -EINVAL;
                 goto out;
@@ -334,39 +362,38 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
         switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
         case SND_SOC_DAIFMT_IB_NF:
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL);
-                mcasp_clr_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);
-
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
-                mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
+                fs_pol_rising = true;
                 break;
-
         case SND_SOC_DAIFMT_NB_IF:
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL);
-                mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);
-
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
-                mcasp_set_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
+                fs_pol_rising = false;
                 break;
-
         case SND_SOC_DAIFMT_IB_IF:
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL);
-                mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);
-
                 mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
-                mcasp_set_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
+                fs_pol_rising = false;
                 break;
-
         case SND_SOC_DAIFMT_NB_NF:
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL);
-                mcasp_clr_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);
-
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL);
-                mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
+                fs_pol_rising = true;
                 break;
-
         default:
                 ret = -EINVAL;
-                break;
+                goto out;
+        }
+
+        if (inv_fs)
+                fs_pol_rising = !fs_pol_rising;
+
+        if (fs_pol_rising) {
+                mcasp_clr_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);
+                mcasp_clr_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
+        } else {
+                mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, FSXPOL);
+                mcasp_set_bits(mcasp, DAVINCI_MCASP_RXFMCTL_REG, FSRPOL);
         }
 out:
         pm_runtime_put_sync(mcasp->dev);
@@ -464,17 +491,19 @@ static int davinci_config_channel_size(struct davinci_mcasp *mcasp,
 }
 
 static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream,
-                                    int channels)
+                                 int period_words, int channels)
 {
+        struct davinci_pcm_dma_params *dma_params = &mcasp->dma_params[stream];
+        struct snd_dmaengine_dai_dma_data *dma_data = &mcasp->dma_data[stream];
         int i;
         u8 tx_ser = 0;
         u8 rx_ser = 0;
-        u8 ser;
         u8 slots = mcasp->tdm_slots;
         u8 max_active_serializers = (channels + slots - 1) / slots;
+        int active_serializers, numevt, n;
         u32 reg;
         /* Default configuration */
-        if (mcasp->version != MCASP_VERSION_4)
+        if (mcasp->version < MCASP_VERSION_3)
                 mcasp_set_bits(mcasp, DAVINCI_MCASP_PWREMUMGT_REG, MCASP_SOFT);
 
         /* All PINS as McASP */
@@ -505,37 +534,71 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream,
                 }
         }
 
-        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-                ser = tx_ser;
-        else
-                ser = rx_ser;
+        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                active_serializers = tx_ser;
+                numevt = mcasp->txnumevt;
+                reg = mcasp->fifo_base + MCASP_WFIFOCTL_OFFSET;
+        } else {
+                active_serializers = rx_ser;
+                numevt = mcasp->rxnumevt;
+                reg = mcasp->fifo_base + MCASP_RFIFOCTL_OFFSET;
+        }
 
-        if (ser < max_active_serializers) {
+        if (active_serializers < max_active_serializers) {
                 dev_warn(mcasp->dev, "stream has more channels (%d) than are "
-                        "enabled in mcasp (%d)\n", channels, ser * slots);
+                         "enabled in mcasp (%d)\n", channels,
+                         active_serializers * slots);
                 return -EINVAL;
         }
 
-        if (mcasp->txnumevt && stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                if (mcasp->txnumevt * tx_ser > 64)
-                        mcasp->txnumevt = 1;
-
-                reg = mcasp->fifo_base + MCASP_WFIFOCTL_OFFSET;
-                mcasp_mod_bits(mcasp, reg, tx_ser, NUMDMA_MASK);
-                mcasp_mod_bits(mcasp, reg, ((mcasp->txnumevt * tx_ser) << 8),
-                               NUMEVT_MASK);
+        /* AFIFO is not in use */
+        if (!numevt) {
+                /* Configure the burst size for platform drivers */
+                if (active_serializers > 1) {
+                        /*
+                         * If more than one serializers are in use we have one
+                         * DMA request to provide data for all serializers.
+                         * For example if three serializers are enabled the DMA
+                         * need to transfer three words per DMA request.
+                         */
+                        dma_params->fifo_level = active_serializers;
+                        dma_data->maxburst = active_serializers;
+                } else {
+                        dma_params->fifo_level = 0;
+                        dma_data->maxburst = 0;
+                }
+                return 0;
         }
 
-        if (mcasp->rxnumevt && stream == SNDRV_PCM_STREAM_CAPTURE) {
-                if (mcasp->rxnumevt * rx_ser > 64)
-                        mcasp->rxnumevt = 1;
-
-                reg = mcasp->fifo_base + MCASP_RFIFOCTL_OFFSET;
-                mcasp_mod_bits(mcasp, reg, rx_ser, NUMDMA_MASK);
-                mcasp_mod_bits(mcasp, reg, ((mcasp->rxnumevt * rx_ser) << 8),
-                               NUMEVT_MASK);
+        if (period_words % active_serializers) {
+                dev_err(mcasp->dev, "Invalid combination of period words and "
+                        "active serializers: %d, %d\n", period_words,
+                        active_serializers);
+                return -EINVAL;
         }
 
+        /*
+         * Calculate the optimal AFIFO depth for platform side:
+         * The number of words for numevt need to be in steps of active
+         * serializers.
+         */
+        n = numevt % active_serializers;
+        if (n)
+                numevt += (active_serializers - n);
+        while (period_words % numevt && numevt > 0)
+                numevt -= active_serializers;
+        if (numevt <= 0)
+                numevt = active_serializers;
+
+        mcasp_mod_bits(mcasp, reg, active_serializers, NUMDMA_MASK);
+        mcasp_mod_bits(mcasp, reg, NUMEVT(numevt), NUMEVT_MASK);
+
+        /* Configure the burst size for platform drivers */
+        if (numevt == 1)
+                numevt = 0;
+        dma_params->fifo_level = numevt;
+        dma_data->maxburst = numevt;
+
         return 0;
 }
 
@@ -607,27 +670,24 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
         struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(cpu_dai);
         struct davinci_pcm_dma_params *dma_params =
                                         &mcasp->dma_params[substream->stream];
-        struct snd_dmaengine_dai_dma_data *dma_data =
-                                        &mcasp->dma_data[substream->stream];
         int word_length;
-        u8 fifo_level;
-        u8 slots = mcasp->tdm_slots;
-        u8 active_serializers;
         int channels = params_channels(params);
+        int period_size = params_period_size(params);
         int ret;
 
         /* If mcasp is BCLK master we need to set BCLK divider */
         if (mcasp->bclk_master) {
                 unsigned int bclk_freq = snd_soc_params_to_bclk(params);
                 if (mcasp->sysclk_freq % bclk_freq != 0) {
-                        dev_err(mcasp->dev, "Can't produce requred BCLK\n");
+                        dev_err(mcasp->dev, "Can't produce required BCLK\n");
                         return -EINVAL;
                 }
                 davinci_mcasp_set_clkdiv(
                         cpu_dai, 1, mcasp->sysclk_freq / bclk_freq);
         }
 
-        ret = mcasp_common_hw_param(mcasp, substream->stream, channels);
+        ret = mcasp_common_hw_param(mcasp, substream->stream,
+                                    period_size * channels, channels);
         if (ret)
                 return ret;
 
@@ -671,21 +731,11 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        /* Calculate FIFO level */
-        active_serializers = (channels + slots - 1) / slots;
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                fifo_level = mcasp->txnumevt * active_serializers;
-        else
-                fifo_level = mcasp->rxnumevt * active_serializers;
-
-        if (mcasp->version == MCASP_VERSION_2 && !fifo_level)
+        if (mcasp->version == MCASP_VERSION_2 && !dma_params->fifo_level)
                 dma_params->acnt = 4;
         else
                 dma_params->acnt = dma_params->data_type;
 
-        dma_params->fifo_level = fifo_level;
-        dma_data->maxburst = fifo_level;
-
         davinci_config_channel_size(mcasp, word_length);
 
         return 0;
@@ -716,22 +766,7 @@ static int davinci_mcasp_trigger(struct snd_pcm_substream *substream,
         return ret;
 }
 
-static int davinci_mcasp_startup(struct snd_pcm_substream *substream,
-                                 struct snd_soc_dai *dai)
-{
-        struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);
-
-        if (mcasp->version == MCASP_VERSION_4)
-                snd_soc_dai_set_dma_data(dai, substream,
-                                        &mcasp->dma_data[substream->stream]);
-        else
-                snd_soc_dai_set_dma_data(dai, substream, mcasp->dma_params);
-
-        return 0;
-}
-
 static const struct snd_soc_dai_ops davinci_mcasp_dai_ops = {
-        .startup        = davinci_mcasp_startup,
         .trigger        = davinci_mcasp_trigger,
         .hw_params      = davinci_mcasp_hw_params,
         .set_fmt        = davinci_mcasp_set_dai_fmt,
@@ -739,6 +774,25 @@ static const struct snd_soc_dai_ops davinci_mcasp_dai_ops = {
         .set_sysclk     = davinci_mcasp_set_sysclk,
 };
 
+static int davinci_mcasp_dai_probe(struct snd_soc_dai *dai)
+{
+        struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);
+
+        if (mcasp->version == MCASP_VERSION_4) {
+                /* Using dmaengine PCM */
+                dai->playback_dma_data =
+                                &mcasp->dma_data[SNDRV_PCM_STREAM_PLAYBACK];
+                dai->capture_dma_data =
+                                &mcasp->dma_data[SNDRV_PCM_STREAM_CAPTURE];
+        } else {
+                /* Using davinci-pcm */
+                dai->playback_dma_data = mcasp->dma_params;
+                dai->capture_dma_data = mcasp->dma_params;
+        }
+
+        return 0;
+}
+
 #ifdef CONFIG_PM_SLEEP
 static int davinci_mcasp_suspend(struct snd_soc_dai *dai)
 {
@@ -792,6 +846,7 @@ static int davinci_mcasp_resume(struct snd_soc_dai *dai)
 static struct snd_soc_dai_driver davinci_mcasp_dai[] = {
         {
                 .name           = "davinci-mcasp.0",
+                .probe          = davinci_mcasp_dai_probe,
                 .suspend        = davinci_mcasp_suspend,
                 .resume         = davinci_mcasp_resume,
                 .playback       = {
@@ -811,6 +866,7 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = {
         },
         {
                 .name           = "davinci-mcasp.1",
+                .probe          = davinci_mcasp_dai_probe,
                 .playback       = {
                         .channels_min   = 1,
                         .channels_max   = 384,
@@ -1078,7 +1134,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
         if (!mcasp->base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -ENOMEM;
-                goto err_release_clk;
+                goto err;
         }
 
         mcasp->op_mode = pdata->op_mode;
@@ -1159,25 +1215,37 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 
         mcasp_reparent_fck(pdev);
 
-        ret = snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,
-                                         &davinci_mcasp_dai[pdata->op_mode], 1);
+        ret = devm_snd_soc_register_component(&pdev->dev,
+                                        &davinci_mcasp_component,
+                                        &davinci_mcasp_dai[pdata->op_mode], 1);
 
         if (ret != 0)
-                goto err_release_clk;
+                goto err;
 
-        if (mcasp->version != MCASP_VERSION_4) {
+        switch (mcasp->version) {
+        case MCASP_VERSION_1:
+        case MCASP_VERSION_2:
+        case MCASP_VERSION_3:
                 ret = davinci_soc_platform_register(&pdev->dev);
-                if (ret) {
-                        dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
-                        goto err_unregister_component;
-                }
+                break;
+        case MCASP_VERSION_4:
+                ret = omap_pcm_platform_register(&pdev->dev);
+                break;
+        default:
+                dev_err(&pdev->dev, "Invalid McASP version: %d\n",
+                        mcasp->version);
+                ret = -EINVAL;
+                break;
+        }
+
+        if (ret) {
+                dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
+                goto err;
         }
 
         return 0;
 
-err_unregister_component:
-        snd_soc_unregister_component(&pdev->dev);
-err_release_clk:
+err:
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
         return ret;
@@ -1185,12 +1253,6 @@ err_release_clk:
 
 static int davinci_mcasp_remove(struct platform_device *pdev)
 {
-        struct davinci_mcasp *mcasp = dev_get_drvdata(&pdev->dev);
-
-        snd_soc_unregister_component(&pdev->dev);
-        if (mcasp->version != MCASP_VERSION_4)
-                davinci_soc_platform_unregister(&pdev->dev);
-
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index 8fed757d6087..98fbc451892a 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -283,6 +283,7 @@
  */
 #define FIFO_ENABLE     BIT(16)
 #define NUMEVT_MASK     (0xFF << 8)
+#define NUMEVT(x)       (((x) & 0xFF) << 8)
 #define NUMDMA_MASK     (0xFF)
 
 #endif  /* DAVINCI_MCASP_H */
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 14145cdf8a11..7809e9d935fc 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -852,16 +852,10 @@ static struct snd_soc_platform_driver davinci_soc_platform = {
 
 int davinci_soc_platform_register(struct device *dev)
 {
-        return snd_soc_register_platform(dev, &davinci_soc_platform);
+        return devm_snd_soc_register_platform(dev, &davinci_soc_platform);
 }
 EXPORT_SYMBOL_GPL(davinci_soc_platform_register);
 
-void davinci_soc_platform_unregister(struct device *dev)
-{
-        snd_soc_unregister_platform(dev);
-}
-EXPORT_SYMBOL_GPL(davinci_soc_platform_unregister);
-
 MODULE_AUTHOR("Vladimir Barinov");
 MODULE_DESCRIPTION("TI DAVINCI PCM DMA module");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
index fbb710c76c08..0fe2346a9aa2 100644
--- a/sound/soc/davinci/davinci-pcm.h
+++ b/sound/soc/davinci/davinci-pcm.h
@@ -29,7 +29,13 @@ struct davinci_pcm_dma_params {
         unsigned int fifo_level;
 };
 
+#if IS_ENABLED(CONFIG_SND_DAVINCI_SOC)
 int davinci_soc_platform_register(struct device *dev);
-void davinci_soc_platform_unregister(struct device *dev);
+#else
+static inline int davinci_soc_platform_register(struct device *dev)
+{
+        return 0;
+}
+#endif /* CONFIG_SND_DAVINCI_SOC */
 
 #endif
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c
index 30587c0cdbd2..77aef05588c3 100644
--- a/sound/soc/davinci/davinci-vcif.c
+++ b/sound/soc/davinci/davinci-vcif.c
@@ -258,7 +258,6 @@ static int davinci_vcif_probe(struct platform_device *pdev)
 static int davinci_vcif_remove(struct platform_device *pdev)
 {
         snd_soc_unregister_component(&pdev->dev);
-        davinci_soc_platform_unregister(&pdev->dev);
 
         return 0;
 }
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 338a91642471..d262ec0653d3 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,30 +1,77 @@
+menu "SoC Audio for Freescale CPUs"
+
+comment "Common SoC Audio options for Freescale CPUs:"
+
 config SND_SOC_FSL_SAI
-        tristate
+        tristate "Synchronous Audio Interface (SAI) module support"
         select REGMAP_MMIO
         select SND_SOC_GENERIC_DMAENGINE_PCM
+        help
+          Say Y if you want to add Synchronous Audio Interface (SAI)
+          support for the Freescale CPUs.
+          This option is only useful for out-of-tree drivers since
+          in-tree drivers select it automatically.
 
 config SND_SOC_FSL_SSI
-        tristate
+        tristate "Synchronous Serial Interface module support"
+        select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
+        select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && ARCH_MXC
+        help
+          Say Y if you want to add Synchronous Serial Interface (SSI)
+          support for the Freescale CPUs.
+          This option is only useful for out-of-tree drivers since
+          in-tree drivers select it automatically.
 
 config SND_SOC_FSL_SPDIF
-        tristate
+        tristate "Sony/Philips Digital Interface 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 && ARCH_MXC
+        help
+          Say Y if you want to add Sony/Philips Digital Interface (SPDIF)
+          support for the Freescale CPUs.
+          This option is only useful for out-of-tree drivers since
+          in-tree drivers select it automatically.
 
 config SND_SOC_FSL_ESAI
-        tristate
+        tristate "Enhanced Serial Audio Interface (ESAI) module support"
         select REGMAP_MMIO
         select SND_SOC_FSL_UTILS
+        help
+          Say Y if you want to add Enhanced Synchronous Audio Interface
+          (ESAI) support for the Freescale CPUs.
+          This option is only useful for out-of-tree drivers since
+          in-tree drivers select it automatically.
 
 config SND_SOC_FSL_UTILS
         tristate
 
-menuconfig SND_POWERPC_SOC
+config SND_SOC_IMX_PCM_DMA
+        tristate
+        select SND_SOC_GENERIC_DMAENGINE_PCM
+
+config SND_SOC_IMX_AUDMUX
+        tristate "Digital Audio Mux module support"
+        help
+          Say Y if you want to add Digital Audio Mux (AUDMUX) support
+          for the ARM i.MX CPUs.
+          This option is only useful for out-of-tree drivers since
+          in-tree drivers select it automatically.
+
+config SND_POWERPC_SOC
         tristate "SoC Audio for Freescale PowerPC CPUs"
         depends on FSL_SOC || PPC_MPC52xx
         help
           Say Y or M if you want to add support for codecs attached to
           the PowerPC CPUs.
 
+config SND_IMX_SOC
+        tristate "SoC Audio for Freescale i.MX CPUs"
+        depends on ARCH_MXC || COMPILE_TEST
+        help
+          Say Y or M if you want to add support for codecs attached to
+          the i.MX CPUs.
+
 if SND_POWERPC_SOC
 
 config SND_MPC52xx_DMA
@@ -33,6 +80,8 @@ config SND_MPC52xx_DMA
 config SND_SOC_POWERPC_DMA
         tristate
 
+comment "SoC Audio support for Freescale PPC boards:"
+
 config SND_SOC_MPC8610_HPCD
         tristate "ALSA SoC support for the Freescale MPC8610 HPCD board"
         # I2C is necessary for the CS4270 driver
@@ -110,13 +159,6 @@ config SND_MPC52xx_SOC_EFIKA
 
 endif # SND_POWERPC_SOC
 
-menuconfig SND_IMX_SOC
-        tristate "SoC Audio for Freescale i.MX CPUs"
-        depends on ARCH_MXC || COMPILE_TEST
-        help
-          Say Y or M if you want to add support for codecs attached to
-          the i.MX CPUs.
-
 if SND_IMX_SOC
 
 config SND_SOC_IMX_SSI
@@ -127,12 +169,7 @@ config SND_SOC_IMX_PCM_FIQ
         tristate
         select FIQ
 
-config SND_SOC_IMX_PCM_DMA
-        tristate
-        select SND_SOC_GENERIC_DMAENGINE_PCM
-
-config SND_SOC_IMX_AUDMUX
-        tristate
+comment "SoC Audio support for Freescale i.MX boards:"
 
 config SND_MXC_SOC_WM1133_EV1
         tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted"
@@ -187,7 +224,7 @@ config SND_SOC_EUKREA_TLV320
 
 config SND_SOC_IMX_WM8962
         tristate "SoC Audio support for i.MX boards with wm8962"
-        depends on OF && I2C
+        depends on OF && I2C && INPUT
         select SND_SOC_WM8962
         select SND_SOC_IMX_PCM_DMA
         select SND_SOC_IMX_AUDMUX
@@ -225,3 +262,5 @@ config SND_SOC_IMX_MC13783
         select SND_SOC_IMX_PCM_DMA
 
 endif # SND_IMX_SOC
+
+endmenu
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile
index b12ad4b9b4da..db254e358c18 100644
--- a/sound/soc/fsl/Makefile
+++ b/sound/soc/fsl/Makefile
@@ -12,7 +12,8 @@ obj-$(CONFIG_SND_SOC_P1022_RDK) += snd-soc-p1022-rdk.o
 
 # Freescale SSI/DMA/SAI/SPDIF Support
 snd-soc-fsl-sai-objs := fsl_sai.o
-snd-soc-fsl-ssi-objs := fsl_ssi.o
+snd-soc-fsl-ssi-y := fsl_ssi.o
+snd-soc-fsl-ssi-$(CONFIG_DEBUG_FS) += fsl_ssi_dbg.o
 snd-soc-fsl-spdif-objs := fsl_spdif.o
 snd-soc-fsl-esai-objs := fsl_esai.o
 snd-soc-fsl-utils-objs := fsl_utils.o
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 496ce2eb2f1f..d719caf26dc2 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -39,6 +39,8 @@
  * @fifo_depth: depth of tx/rx FIFO
  * @slot_width: width of each DAI slot
  * @hck_rate: clock rate of desired HCKx clock
+ * @sck_rate: clock rate of desired SCKx clock
+ * @hck_dir: the direction of HCKx pads
  * @sck_div: if using PSR/PM dividers for SCKx clock
  * @slave_mode: if fully using DAI slave mode
  * @synchronous: if using tx/rx synchronous mode
@@ -55,6 +57,8 @@ struct fsl_esai {
         u32 fifo_depth;
         u32 slot_width;
         u32 hck_rate[2];
+        u32 sck_rate[2];
+        bool hck_dir[2];
         bool sck_div[2];
         bool slave_mode;
         bool synchronous;
@@ -209,8 +213,13 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
         struct clk *clksrc = esai_priv->extalclk;
         bool tx = clk_id <= ESAI_HCKT_EXTAL;
         bool in = dir == SND_SOC_CLOCK_IN;
-        u32 ret, ratio, ecr = 0;
+        u32 ratio, ecr = 0;
         unsigned long clk_rate;
+        int ret;
+
+        /* Bypass divider settings if the requirement doesn't change */
+        if (freq == esai_priv->hck_rate[tx] && dir == esai_priv->hck_dir[tx])
+                return 0;
 
         /* sck_div can be only bypassed if ETO/ERO=0 and SNC_SOC_CLOCK_OUT */
         esai_priv->sck_div[tx] = true;
@@ -277,6 +286,7 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
         esai_priv->sck_div[tx] = false;
 
 out:
+        esai_priv->hck_dir[tx] = dir;
         esai_priv->hck_rate[tx] = freq;
 
         regmap_update_bits(esai_priv->regmap, REG_ESAI_ECR,
@@ -294,9 +304,10 @@ static int fsl_esai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq)
         struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai);
         u32 hck_rate = esai_priv->hck_rate[tx];
         u32 sub, ratio = hck_rate / freq;
+        int ret;
 
-        /* Don't apply for fully slave mode*/
-        if (esai_priv->slave_mode)
+        /* Don't apply for fully slave mode or unchanged bclk */
+        if (esai_priv->slave_mode || esai_priv->sck_rate[tx] == freq)
                 return 0;
 
         if (ratio * freq > hck_rate)
@@ -319,8 +330,15 @@ static int fsl_esai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq)
                 return -EINVAL;
         }
 
-        return fsl_esai_divisor_cal(dai, tx, ratio, true,
+        ret = fsl_esai_divisor_cal(dai, tx, ratio, true,
                         esai_priv->sck_div[tx] ? 0 : ratio);
+        if (ret)
+                return ret;
+
+        /* Save current bclk rate */
+        esai_priv->sck_rate[tx] = freq;
+
+        return 0;
 }
 
 static int fsl_esai_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask,
@@ -439,8 +457,8 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 static int fsl_esai_startup(struct snd_pcm_substream *substream,
                             struct snd_soc_dai *dai)
 {
-        int ret;
         struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai);
+        int ret;
 
         /*
          * Some platforms might use the same bit to gate all three or two of
@@ -492,7 +510,8 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream,
         bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
         u32 width = snd_pcm_format_width(params_format(params));
         u32 channels = params_channels(params);
-        u32 bclk, mask, val, ret;
+        u32 bclk, mask, val;
+        int ret;
 
         bclk = params_rate(params) * esai_priv->slot_width * 2;
 
@@ -822,6 +841,7 @@ static int fsl_esai_probe(struct platform_device *pdev)
 
 static const struct of_device_id fsl_esai_dt_ids[] = {
         { .compatible = "fsl,imx35-esai", },
+        { .compatible = "fsl,vf610-esai", },
         {}
 };
 MODULE_DEVICE_TABLE(of, fsl_esai_dt_ids);
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 56da8c8c5960..c5a0e8af8226 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -22,6 +22,7 @@
 #include <sound/pcm_params.h>
 
 #include "fsl_sai.h"
+#include "imx-pcm.h"
 
 #define FSL_SAI_FLAGS (FSL_SAI_CSR_SEIE |\
                        FSL_SAI_CSR_FEIE)
@@ -30,78 +31,96 @@ static irqreturn_t fsl_sai_isr(int irq, void *devid)
 {
         struct fsl_sai *sai = (struct fsl_sai *)devid;
         struct device *dev = &sai->pdev->dev;
-        u32 xcsr, mask;
+        u32 flags, xcsr, mask;
+        bool irq_none = true;
 
-        /* Only handle those what we enabled */
+        /*
+         * Both IRQ status bits and IRQ mask bits are in the xCSR but
+         * different shifts. And we here create a mask only for those
+         * IRQs that we activated.
+         */
         mask = (FSL_SAI_FLAGS >> FSL_SAI_CSR_xIE_SHIFT) << FSL_SAI_CSR_xF_SHIFT;
 
         /* Tx IRQ */
         regmap_read(sai->regmap, FSL_SAI_TCSR, &xcsr);
-        xcsr &= mask;
+        flags = xcsr & mask;
+
+        if (flags)
+                irq_none = false;
+        else
+                goto irq_rx;
 
-        if (xcsr & FSL_SAI_CSR_WSF)
+        if (flags & FSL_SAI_CSR_WSF)
                 dev_dbg(dev, "isr: Start of Tx word detected\n");
 
-        if (xcsr & FSL_SAI_CSR_SEF)
+        if (flags & FSL_SAI_CSR_SEF)
                 dev_warn(dev, "isr: Tx Frame sync error detected\n");
 
-        if (xcsr & FSL_SAI_CSR_FEF) {
+        if (flags & FSL_SAI_CSR_FEF) {
                 dev_warn(dev, "isr: Transmit underrun detected\n");
                 /* FIFO reset for safety */
                 xcsr |= FSL_SAI_CSR_FR;
         }
 
-        if (xcsr & FSL_SAI_CSR_FWF)
+        if (flags & FSL_SAI_CSR_FWF)
                 dev_dbg(dev, "isr: Enabled transmit FIFO is empty\n");
 
-        if (xcsr & FSL_SAI_CSR_FRF)
+        if (flags & FSL_SAI_CSR_FRF)
                 dev_dbg(dev, "isr: Transmit FIFO watermark has been reached\n");
 
-        regmap_update_bits(sai->regmap, FSL_SAI_TCSR,
-                           FSL_SAI_CSR_xF_W_MASK | FSL_SAI_CSR_FR, xcsr);
+        flags &= FSL_SAI_CSR_xF_W_MASK;
+        xcsr &= ~FSL_SAI_CSR_xF_MASK;
+
+        if (flags)
+                regmap_write(sai->regmap, FSL_SAI_TCSR, flags | xcsr);
 
+irq_rx:
         /* Rx IRQ */
         regmap_read(sai->regmap, FSL_SAI_RCSR, &xcsr);
-        xcsr &= mask;
+        flags = xcsr & mask;
 
-        if (xcsr & FSL_SAI_CSR_WSF)
+        if (flags)
+                irq_none = false;
+        else
+                goto out;
+
+        if (flags & FSL_SAI_CSR_WSF)
                 dev_dbg(dev, "isr: Start of Rx word detected\n");
 
-        if (xcsr & FSL_SAI_CSR_SEF)
+        if (flags & FSL_SAI_CSR_SEF)
                 dev_warn(dev, "isr: Rx Frame sync error detected\n");
 
-        if (xcsr & FSL_SAI_CSR_FEF) {
+        if (flags & FSL_SAI_CSR_FEF) {
                 dev_warn(dev, "isr: Receive overflow detected\n");
                 /* FIFO reset for safety */
                 xcsr |= FSL_SAI_CSR_FR;
         }
 
-        if (xcsr & FSL_SAI_CSR_FWF)
+        if (flags & FSL_SAI_CSR_FWF)
                 dev_dbg(dev, "isr: Enabled receive FIFO is full\n");
 
-        if (xcsr & FSL_SAI_CSR_FRF)
+        if (flags & FSL_SAI_CSR_FRF)
                 dev_dbg(dev, "isr: Receive FIFO watermark has been reached\n");
 
-        regmap_update_bits(sai->regmap, FSL_SAI_RCSR,
-                           FSL_SAI_CSR_xF_W_MASK | FSL_SAI_CSR_FR, xcsr);
+        flags &= FSL_SAI_CSR_xF_W_MASK;
+        xcsr &= ~FSL_SAI_CSR_xF_MASK;
+
+        if (flags)
+                regmap_write(sai->regmap, FSL_SAI_TCSR, flags | xcsr);
 
-        return IRQ_HANDLED;
+out:
+        if (irq_none)
+                return IRQ_NONE;
+        else
+                return IRQ_HANDLED;
 }
 
 static int fsl_sai_set_dai_sysclk_tr(struct snd_soc_dai *cpu_dai,
                 int clk_id, unsigned int freq, int fsl_dir)
 {
         struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
-        u32 val_cr2, reg_cr2;
-
-        if (fsl_dir == FSL_FMT_TRANSMITTER)
-                reg_cr2 = FSL_SAI_TCR2;
-        else
-                reg_cr2 = FSL_SAI_RCR2;
-
-        regmap_read(sai->regmap, reg_cr2, &val_cr2);
-
-        val_cr2 &= ~FSL_SAI_CR2_MSEL_MASK;
+        bool tx = fsl_dir == FSL_FMT_TRANSMITTER;
+        u32 val_cr2 = 0;
 
         switch (clk_id) {
         case FSL_SAI_CLK_BUS:
@@ -120,7 +139,8 @@ static int fsl_sai_set_dai_sysclk_tr(struct snd_soc_dai *cpu_dai,
                 return -EINVAL;
         }
 
-        regmap_write(sai->regmap, reg_cr2, val_cr2);
+        regmap_update_bits(sai->regmap, FSL_SAI_xCR2(tx),
+                           FSL_SAI_CR2_MSEL_MASK, val_cr2);
 
         return 0;
 }
@@ -152,22 +172,10 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
                                 unsigned int fmt, int fsl_dir)
 {
         struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
-        u32 val_cr2, val_cr4, reg_cr2, reg_cr4;
-
-        if (fsl_dir == FSL_FMT_TRANSMITTER) {
-                reg_cr2 = FSL_SAI_TCR2;
-                reg_cr4 = FSL_SAI_TCR4;
-        } else {
-                reg_cr2 = FSL_SAI_RCR2;
-                reg_cr4 = FSL_SAI_RCR4;
-        }
+        bool tx = fsl_dir == FSL_FMT_TRANSMITTER;
+        u32 val_cr2 = 0, val_cr4 = 0;
 
-        regmap_read(sai->regmap, reg_cr2, &val_cr2);
-        regmap_read(sai->regmap, reg_cr4, &val_cr4);
-
-        if (sai->big_endian_data)
-                val_cr4 &= ~FSL_SAI_CR4_MF;
-        else
+        if (!sai->big_endian_data)
                 val_cr4 |= FSL_SAI_CR4_MF;
 
         /* DAI mode */
@@ -188,7 +196,6 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
                  * frame sync asserts with the first bit of the frame.
                  */
                 val_cr2 |= FSL_SAI_CR2_BCP;
-                val_cr4 &= ~(FSL_SAI_CR4_FSE | FSL_SAI_CR4_FSP);
                 break;
         case SND_SOC_DAIFMT_DSP_A:
                 /*
@@ -198,7 +205,6 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
                  * data word.
                  */
                 val_cr2 |= FSL_SAI_CR2_BCP;
-                val_cr4 &= ~FSL_SAI_CR4_FSP;
                 val_cr4 |= FSL_SAI_CR4_FSE;
                 sai->is_dsp_mode = true;
                 break;
@@ -208,7 +214,6 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
                  * frame sync asserts with the first bit of the frame.
                  */
                 val_cr2 |= FSL_SAI_CR2_BCP;
-                val_cr4 &= ~(FSL_SAI_CR4_FSE | FSL_SAI_CR4_FSP);
                 sai->is_dsp_mode = true;
                 break;
         case SND_SOC_DAIFMT_RIGHT_J:
@@ -246,23 +251,22 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
                 val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
                 break;
         case SND_SOC_DAIFMT_CBM_CFM:
-                val_cr2 &= ~FSL_SAI_CR2_BCD_MSTR;
-                val_cr4 &= ~FSL_SAI_CR4_FSD_MSTR;
                 break;
         case SND_SOC_DAIFMT_CBS_CFM:
                 val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
-                val_cr4 &= ~FSL_SAI_CR4_FSD_MSTR;
                 break;
         case SND_SOC_DAIFMT_CBM_CFS:
-                val_cr2 &= ~FSL_SAI_CR2_BCD_MSTR;
                 val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
                 break;
         default:
                 return -EINVAL;
         }
 
-        regmap_write(sai->regmap, reg_cr2, val_cr2);
-        regmap_write(sai->regmap, reg_cr4, val_cr4);
+        regmap_update_bits(sai->regmap, FSL_SAI_xCR2(tx),
+                           FSL_SAI_CR2_BCP | FSL_SAI_CR2_BCD_MSTR, val_cr2);
+        regmap_update_bits(sai->regmap, FSL_SAI_xCR4(tx),
+                           FSL_SAI_CR4_MF | FSL_SAI_CR4_FSE |
+                           FSL_SAI_CR4_FSP | FSL_SAI_CR4_FSD_MSTR, val_cr4);
 
         return 0;
 }
@@ -289,29 +293,10 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
                 struct snd_soc_dai *cpu_dai)
 {
         struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
-        u32 val_cr4, val_cr5, val_mr, reg_cr4, reg_cr5, reg_mr;
+        bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
         unsigned int channels = params_channels(params);
         u32 word_width = snd_pcm_format_width(params_format(params));
-
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                reg_cr4 = FSL_SAI_TCR4;
-                reg_cr5 = FSL_SAI_TCR5;
-                reg_mr = FSL_SAI_TMR;
-        } else {
-                reg_cr4 = FSL_SAI_RCR4;
-                reg_cr5 = FSL_SAI_RCR5;
-                reg_mr = FSL_SAI_RMR;
-        }
-
-        regmap_read(sai->regmap, reg_cr4, &val_cr4);
-        regmap_read(sai->regmap, reg_cr4, &val_cr5);
-
-        val_cr4 &= ~FSL_SAI_CR4_SYWD_MASK;
-        val_cr4 &= ~FSL_SAI_CR4_FRSZ_MASK;
-
-        val_cr5 &= ~FSL_SAI_CR5_WNW_MASK;
-        val_cr5 &= ~FSL_SAI_CR5_W0W_MASK;
-        val_cr5 &= ~FSL_SAI_CR5_FBT_MASK;
+        u32 val_cr4 = 0, val_cr5 = 0;
 
         if (!sai->is_dsp_mode)
                 val_cr4 |= FSL_SAI_CR4_SYWD(word_width);
@@ -319,18 +304,20 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
         val_cr5 |= FSL_SAI_CR5_WNW(word_width);
         val_cr5 |= FSL_SAI_CR5_W0W(word_width);
 
-        val_cr5 &= ~FSL_SAI_CR5_FBT_MASK;
         if (sai->big_endian_data)
                 val_cr5 |= FSL_SAI_CR5_FBT(0);
         else
                 val_cr5 |= FSL_SAI_CR5_FBT(word_width - 1);
 
         val_cr4 |= FSL_SAI_CR4_FRSZ(channels);
-        val_mr = ~0UL - ((1 << channels) - 1);
 
-        regmap_write(sai->regmap, reg_cr4, val_cr4);
-        regmap_write(sai->regmap, reg_cr5, val_cr5);
-        regmap_write(sai->regmap, reg_mr, val_mr);
+        regmap_update_bits(sai->regmap, FSL_SAI_xCR4(tx),
+                           FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK,
+                           val_cr4);
+        regmap_update_bits(sai->regmap, FSL_SAI_xCR5(tx),
+                           FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK |
+                           FSL_SAI_CR5_FBT_MASK, val_cr5);
+        regmap_write(sai->regmap, FSL_SAI_xMR(tx), ~0UL - ((1 << channels) - 1));
 
         return 0;
 }
@@ -339,6 +326,7 @@ static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd,
                 struct snd_soc_dai *cpu_dai)
 {
         struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
+        bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
         u32 tcsr, rcsr;
 
         /*
@@ -353,14 +341,6 @@ static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd,
         regmap_read(sai->regmap, FSL_SAI_TCSR, &tcsr);
         regmap_read(sai->regmap, FSL_SAI_RCSR, &rcsr);
 
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                tcsr |= FSL_SAI_CSR_FRDE;
-                rcsr &= ~FSL_SAI_CSR_FRDE;
-        } else {
-                rcsr |= FSL_SAI_CSR_FRDE;
-                tcsr &= ~FSL_SAI_CSR_FRDE;
-        }
-
         /*
          * It is recommended that the transmitter is the last enabled
          * and the first disabled.
@@ -369,22 +349,33 @@ static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd,
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                tcsr |= FSL_SAI_CSR_TERE;
-                rcsr |= FSL_SAI_CSR_TERE;
+                if (!(tcsr & FSL_SAI_CSR_FRDE || rcsr & FSL_SAI_CSR_FRDE)) {
+                        regmap_update_bits(sai->regmap, FSL_SAI_RCSR,
+                                           FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE);
+                        regmap_update_bits(sai->regmap, FSL_SAI_TCSR,
+                                           FSL_SAI_CSR_TERE, FSL_SAI_CSR_TERE);
+                }
 
-                regmap_write(sai->regmap, FSL_SAI_RCSR, rcsr);
-                regmap_write(sai->regmap, FSL_SAI_TCSR, tcsr);
+                regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx),
+                                   FSL_SAI_CSR_xIE_MASK, FSL_SAI_FLAGS);
+                regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx),
+                                   FSL_SAI_CSR_FRDE, FSL_SAI_CSR_FRDE);
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                if (!(cpu_dai->playback_active || cpu_dai->capture_active)) {
-                        tcsr &= ~FSL_SAI_CSR_TERE;
-                        rcsr &= ~FSL_SAI_CSR_TERE;
+                regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx),
+                                   FSL_SAI_CSR_FRDE, 0);
+                regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx),
+                                   FSL_SAI_CSR_xIE_MASK, 0);
+
+                /* Check if the opposite FRDE is also disabled */
+                if (!(tx ? rcsr & FSL_SAI_CSR_FRDE : tcsr & FSL_SAI_CSR_FRDE)) {
+                        regmap_update_bits(sai->regmap, FSL_SAI_TCSR,
+                                           FSL_SAI_CSR_TERE, 0);
+                        regmap_update_bits(sai->regmap, FSL_SAI_RCSR,
+                                           FSL_SAI_CSR_TERE, 0);
                 }
-
-                regmap_write(sai->regmap, FSL_SAI_TCSR, tcsr);
-                regmap_write(sai->regmap, FSL_SAI_RCSR, rcsr);
                 break;
         default:
                 return -EINVAL;
@@ -397,14 +388,17 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream,
                 struct snd_soc_dai *cpu_dai)
 {
         struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
-        u32 reg;
+        bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
+        struct device *dev = &sai->pdev->dev;
+        int ret;
 
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                reg = FSL_SAI_TCR3;
-        else
-                reg = FSL_SAI_RCR3;
+        ret = clk_prepare_enable(sai->bus_clk);
+        if (ret) {
+                dev_err(dev, "failed to enable bus clock: %d\n", ret);
+                return ret;
+        }
 
-        regmap_update_bits(sai->regmap, reg, FSL_SAI_CR3_TRCE,
+        regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE,
                            FSL_SAI_CR3_TRCE);
 
         return 0;
@@ -414,15 +408,11 @@ static void fsl_sai_shutdown(struct snd_pcm_substream *substream,
                 struct snd_soc_dai *cpu_dai)
 {
         struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
-        u32 reg;
+        bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
 
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                reg = FSL_SAI_TCR3;
-        else
-                reg = FSL_SAI_RCR3;
+        regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0);
 
-        regmap_update_bits(sai->regmap, reg, FSL_SAI_CR3_TRCE,
-                           ~FSL_SAI_CR3_TRCE);
+        clk_disable_unprepare(sai->bus_clk);
 }
 
 static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {
@@ -438,8 +428,8 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai)
 {
         struct fsl_sai *sai = dev_get_drvdata(cpu_dai->dev);
 
-        regmap_update_bits(sai->regmap, FSL_SAI_TCSR, 0xffffffff, FSL_SAI_FLAGS);
-        regmap_update_bits(sai->regmap, FSL_SAI_RCSR, 0xffffffff, FSL_SAI_FLAGS);
+        regmap_update_bits(sai->regmap, FSL_SAI_TCSR, 0xffffffff, 0x0);
+        regmap_update_bits(sai->regmap, FSL_SAI_RCSR, 0xffffffff, 0x0);
         regmap_update_bits(sai->regmap, FSL_SAI_TCR1, FSL_SAI_CR1_RFW_MASK,
                            FSL_SAI_MAXBURST_TX * 2);
         regmap_update_bits(sai->regmap, FSL_SAI_RCR1, FSL_SAI_CR1_RFW_MASK,
@@ -555,7 +545,8 @@ static int fsl_sai_probe(struct platform_device *pdev)
         struct fsl_sai *sai;
         struct resource *res;
         void __iomem *base;
-        int irq, ret;
+        char tmp[8];
+        int irq, ret, i;
 
         sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL);
         if (!sai)
@@ -563,6 +554,9 @@ static int fsl_sai_probe(struct platform_device *pdev)
 
         sai->pdev = pdev;
 
+        if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai"))
+                sai->sai_on_imx = true;
+
         sai->big_endian_regs = of_property_read_bool(np, "big-endian-regs");
         if (sai->big_endian_regs)
                 fsl_sai_regmap_config.val_format_endian = REGMAP_ENDIAN_BIG;
@@ -575,12 +569,35 @@ static int fsl_sai_probe(struct platform_device *pdev)
                 return PTR_ERR(base);
 
         sai->regmap = devm_regmap_init_mmio_clk(&pdev->dev,
-                        "sai", base, &fsl_sai_regmap_config);
+                        "bus", base, &fsl_sai_regmap_config);
+
+        /* Compatible with old DTB cases */
+        if (IS_ERR(sai->regmap))
+                sai->regmap = devm_regmap_init_mmio_clk(&pdev->dev,
+                                "sai", base, &fsl_sai_regmap_config);
         if (IS_ERR(sai->regmap)) {
                 dev_err(&pdev->dev, "regmap init failed\n");
                 return PTR_ERR(sai->regmap);
         }
 
+        /* No error out for old DTB cases but only mark the clock NULL */
+        sai->bus_clk = devm_clk_get(&pdev->dev, "bus");
+        if (IS_ERR(sai->bus_clk)) {
+                dev_err(&pdev->dev, "failed to get bus clock: %ld\n",
+                                PTR_ERR(sai->bus_clk));
+                sai->bus_clk = NULL;
+        }
+
+        for (i = 0; i < FSL_SAI_MCLK_MAX; i++) {
+                sprintf(tmp, "mclk%d", i + 1);
+                sai->mclk_clk[i] = devm_clk_get(&pdev->dev, tmp);
+                if (IS_ERR(sai->mclk_clk[i])) {
+                        dev_err(&pdev->dev, "failed to get mclk%d clock: %ld\n",
+                                        i + 1, PTR_ERR(sai->mclk_clk[i]));
+                        sai->mclk_clk[i] = NULL;
+                }
+        }
+
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
                 dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
@@ -605,12 +622,16 @@ static int fsl_sai_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
-        return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL,
-                        SND_DMAENGINE_PCM_FLAG_NO_RESIDUE);
+        if (sai->sai_on_imx)
+                return imx_pcm_dma_init(pdev);
+        else
+                return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL,
+                                SND_DMAENGINE_PCM_FLAG_NO_RESIDUE);
 }
 
 static const struct of_device_id fsl_sai_ids[] = {
         { .compatible = "fsl,vf610-sai", },
+        { .compatible = "fsl,imx6sx-sai", },
         { /* sentinel */ }
 };
 
diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index a264185c7138..0e6c9f595d75 100644
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -35,6 +35,16 @@
 #define FSL_SAI_RFR     0xc0 /* SAI Receive FIFO */
 #define FSL_SAI_RMR     0xe0 /* SAI Receive Mask */
 
+#define FSL_SAI_xCSR(tx)        (tx ? FSL_SAI_TCSR : FSL_SAI_RCSR)
+#define FSL_SAI_xCR1(tx)        (tx ? FSL_SAI_TCR1 : FSL_SAI_RCR1)
+#define FSL_SAI_xCR2(tx)        (tx ? FSL_SAI_TCR2 : FSL_SAI_RCR2)
+#define FSL_SAI_xCR3(tx)        (tx ? FSL_SAI_TCR3 : FSL_SAI_RCR3)
+#define FSL_SAI_xCR4(tx)        (tx ? FSL_SAI_TCR4 : FSL_SAI_RCR4)
+#define FSL_SAI_xCR5(tx)        (tx ? FSL_SAI_TCR5 : FSL_SAI_RCR5)
+#define FSL_SAI_xDR(tx)         (tx ? FSL_SAI_TDR : FSL_SAI_RDR)
+#define FSL_SAI_xFR(tx)         (tx ? FSL_SAI_TFR : FSL_SAI_RFR)
+#define FSL_SAI_xMR(tx)         (tx ? FSL_SAI_TMR : FSL_SAI_RMR)
+
 /* SAI Transmit/Recieve Control Register */
 #define FSL_SAI_CSR_TERE        BIT(31)
 #define FSL_SAI_CSR_FR          BIT(25)
@@ -48,6 +58,7 @@
 #define FSL_SAI_CSR_FWF         BIT(17)
 #define FSL_SAI_CSR_FRF         BIT(16)
 #define FSL_SAI_CSR_xIE_SHIFT   8
+#define FSL_SAI_CSR_xIE_MASK    (0x1f << FSL_SAI_CSR_xIE_SHIFT)
 #define FSL_SAI_CSR_WSIE        BIT(12)
 #define FSL_SAI_CSR_SEIE        BIT(11)
 #define FSL_SAI_CSR_FEIE        BIT(10)
@@ -108,6 +119,8 @@
 #define FSL_SAI_CLK_MAST2       2
 #define FSL_SAI_CLK_MAST3       3
 
+#define FSL_SAI_MCLK_MAX        3
+
 /* SAI data transfer numbers per DMA request */
 #define FSL_SAI_MAXBURST_TX 6
 #define FSL_SAI_MAXBURST_RX 6
@@ -115,10 +128,13 @@
 struct fsl_sai {
         struct platform_device *pdev;
         struct regmap *regmap;
+        struct clk *bus_clk;
+        struct clk *mclk_clk[FSL_SAI_MCLK_MAX];
 
         bool big_endian_regs;
         bool big_endian_data;
         bool is_dsp_mode;
+        bool sai_on_imx;
 
         struct snd_dmaengine_dai_dma_data dma_params_rx;
         struct snd_dmaengine_dai_dma_data dma_params_tx;
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 6452ca83d889..b912d45a2a4c 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -13,18 +13,18 @@
  * kind, whether express or implied.
  */
 
-#include <linux/module.h>
+#include <linux/bitrev.h>
 #include <linux/clk.h>
 #include <linux/clk-private.h>
-#include <linux/bitrev.h>
-#include <linux/regmap.h>
+#include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
+#include <linux/regmap.h>
 
 #include <sound/asoundef.h>
-#include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
+#include <sound/soc.h>
 
 #include "fsl_spdif.h"
 #include "imx-pcm.h"
@@ -69,17 +69,42 @@ struct spdif_mixer_control {
         u32 ready_buf;
 };
 
+/**
+ * fsl_spdif_priv: Freescale SPDIF private data
+ *
+ * @fsl_spdif_control: SPDIF control data
+ * @cpu_dai_drv: cpu dai driver
+ * @pdev: platform device pointer
+ * @regmap: regmap handler
+ * @dpll_locked: dpll lock flag
+ * @txrate: the best rates for playback
+ * @txclk_df: STC_TXCLK_DF dividers value for playback
+ * @sysclk_df: STC_SYSCLK_DF dividers value for playback
+ * @txclk_src: STC_TXCLK_SRC values for playback
+ * @rxclk_src: SRPC_CLKSRC_SEL values for capture
+ * @txclk: tx clock sources for playback
+ * @rxclk: rx clock sources for capture
+ * @coreclk: core clock for register access via DMA
+ * @sysclk: system clock for rx clock rate measurement
+ * @dma_params_tx: DMA parameters for transmit channel
+ * @dma_params_rx: DMA parameters for receive channel
+ * @name: driver name
+ */
 struct fsl_spdif_priv {
         struct spdif_mixer_control fsl_spdif_control;
         struct snd_soc_dai_driver cpu_dai_drv;
         struct platform_device *pdev;
         struct regmap *regmap;
         bool dpll_locked;
-        u8 txclk_div[SPDIF_TXRATE_MAX];
+        u16 txrate[SPDIF_TXRATE_MAX];
+        u8 txclk_df[SPDIF_TXRATE_MAX];
+        u8 sysclk_df[SPDIF_TXRATE_MAX];
         u8 txclk_src[SPDIF_TXRATE_MAX];
         u8 rxclk_src;
         struct clk *txclk[SPDIF_TXRATE_MAX];
         struct clk *rxclk;
+        struct clk *coreclk;
+        struct clk *sysclk;
         struct snd_dmaengine_dai_dma_data dma_params_tx;
         struct snd_dmaengine_dai_dma_data dma_params_rx;
 
@@ -349,7 +374,7 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream,
         struct platform_device *pdev = spdif_priv->pdev;
         unsigned long csfs = 0;
         u32 stc, mask, rate;
-        u8 clk, div;
+        u8 clk, txclk_df, sysclk_df;
         int ret;
 
         switch (sample_rate) {
@@ -376,25 +401,31 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        div = spdif_priv->txclk_div[rate];
-        if (div == 0) {
-                dev_err(&pdev->dev, "the divisor can't be zero\n");
+        txclk_df = spdif_priv->txclk_df[rate];
+        if (txclk_df == 0) {
+                dev_err(&pdev->dev, "the txclk_df can't be zero\n");
                 return -EINVAL;
         }
 
+        sysclk_df = spdif_priv->sysclk_df[rate];
+
+        /* Don't mess up the clocks from other modules */
+        if (clk != STC_TXCLK_SPDIF_ROOT)
+                goto clk_set_bypass;
+
         /*
-         * The S/PDIF block needs a clock of 64 * fs * div.  The S/PDIF block
-         * will divide by (div).  So request 64 * fs * (div+1) which will
-         * get rounded.
+         * The S/PDIF block needs a clock of 64 * fs * txclk_df.
+         * So request 64 * fs * (txclk_df + 1) to get rounded.
          */
-        ret = clk_set_rate(spdif_priv->txclk[rate], 64 * sample_rate * (div + 1));
+        ret = clk_set_rate(spdif_priv->txclk[rate], 64 * sample_rate * (txclk_df + 1));
         if (ret) {
                 dev_err(&pdev->dev, "failed to set tx clock rate\n");
                 return ret;
         }
 
+clk_set_bypass:
         dev_dbg(&pdev->dev, "expected clock rate = %d\n",
-                        (64 * sample_rate * div));
+                        (64 * sample_rate * txclk_df * sysclk_df));
         dev_dbg(&pdev->dev, "actual clock rate = %ld\n",
                         clk_get_rate(spdif_priv->txclk[rate]));
 
@@ -402,11 +433,15 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream,
         spdif_set_cstatus(ctrl, IEC958_AES3_CON_FS, csfs);
 
         /* select clock source and divisor */
-        stc = STC_TXCLK_ALL_EN | STC_TXCLK_SRC_SET(clk) | STC_TXCLK_DIV(div);
-        mask = STC_TXCLK_ALL_EN_MASK | STC_TXCLK_SRC_MASK | STC_TXCLK_DIV_MASK;
+        stc = STC_TXCLK_ALL_EN | STC_TXCLK_SRC_SET(clk) | STC_TXCLK_DF(txclk_df);
+        mask = STC_TXCLK_ALL_EN_MASK | STC_TXCLK_SRC_MASK | STC_TXCLK_DF_MASK;
         regmap_update_bits(regmap, REG_SPDIF_STC, mask, stc);
 
-        dev_dbg(&pdev->dev, "set sample rate to %d\n", sample_rate);
+        regmap_update_bits(regmap, REG_SPDIF_STC,
+                           STC_SYSCLK_DF_MASK, STC_SYSCLK_DF(sysclk_df));
+
+        dev_dbg(&pdev->dev, "set sample rate to %dHz for %dHz playback\n",
+                        spdif_priv->txrate[rate], sample_rate);
 
         return 0;
 }
@@ -423,10 +458,16 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream,
 
         /* Reset module and interrupts only for first initialization */
         if (!cpu_dai->active) {
+                ret = clk_prepare_enable(spdif_priv->coreclk);
+                if (ret) {
+                        dev_err(&pdev->dev, "failed to enable core clock\n");
+                        return ret;
+                }
+
                 ret = spdif_softreset(spdif_priv);
                 if (ret) {
                         dev_err(&pdev->dev, "failed to soft reset\n");
-                        return ret;
+                        goto err;
                 }
 
                 /* Disable all the interrupts */
@@ -454,6 +495,11 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream,
         regmap_update_bits(regmap, REG_SPDIF_SCR, SCR_LOW_POWER, 0);
 
         return 0;
+
+err:
+        clk_disable_unprepare(spdif_priv->coreclk);
+
+        return ret;
 }
 
 static void fsl_spdif_shutdown(struct snd_pcm_substream *substream,
@@ -484,6 +530,7 @@ static void fsl_spdif_shutdown(struct snd_pcm_substream *substream,
                 spdif_intr_status_clear(spdif_priv);
                 regmap_update_bits(regmap, REG_SPDIF_SCR,
                                 SCR_LOW_POWER, SCR_LOW_POWER);
+                clk_disable_unprepare(spdif_priv->coreclk);
         }
 }
 
@@ -754,7 +801,7 @@ static int spdif_get_rxclk_rate(struct fsl_spdif_priv *spdif_priv,
         clksrc = (phaseconf >> SRPC_CLKSRC_SEL_OFFSET) & 0xf;
         if (srpc_dpll_locked[clksrc] && (phaseconf & SRPC_DPLL_LOCKED)) {
                 /* Get bus clock from system */
-                busclk_freq = clk_get_rate(spdif_priv->rxclk);
+                busclk_freq = clk_get_rate(spdif_priv->sysclk);
         }
 
         /* FreqMeas_CLK = (BUS_CLK * FreqMeas) / 2 ^ 10 / GAINSEL / 128 */
@@ -997,43 +1044,61 @@ static struct regmap_config fsl_spdif_regmap_config = {
 
 static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv,
                                 struct clk *clk, u64 savesub,
-                                enum spdif_txrate index)
+                                enum spdif_txrate index, bool round)
 {
         const u32 rate[] = { 32000, 44100, 48000 };
+        bool is_sysclk = clk == spdif_priv->sysclk;
         u64 rate_ideal, rate_actual, sub;
-        u32 div, arate;
-
-        for (div = 1; div <= 128; div++) {
-                rate_ideal = rate[index] * (div + 1) * 64;
-                rate_actual = clk_round_rate(clk, rate_ideal);
-
-                arate = rate_actual / 64;
-                arate /= div;
-
-                if (arate == rate[index]) {
-                        /* We are lucky */
-                        savesub = 0;
-                        spdif_priv->txclk_div[index] = div;
-                        break;
-                } else if (arate / rate[index] == 1) {
-                        /* A little bigger than expect */
-                        sub = (arate - rate[index]) * 100000;
-                        do_div(sub, rate[index]);
-                        if (sub < savesub) {
+        u32 sysclk_dfmin, sysclk_dfmax;
+        u32 txclk_df, sysclk_df, arate;
+
+        /* The sysclk has an extra divisor [2, 512] */
+        sysclk_dfmin = is_sysclk ? 2 : 1;
+        sysclk_dfmax = is_sysclk ? 512 : 1;
+
+        for (sysclk_df = sysclk_dfmin; sysclk_df <= sysclk_dfmax; sysclk_df++) {
+                for (txclk_df = 1; txclk_df <= 128; txclk_df++) {
+                        rate_ideal = rate[index] * (txclk_df + 1) * 64;
+                        if (round)
+                                rate_actual = clk_round_rate(clk, rate_ideal);
+                        else
+                                rate_actual = clk_get_rate(clk);
+
+                        arate = rate_actual / 64;
+                        arate /= txclk_df * sysclk_df;
+
+                        if (arate == rate[index]) {
+                                /* We are lucky */
+                                savesub = 0;
+                                spdif_priv->txclk_df[index] = txclk_df;
+                                spdif_priv->sysclk_df[index] = sysclk_df;
+                                spdif_priv->txrate[index] = arate;
+                                goto out;
+                        } else if (arate / rate[index] == 1) {
+                                /* A little bigger than expect */
+                                sub = (arate - rate[index]) * 100000;
+                                do_div(sub, rate[index]);
+                                if (sub >= savesub)
+                                        continue;
                                 savesub = sub;
-                                spdif_priv->txclk_div[index] = div;
-                        }
-                } else if (rate[index] / arate == 1) {
-                        /* A little smaller than expect */
-                        sub = (rate[index] - arate) * 100000;
-                        do_div(sub, rate[index]);
-                        if (sub < savesub) {
+                                spdif_priv->txclk_df[index] = txclk_df;
+                                spdif_priv->sysclk_df[index] = sysclk_df;
+                                spdif_priv->txrate[index] = arate;
+                        } else if (rate[index] / arate == 1) {
+                                /* A little smaller than expect */
+                                sub = (rate[index] - arate) * 100000;
+                                do_div(sub, rate[index]);
+                                if (sub >= savesub)
+                                        continue;
                                 savesub = sub;
-                                spdif_priv->txclk_div[index] = div;
+                                spdif_priv->txclk_df[index] = txclk_df;
+                                spdif_priv->sysclk_df[index] = sysclk_df;
+                                spdif_priv->txrate[index] = arate;
                         }
                 }
         }
 
+out:
         return savesub;
 }
 
@@ -1058,7 +1123,8 @@ static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv,
                 if (!clk_get_rate(clk))
                         continue;
 
-                ret = fsl_spdif_txclk_caldiv(spdif_priv, clk, savesub, index);
+                ret = fsl_spdif_txclk_caldiv(spdif_priv, clk, savesub, index,
+                                             i == STC_TXCLK_SPDIF_ROOT);
                 if (savesub == ret)
                         continue;
 
@@ -1073,8 +1139,13 @@ static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv,
 
         dev_dbg(&pdev->dev, "use rxtx%d as tx clock source for %dHz sample rate\n",
                         spdif_priv->txclk_src[index], rate[index]);
-        dev_dbg(&pdev->dev, "use divisor %d for %dHz sample rate\n",
-                        spdif_priv->txclk_div[index], rate[index]);
+        dev_dbg(&pdev->dev, "use txclk df %d for %dHz sample rate\n",
+                        spdif_priv->txclk_df[index], rate[index]);
+        if (spdif_priv->txclk[index] == spdif_priv->sysclk)
+                dev_dbg(&pdev->dev, "use sysclk df %d for %dHz sample rate\n",
+                                spdif_priv->sysclk_df[index], rate[index]);
+        dev_dbg(&pdev->dev, "the best rate for %dHz sample rate is %dHz\n",
+                        rate[index], spdif_priv->txrate[index]);
 
         return 0;
 }
@@ -1134,6 +1205,20 @@ static int fsl_spdif_probe(struct platform_device *pdev)
                 return ret;
         }
 
+        /* Get system clock for rx clock rate calculation */
+        spdif_priv->sysclk = devm_clk_get(&pdev->dev, "rxtx5");
+        if (IS_ERR(spdif_priv->sysclk)) {
+                dev_err(&pdev->dev, "no sys clock (rxtx5) in devicetree\n");
+                return PTR_ERR(spdif_priv->sysclk);
+        }
+
+        /* Get core clock for data register access via DMA */
+        spdif_priv->coreclk = devm_clk_get(&pdev->dev, "core");
+        if (IS_ERR(spdif_priv->coreclk)) {
+                dev_err(&pdev->dev, "no core clock in devicetree\n");
+                return PTR_ERR(spdif_priv->coreclk);
+        }
+
         /* Select clock source for rx/tx clock */
         spdif_priv->rxclk = devm_clk_get(&pdev->dev, "rxtx1");
         if (IS_ERR(spdif_priv->rxclk)) {
@@ -1186,6 +1271,7 @@ static int fsl_spdif_probe(struct platform_device *pdev)
 
 static const struct of_device_id fsl_spdif_dt_ids[] = {
         { .compatible = "fsl,imx35-spdif", },
+        { .compatible = "fsl,vf610-spdif", },
         {}
 };
 MODULE_DEVICE_TABLE(of, fsl_spdif_dt_ids);
diff --git a/sound/soc/fsl/fsl_spdif.h b/sound/soc/fsl/fsl_spdif.h
index 605a10b2112b..16fde4b927d3 100644
--- a/sound/soc/fsl/fsl_spdif.h
+++ b/sound/soc/fsl/fsl_spdif.h
@@ -143,20 +143,22 @@ enum spdif_gainsel {
 #define INT_RXFIFO_FUL                  (1 << 0)
 
 /* SPDIF Clock register */
-#define STC_SYSCLK_DIV_OFFSET           11
-#define STC_SYSCLK_DIV_MASK             (0x1ff << STC_SYSCLK_DIV_OFFSET)
-#define STC_SYSCLK_DIV(x)               ((((x) - 1) << STC_SYSCLK_DIV_OFFSET) & STC_SYSCLK_DIV_MASK)
+#define STC_SYSCLK_DF_OFFSET            11
+#define STC_SYSCLK_DF_MASK              (0x1ff << STC_SYSCLK_DF_OFFSET)
+#define STC_SYSCLK_DF(x)                ((((x) - 1) << STC_SYSCLK_DF_OFFSET) & STC_SYSCLK_DF_MASK)
 #define STC_TXCLK_SRC_OFFSET            8
 #define STC_TXCLK_SRC_MASK              (0x7 << STC_TXCLK_SRC_OFFSET)
 #define STC_TXCLK_SRC_SET(x)            ((x << STC_TXCLK_SRC_OFFSET) & STC_TXCLK_SRC_MASK)
 #define STC_TXCLK_ALL_EN_OFFSET         7
 #define STC_TXCLK_ALL_EN_MASK           (1 << STC_TXCLK_ALL_EN_OFFSET)
 #define STC_TXCLK_ALL_EN                (1 << STC_TXCLK_ALL_EN_OFFSET)
-#define STC_TXCLK_DIV_OFFSET            0
-#define STC_TXCLK_DIV_MASK              (0x7ff << STC_TXCLK_DIV_OFFSET)
-#define STC_TXCLK_DIV(x)                ((((x) - 1) << STC_TXCLK_DIV_OFFSET) & STC_TXCLK_DIV_MASK)
+#define STC_TXCLK_DF_OFFSET             0
+#define STC_TXCLK_DF_MASK               (0x7ff << STC_TXCLK_DF_OFFSET)
+#define STC_TXCLK_DF(x)         ((((x) - 1) << STC_TXCLK_DF_OFFSET) & STC_TXCLK_DF_MASK)
 #define STC_TXCLK_SRC_MAX               8
 
+#define STC_TXCLK_SPDIF_ROOT            1
+
 /* SPDIF tx rate */
 enum spdif_txrate {
         SPDIF_TXRATE_32000 = 0,
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 5428a1fda260..f233d915b7e4 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -35,11 +35,11 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
-#include <linux/debugfs.h>
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
@@ -113,8 +113,6 @@ static inline void write_ssi_mask(u32 __iomem *addr, u32 clear, u32 set)
 #define FSLSSI_SIER_DBG_TX_FLAGS (CCSR_SSI_SIER_TFE0_EN | \
                 CCSR_SSI_SIER_TLS_EN | CCSR_SSI_SIER_TFS_EN | \
                 CCSR_SSI_SIER_TUE0_EN | CCSR_SSI_SIER_TFRC_EN)
-#define FSLSSI_SISR_MASK (FSLSSI_SIER_DBG_RX_FLAGS | FSLSSI_SIER_DBG_TX_FLAGS)
-
 
 enum fsl_ssi_type {
         FSL_SSI_MCP8610,
@@ -146,7 +144,6 @@ struct fsl_ssi_rxtx_reg_val {
  * @cpu_dai: the CPU DAI for this device
  * @dev_attr: the sysfs device attribute structure
  * @stats: SSI statistics
- * @name: name for this device
  */
 struct fsl_ssi_private {
         struct ccsr_ssi __iomem *ssi;
@@ -155,15 +152,11 @@ struct fsl_ssi_private {
         unsigned int fifo_depth;
         struct snd_soc_dai_driver cpu_dai_drv;
         struct platform_device *pdev;
+        unsigned int dai_fmt;
 
         enum fsl_ssi_type hw_type;
-        bool new_binding;
-        bool ssi_on_imx;
-        bool imx_ac97;
         bool use_dma;
         bool baudclk_locked;
-        bool irq_stats;
-        bool offline_config;
         bool use_dual_fifo;
         u8 i2s_mode;
         spinlock_t baudclk_lock;
@@ -171,39 +164,11 @@ struct fsl_ssi_private {
         struct clk *clk;
         struct snd_dmaengine_dai_dma_data dma_params_tx;
         struct snd_dmaengine_dai_dma_data dma_params_rx;
-        struct imx_dma_data filter_data_tx;
-        struct imx_dma_data filter_data_rx;
         struct imx_pcm_fiq_params fiq_params;
         /* Register values for rx/tx configuration */
         struct fsl_ssi_rxtx_reg_val rxtx_reg_val;
 
-        struct {
-                unsigned int rfrc;
-                unsigned int tfrc;
-                unsigned int cmdau;
-                unsigned int cmddu;
-                unsigned int rxt;
-                unsigned int rdr1;
-                unsigned int rdr0;
-                unsigned int tde1;
-                unsigned int tde0;
-                unsigned int roe1;
-                unsigned int roe0;
-                unsigned int tue1;
-                unsigned int tue0;
-                unsigned int tfs;
-                unsigned int rfs;
-                unsigned int tls;
-                unsigned int rls;
-                unsigned int rff1;
-                unsigned int rff0;
-                unsigned int tfe1;
-                unsigned int tfe0;
-        } stats;
-        struct dentry *dbg_dir;
-        struct dentry *dbg_stats;
-
-        char name[1];
+        struct fsl_ssi_dbg dbg_stats;
 };
 
 static const struct of_device_id fsl_ssi_ids[] = {
@@ -215,6 +180,54 @@ static const struct of_device_id fsl_ssi_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, fsl_ssi_ids);
 
+static bool fsl_ssi_is_ac97(struct fsl_ssi_private *ssi_private)
+{
+        return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97);
+}
+
+static bool fsl_ssi_on_imx(struct fsl_ssi_private *ssi_private)
+{
+        switch (ssi_private->hw_type) {
+        case FSL_SSI_MX21:
+        case FSL_SSI_MX35:
+        case FSL_SSI_MX51:
+                return true;
+        case FSL_SSI_MCP8610:
+                return false;
+        }
+
+        return false;
+}
+
+/*
+ * imx51 and later SoCs have a slightly different IP that allows the
+ * SSI configuration while the SSI unit is running.
+ *
+ * More important, it is necessary on those SoCs to configure the
+ * sperate TX/RX DMA bits just before starting the stream
+ * (fsl_ssi_trigger). The SDMA unit has to be configured before fsl_ssi
+ * sends any DMA requests to the SDMA unit, otherwise it is not defined
+ * how the SDMA unit handles the DMA request.
+ *
+ * SDMA units are present on devices starting at imx35 but the imx35
+ * reference manual states that the DMA bits should not be changed
+ * while the SSI unit is running (SSIEN). So we support the necessary
+ * online configuration of fsl-ssi starting at imx51.
+ */
+static bool fsl_ssi_offline_config(struct fsl_ssi_private *ssi_private)
+{
+        switch (ssi_private->hw_type) {
+        case FSL_SSI_MCP8610:
+        case FSL_SSI_MX21:
+        case FSL_SSI_MX35:
+                return true;
+        case FSL_SSI_MX51:
+                return false;
+        }
+
+        return true;
+}
+
 /**
  * fsl_ssi_isr: SSI interrupt handler
  *
@@ -231,7 +244,6 @@ static irqreturn_t fsl_ssi_isr(int irq, void *dev_id)
 {
         struct fsl_ssi_private *ssi_private = dev_id;
         struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
-        irqreturn_t ret = IRQ_NONE;
         __be32 sisr;
         __be32 sisr2;
         __be32 sisr_write_mask = 0;
@@ -258,217 +270,18 @@ static irqreturn_t fsl_ssi_isr(int irq, void *dev_id)
            were interrupted for.  We mask it with the Interrupt Enable register
            so that we only check for events that we're interested in.
          */
-        sisr = read_ssi(&ssi->sisr) & FSLSSI_SISR_MASK;
-
-        if (sisr & CCSR_SSI_SISR_RFRC) {
-                ssi_private->stats.rfrc++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_TFRC) {
-                ssi_private->stats.tfrc++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_CMDAU) {
-                ssi_private->stats.cmdau++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_CMDDU) {
-                ssi_private->stats.cmddu++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_RXT) {
-                ssi_private->stats.rxt++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_RDR1) {
-                ssi_private->stats.rdr1++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_RDR0) {
-                ssi_private->stats.rdr0++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_TDE1) {
-                ssi_private->stats.tde1++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_TDE0) {
-                ssi_private->stats.tde0++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_ROE1) {
-                ssi_private->stats.roe1++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_ROE0) {
-                ssi_private->stats.roe0++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_TUE1) {
-                ssi_private->stats.tue1++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_TUE0) {
-                ssi_private->stats.tue0++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_TFS) {
-                ssi_private->stats.tfs++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_RFS) {
-                ssi_private->stats.rfs++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_TLS) {
-                ssi_private->stats.tls++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_RLS) {
-                ssi_private->stats.rls++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_RFF1) {
-                ssi_private->stats.rff1++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_RFF0) {
-                ssi_private->stats.rff0++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_TFE1) {
-                ssi_private->stats.tfe1++;
-                ret = IRQ_HANDLED;
-        }
-
-        if (sisr & CCSR_SSI_SISR_TFE0) {
-                ssi_private->stats.tfe0++;
-                ret = IRQ_HANDLED;
-        }
+        sisr = read_ssi(&ssi->sisr);
 
         sisr2 = sisr & sisr_write_mask;
         /* Clear the bits that we set */
         if (sisr2)
                 write_ssi(sisr2, &ssi->sisr);
 
-        return ret;
-}
-
-#if IS_ENABLED(CONFIG_DEBUG_FS)
-/* Show the statistics of a flag only if its interrupt is enabled.  The
- * compiler will optimze this code to a no-op if the interrupt is not
- * enabled.
- */
-#define SIER_SHOW(flag, name) \
-        do { \
-                if (FSLSSI_SISR_MASK & CCSR_SSI_SIER_##flag) \
-                        seq_printf(s, #name "=%u\n", ssi_private->stats.name); \
-        } while (0)
-
-
-/**
- * fsl_sysfs_ssi_show: display SSI statistics
- *
- * Display the statistics for the current SSI device.  To avoid confusion,
- * we only show those counts that are enabled.
- */
-static int fsl_ssi_stats_show(struct seq_file *s, void *unused)
-{
-        struct fsl_ssi_private *ssi_private = s->private;
-
-        SIER_SHOW(RFRC_EN, rfrc);
-        SIER_SHOW(TFRC_EN, tfrc);
-        SIER_SHOW(CMDAU_EN, cmdau);
-        SIER_SHOW(CMDDU_EN, cmddu);
-        SIER_SHOW(RXT_EN, rxt);
-        SIER_SHOW(RDR1_EN, rdr1);
-        SIER_SHOW(RDR0_EN, rdr0);
-        SIER_SHOW(TDE1_EN, tde1);
-        SIER_SHOW(TDE0_EN, tde0);
-        SIER_SHOW(ROE1_EN, roe1);
-        SIER_SHOW(ROE0_EN, roe0);
-        SIER_SHOW(TUE1_EN, tue1);
-        SIER_SHOW(TUE0_EN, tue0);
-        SIER_SHOW(TFS_EN, tfs);
-        SIER_SHOW(RFS_EN, rfs);
-        SIER_SHOW(TLS_EN, tls);
-        SIER_SHOW(RLS_EN, rls);
-        SIER_SHOW(RFF1_EN, rff1);
-        SIER_SHOW(RFF0_EN, rff0);
-        SIER_SHOW(TFE1_EN, tfe1);
-        SIER_SHOW(TFE0_EN, tfe0);
+        fsl_ssi_dbg_isr(&ssi_private->dbg_stats, sisr);
 
-        return 0;
+        return IRQ_HANDLED;
 }
 
-static int fsl_ssi_stats_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, fsl_ssi_stats_show, inode->i_private);
-}
-
-static const struct file_operations fsl_ssi_stats_ops = {
-        .open = fsl_ssi_stats_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static int fsl_ssi_debugfs_create(struct fsl_ssi_private *ssi_private,
-                struct device *dev)
-{
-        ssi_private->dbg_dir = debugfs_create_dir(dev_name(dev), NULL);
-        if (!ssi_private->dbg_dir)
-                return -ENOMEM;
-
-        ssi_private->dbg_stats = debugfs_create_file("stats", S_IRUGO,
-                        ssi_private->dbg_dir, ssi_private, &fsl_ssi_stats_ops);
-        if (!ssi_private->dbg_stats) {
-                debugfs_remove(ssi_private->dbg_dir);
-                return -ENOMEM;
-        }
-
-        return 0;
-}
-
-static void fsl_ssi_debugfs_remove(struct fsl_ssi_private *ssi_private)
-{
-        debugfs_remove(ssi_private->dbg_stats);
-        debugfs_remove(ssi_private->dbg_dir);
-}
-
-#else
-
-static int fsl_ssi_debugfs_create(struct fsl_ssi_private *ssi_private,
-                struct device *dev)
-{
-        return 0;
-}
-
-static void fsl_ssi_debugfs_remove(struct fsl_ssi_private *ssi_private)
-{
-}
-
-#endif /* IS_ENABLED(CONFIG_DEBUG_FS) */
-
 /*
  * Enable/Disable all rx/tx config flags at once.
  */
@@ -490,6 +303,26 @@ static void fsl_ssi_rxtx_config(struct fsl_ssi_private *ssi_private,
 }
 
 /*
+ * Calculate the bits that have to be disabled for the current stream that is
+ * getting disabled. This keeps the bits enabled that are necessary for the
+ * second stream to work if 'stream_active' is true.
+ *
+ * Detailed calculation:
+ * These are the values that need to be active after disabling. For non-active
+ * second stream, this is 0:
+ *      vals_stream * !!stream_active
+ *
+ * The following computes the overall differences between the setup for the
+ * to-disable stream and the active stream, a simple XOR:
+ *      vals_disable ^ (vals_stream * !!(stream_active))
+ *
+ * The full expression adds a mask on all values we care about
+ */
+#define fsl_ssi_disable_val(vals_disable, vals_stream, stream_active) \
+        ((vals_disable) & \
+         ((vals_disable) ^ ((vals_stream) * (u32)!!(stream_active))))
+
+/*
  * Enable/Disable a ssi configuration. You have to pass either
  * ssi_private->rxtx_reg_val.rx or tx as vals parameter.
  */
@@ -501,6 +334,12 @@ static void fsl_ssi_config(struct fsl_ssi_private *ssi_private, bool enable,
         u32 scr_val = read_ssi(&ssi->scr);
         int nr_active_streams = !!(scr_val & CCSR_SSI_SCR_TE) +
                                 !!(scr_val & CCSR_SSI_SCR_RE);
+        int keep_active;
+
+        if (nr_active_streams - 1 > 0)
+                keep_active = 1;
+        else
+                keep_active = 0;
 
         /* Find the other direction values rx or tx which we do not want to
          * modify */
@@ -511,7 +350,8 @@ static void fsl_ssi_config(struct fsl_ssi_private *ssi_private, bool enable,
 
         /* If vals should be disabled, start with disabling the unit */
         if (!enable) {
-                u32 scr = vals->scr & (vals->scr ^ avals->scr);
+                u32 scr = fsl_ssi_disable_val(vals->scr, avals->scr,
+                                keep_active);
                 write_ssi_mask(&ssi->scr, scr, 0);
         }
 
@@ -520,9 +360,9 @@ static void fsl_ssi_config(struct fsl_ssi_private *ssi_private, bool enable,
          * reconfiguration, so we have to enable all necessary flags at once
          * even if we do not use them later (capture and playback configuration)
          */
-        if (ssi_private->offline_config) {
+        if (fsl_ssi_offline_config(ssi_private)) {
                 if ((enable && !nr_active_streams) ||
-                                (!enable && nr_active_streams == 1))
+                                (!enable && !keep_active))
                         fsl_ssi_rxtx_config(ssi_private, enable);
 
                 goto config_done;
@@ -551,9 +391,12 @@ static void fsl_ssi_config(struct fsl_ssi_private *ssi_private, bool enable,
                  */
 
                 /* These assignments are simply vals without bits set in avals*/
-                sier = vals->sier & (vals->sier ^ avals->sier);
-                srcr = vals->srcr & (vals->srcr ^ avals->srcr);
-                stcr = vals->stcr & (vals->stcr ^ avals->stcr);
+                sier = fsl_ssi_disable_val(vals->sier, avals->sier,
+                                keep_active);
+                srcr = fsl_ssi_disable_val(vals->srcr, avals->srcr,
+                                keep_active);
+                stcr = fsl_ssi_disable_val(vals->stcr, avals->stcr,
+                                keep_active);
 
                 write_ssi_mask(&ssi->srcr, srcr, 0);
                 write_ssi_mask(&ssi->stcr, stcr, 0);
@@ -593,7 +436,7 @@ static void fsl_ssi_setup_reg_vals(struct fsl_ssi_private *ssi_private)
         reg->tx.stcr = CCSR_SSI_STCR_TFEN0;
         reg->tx.scr = 0;
 
-        if (!ssi_private->imx_ac97) {
+        if (!fsl_ssi_is_ac97(ssi_private)) {
                 reg->rx.scr = CCSR_SSI_SCR_SSIEN | CCSR_SSI_SCR_RE;
                 reg->rx.sier |= CCSR_SSI_SIER_RFF0_EN;
                 reg->tx.scr = CCSR_SSI_SCR_SSIEN | CCSR_SSI_SCR_TE;
@@ -642,96 +485,6 @@ static void fsl_ssi_setup_ac97(struct fsl_ssi_private *ssi_private)
         write_ssi(CCSR_SSI_SOR_WAIT(3), &ssi->sor);
 }
 
-static int fsl_ssi_setup(struct fsl_ssi_private *ssi_private)
-{
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
-        u8 wm;
-        int synchronous = ssi_private->cpu_dai_drv.symmetric_rates;
-
-        fsl_ssi_setup_reg_vals(ssi_private);
-
-        if (ssi_private->imx_ac97)
-                ssi_private->i2s_mode = CCSR_SSI_SCR_I2S_MODE_NORMAL | CCSR_SSI_SCR_NET;
-        else
-                ssi_private->i2s_mode = CCSR_SSI_SCR_I2S_MODE_SLAVE;
-
-        /*
-         * Section 16.5 of the MPC8610 reference manual says that the SSI needs
-         * to be disabled before updating the registers we set here.
-         */
-        write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_SSIEN, 0);
-
-        /*
-         * Program the SSI into I2S Slave Non-Network Synchronous mode. Also
-         * enable the transmit and receive FIFO.
-         *
-         * FIXME: Little-endian samples require a different shift dir
-         */
-        write_ssi_mask(&ssi->scr,
-                CCSR_SSI_SCR_I2S_MODE_MASK | CCSR_SSI_SCR_SYN,
-                CCSR_SSI_SCR_TFR_CLK_DIS |
-                ssi_private->i2s_mode |
-                (synchronous ? CCSR_SSI_SCR_SYN : 0));
-
-        write_ssi(CCSR_SSI_STCR_TXBIT0 | CCSR_SSI_STCR_TFSI |
-                        CCSR_SSI_STCR_TEFS | CCSR_SSI_STCR_TSCKP, &ssi->stcr);
-
-        write_ssi(CCSR_SSI_SRCR_RXBIT0 | CCSR_SSI_SRCR_RFSI |
-                        CCSR_SSI_SRCR_REFS | CCSR_SSI_SRCR_RSCKP, &ssi->srcr);
-
-        /*
-         * The DC and PM bits are only used if the SSI is the clock master.
-         */
-
-        /*
-         * Set the watermark for transmit FIFI 0 and receive FIFO 0. We don't
-         * use FIFO 1. We program the transmit water to signal a DMA transfer
-         * if there are only two (or fewer) elements left in the FIFO. Two
-         * elements equals one frame (left channel, right channel). This value,
-         * however, depends on the depth of the transmit buffer.
-         *
-         * We set the watermark on the same level as the DMA burstsize.  For
-         * fiq it is probably better to use the biggest possible watermark
-         * size.
-         */
-        if (ssi_private->use_dma)
-                wm = ssi_private->fifo_depth - 2;
-        else
-                wm = ssi_private->fifo_depth;
-
-        write_ssi(CCSR_SSI_SFCSR_TFWM0(wm) | CCSR_SSI_SFCSR_RFWM0(wm) |
-                CCSR_SSI_SFCSR_TFWM1(wm) | CCSR_SSI_SFCSR_RFWM1(wm),
-                &ssi->sfcsr);
-
-        /*
-         * For ac97 interrupts are enabled with the startup of the substream
-         * because it is also running without an active substream. Normally SSI
-         * is only enabled when there is a substream.
-         */
-        if (ssi_private->imx_ac97)
-                fsl_ssi_setup_ac97(ssi_private);
-
-        /*
-         * Set a default slot number so that there is no need for those common
-         * cases like I2S mode to call the extra set_tdm_slot() any more.
-         */
-        if (!ssi_private->imx_ac97) {
-                write_ssi_mask(&ssi->stccr, CCSR_SSI_SxCCR_DC_MASK,
-                                CCSR_SSI_SxCCR_DC(2));
-                write_ssi_mask(&ssi->srccr, CCSR_SSI_SxCCR_DC_MASK,
-                                CCSR_SSI_SxCCR_DC(2));
-        }
-
-        if (ssi_private->use_dual_fifo) {
-                write_ssi_mask(&ssi->srcr, 0, CCSR_SSI_SRCR_RFEN1);
-                write_ssi_mask(&ssi->stcr, 0, CCSR_SSI_STCR_TFEN1);
-                write_ssi_mask(&ssi->scr, 0, CCSR_SSI_SCR_TCH_EN);
-        }
-
-        return 0;
-}
-
-
 /**
  * fsl_ssi_startup: create a new substream
  *
@@ -748,12 +501,7 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
                 snd_soc_dai_get_drvdata(rtd->cpu_dai);
         unsigned long flags;
 
-        /* First, we only do fsl_ssi_setup() when SSI is going to be active.
-         * Second, fsl_ssi_setup was already called by ac97_init earlier if
-         * the driver is in ac97 mode.
-         */
-        if (!dai->active && !ssi_private->imx_ac97) {
-                fsl_ssi_setup(ssi_private);
+        if (!dai->active && !fsl_ssi_is_ac97(ssi_private)) {
                 spin_lock_irqsave(&ssi_private->baudclk_lock, flags);
                 ssi_private->baudclk_locked = false;
                 spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags);
@@ -772,6 +520,102 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream,
 }
 
 /**
+ * fsl_ssi_set_dai_sysclk - configure Digital Audio Interface bit clock
+ *
+ * Note: This function can be only called when using SSI as DAI master
+ *
+ * Quick instruction for parameters:
+ * freq: Output BCLK frequency = samplerate * 32 (fixed) * channels
+ * dir: SND_SOC_CLOCK_OUT -> TxBCLK, SND_SOC_CLOCK_IN -> RxBCLK.
+ */
+static int fsl_ssi_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
+                                  int clk_id, unsigned int freq, int dir)
+{
+        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
+        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
+        int synchronous = ssi_private->cpu_dai_drv.symmetric_rates, ret;
+        u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i;
+        unsigned long flags, clkrate, baudrate, tmprate;
+        u64 sub, savesub = 100000;
+
+        /* Don't apply it to any non-baudclk circumstance */
+        if (IS_ERR(ssi_private->baudclk))
+                return -EINVAL;
+
+        /* It should be already enough to divide clock by setting pm alone */
+        psr = 0;
+        div2 = 0;
+
+        factor = (div2 + 1) * (7 * psr + 1) * 2;
+
+        for (i = 0; i < 255; i++) {
+                /* The bclk rate must be smaller than 1/5 sysclk rate */
+                if (factor * (i + 1) < 5)
+                        continue;
+
+                tmprate = freq * factor * (i + 2);
+                clkrate = clk_round_rate(ssi_private->baudclk, tmprate);
+
+                do_div(clkrate, factor);
+                afreq = (u32)clkrate / (i + 1);
+
+                if (freq == afreq)
+                        sub = 0;
+                else if (freq / afreq == 1)
+                        sub = freq - afreq;
+                else if (afreq / freq == 1)
+                        sub = afreq - freq;
+                else
+                        continue;
+
+                /* Calculate the fraction */
+                sub *= 100000;
+                do_div(sub, freq);
+
+                if (sub < savesub) {
+                        baudrate = tmprate;
+                        savesub = sub;
+                        pm = i;
+                }
+
+                /* We are lucky */
+                if (savesub == 0)
+                        break;
+        }
+
+        /* No proper pm found if it is still remaining the initial value */
+        if (pm == 999) {
+                dev_err(cpu_dai->dev, "failed to handle the required sysclk\n");
+                return -EINVAL;
+        }
+
+        stccr = CCSR_SSI_SxCCR_PM(pm + 1) | (div2 ? CCSR_SSI_SxCCR_DIV2 : 0) |
+                (psr ? CCSR_SSI_SxCCR_PSR : 0);
+        mask = CCSR_SSI_SxCCR_PM_MASK | CCSR_SSI_SxCCR_DIV2 |
+                CCSR_SSI_SxCCR_PSR;
+
+        if (dir == SND_SOC_CLOCK_OUT || synchronous)
+                write_ssi_mask(&ssi->stccr, mask, stccr);
+        else
+                write_ssi_mask(&ssi->srccr, mask, stccr);
+
+        spin_lock_irqsave(&ssi_private->baudclk_lock, flags);
+        if (!ssi_private->baudclk_locked) {
+                ret = clk_set_rate(ssi_private->baudclk, baudrate);
+                if (ret) {
+                        spin_unlock_irqrestore(&ssi_private->baudclk_lock,
+                                        flags);
+                        dev_err(cpu_dai->dev, "failed to set baudclk rate\n");
+                        return -EINVAL;
+                }
+                ssi_private->baudclk_locked = true;
+        }
+        spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags);
+
+        return 0;
+}
+
+/**
  * fsl_ssi_hw_params - program the sample size
  *
  * Most of the SSI registers have been programmed in the startup function,
@@ -819,7 +663,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
         else
                 write_ssi_mask(&ssi->srccr, CCSR_SSI_SxCCR_WL_MASK, wl);
 
-        if (!ssi_private->imx_ac97)
+        if (!fsl_ssi_is_ac97(ssi_private))
                 write_ssi_mask(&ssi->scr,
                                 CCSR_SSI_SCR_NET | CCSR_SSI_SCR_I2S_MODE_MASK,
                                 channels == 1 ? 0 : ssi_private->i2s_mode);
@@ -835,9 +679,14 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
         struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
         struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
         u32 strcr = 0, stcr, srcr, scr, mask;
+        u8 wm;
+
+        ssi_private->dai_fmt = fmt;
+
+        fsl_ssi_setup_reg_vals(ssi_private);
 
         scr = read_ssi(&ssi->scr) & ~(CCSR_SSI_SCR_SYN | CCSR_SSI_SCR_I2S_MODE_MASK);
-        scr |= CCSR_SSI_SCR_NET;
+        scr |= CCSR_SSI_SCR_SYNC_TX_FS;
 
         mask = CCSR_SSI_STCR_TXBIT0 | CCSR_SSI_STCR_TFDIR | CCSR_SSI_STCR_TXDIR |
                 CCSR_SSI_STCR_TSCKP | CCSR_SSI_STCR_TFSI | CCSR_SSI_STCR_TFSL |
@@ -845,19 +694,19 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
         stcr = read_ssi(&ssi->stcr) & ~mask;
         srcr = read_ssi(&ssi->srcr) & ~mask;
 
+        ssi_private->i2s_mode = CCSR_SSI_SCR_NET;
         switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
         case SND_SOC_DAIFMT_I2S:
                 switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
                 case SND_SOC_DAIFMT_CBS_CFS:
-                        ssi_private->i2s_mode = CCSR_SSI_SCR_I2S_MODE_MASTER;
+                        ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_MASTER;
                         break;
                 case SND_SOC_DAIFMT_CBM_CFM:
-                        ssi_private->i2s_mode = CCSR_SSI_SCR_I2S_MODE_SLAVE;
+                        ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_SLAVE;
                         break;
                 default:
                         return -EINVAL;
                 }
-                scr |= ssi_private->i2s_mode;
 
                 /* Data on rising edge of bclk, frame low, 1clk before data */
                 strcr |= CCSR_SSI_STCR_TFSI | CCSR_SSI_STCR_TSCKP |
@@ -877,9 +726,13 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
                 strcr |= CCSR_SSI_STCR_TFSL | CCSR_SSI_STCR_TSCKP |
                         CCSR_SSI_STCR_TXBIT0;
                 break;
+        case SND_SOC_DAIFMT_AC97:
+                ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_NORMAL;
+                break;
         default:
                 return -EINVAL;
         }
+        scr |= ssi_private->i2s_mode;
 
         /* DAI clock inversion */
         switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
@@ -929,99 +782,37 @@ static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
         write_ssi(srcr, &ssi->srcr);
         write_ssi(scr, &ssi->scr);
 
-        return 0;
-}
-
-/**
- * fsl_ssi_set_dai_sysclk - configure Digital Audio Interface bit clock
- *
- * Note: This function can be only called when using SSI as DAI master
- *
- * Quick instruction for parameters:
- * freq: Output BCLK frequency = samplerate * 32 (fixed) * channels
- * dir: SND_SOC_CLOCK_OUT -> TxBCLK, SND_SOC_CLOCK_IN -> RxBCLK.
- */
-static int fsl_ssi_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
-                                  int clk_id, unsigned int freq, int dir)
-{
-        struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);
-        struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
-        int synchronous = ssi_private->cpu_dai_drv.symmetric_rates, ret;
-        u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i;
-        unsigned long flags, clkrate, baudrate, tmprate;
-        u64 sub, savesub = 100000;
-
-        /* Don't apply it to any non-baudclk circumstance */
-        if (IS_ERR(ssi_private->baudclk))
-                return -EINVAL;
-
-        /* It should be already enough to divide clock by setting pm alone */
-        psr = 0;
-        div2 = 0;
-
-        factor = (div2 + 1) * (7 * psr + 1) * 2;
-
-        for (i = 0; i < 255; i++) {
-                /* The bclk rate must be smaller than 1/5 sysclk rate */
-                if (factor * (i + 1) < 5)
-                        continue;
-
-                tmprate = freq * factor * (i + 2);
-                clkrate = clk_round_rate(ssi_private->baudclk, tmprate);
-
-                do_div(clkrate, factor);
-                afreq = (u32)clkrate / (i + 1);
-
-                if (freq == afreq)
-                        sub = 0;
-                else if (freq / afreq == 1)
-                        sub = freq - afreq;
-                else if (afreq / freq == 1)
-                        sub = afreq - freq;
-                else
-                        continue;
-
-                /* Calculate the fraction */
-                sub *= 100000;
-                do_div(sub, freq);
-
-                if (sub < savesub) {
-                        baudrate = tmprate;
-                        savesub = sub;
-                        pm = i;
-                }
+        /*
+         * Set the watermark for transmit FIFI 0 and receive FIFO 0. We don't
+         * use FIFO 1. We program the transmit water to signal a DMA transfer
+         * if there are only two (or fewer) elements left in the FIFO. Two
+         * elements equals one frame (left channel, right channel). This value,
+         * however, depends on the depth of the transmit buffer.
+         *
+         * We set the watermark on the same level as the DMA burstsize.  For
+         * fiq it is probably better to use the biggest possible watermark
+         * size.
+         */
+        if (ssi_private->use_dma)
+                wm = ssi_private->fifo_depth - 2;
+        else
+                wm = ssi_private->fifo_depth;
 
-                /* We are lucky */
-                if (savesub == 0)
-                        break;
-        }
+        write_ssi(CCSR_SSI_SFCSR_TFWM0(wm) | CCSR_SSI_SFCSR_RFWM0(wm) |
+                        CCSR_SSI_SFCSR_TFWM1(wm) | CCSR_SSI_SFCSR_RFWM1(wm),
+                        &ssi->sfcsr);
 
-        /* No proper pm found if it is still remaining the initial value */
-        if (pm == 999) {
-                dev_err(cpu_dai->dev, "failed to handle the required sysclk\n");
-                return -EINVAL;
+        if (ssi_private->use_dual_fifo) {
+                write_ssi_mask(&ssi->srcr, CCSR_SSI_SRCR_RFEN1,
+                                CCSR_SSI_SRCR_RFEN1);
+                write_ssi_mask(&ssi->stcr, CCSR_SSI_STCR_TFEN1,
+                                CCSR_SSI_STCR_TFEN1);
+                write_ssi_mask(&ssi->scr, CCSR_SSI_SCR_TCH_EN,
+                                CCSR_SSI_SCR_TCH_EN);
         }
 
-        stccr = CCSR_SSI_SxCCR_PM(pm + 1) | (div2 ? CCSR_SSI_SxCCR_DIV2 : 0) |
-                (psr ? CCSR_SSI_SxCCR_PSR : 0);
-        mask = CCSR_SSI_SxCCR_PM_MASK | CCSR_SSI_SxCCR_DIV2 | CCSR_SSI_SxCCR_PSR;
-
-        if (dir == SND_SOC_CLOCK_OUT || synchronous)
-                write_ssi_mask(&ssi->stccr, mask, stccr);
-        else
-                write_ssi_mask(&ssi->srccr, mask, stccr);
-
-        spin_lock_irqsave(&ssi_private->baudclk_lock, flags);
-        if (!ssi_private->baudclk_locked) {
-                ret = clk_set_rate(ssi_private->baudclk, baudrate);
-                if (ret) {
-                        spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags);
-                        dev_err(cpu_dai->dev, "failed to set baudclk rate\n");
-                        return -EINVAL;
-                }
-                ssi_private->baudclk_locked = true;
-        }
-        spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags);
+        if (fmt & SND_SOC_DAIFMT_AC97)
+                fsl_ssi_setup_ac97(ssi_private);
 
         return 0;
 }
@@ -1097,7 +888,7 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
                 else
                         fsl_ssi_rx_config(ssi_private, false);
 
-                if (!ssi_private->imx_ac97 && (read_ssi(&ssi->scr) &
+                if (!fsl_ssi_is_ac97(ssi_private) && (read_ssi(&ssi->scr) &
                                         (CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE)) == 0) {
                         spin_lock_irqsave(&ssi_private->baudclk_lock, flags);
                         ssi_private->baudclk_locked = false;
@@ -1109,7 +900,7 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
                 return -EINVAL;
         }
 
-        if (ssi_private->imx_ac97) {
+        if (fsl_ssi_is_ac97(ssi_private)) {
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         write_ssi(CCSR_SSI_SOR_TX_CLR, &ssi->sor);
                 else
@@ -1123,7 +914,7 @@ static int fsl_ssi_dai_probe(struct snd_soc_dai *dai)
 {
         struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(dai);
 
-        if (ssi_private->ssi_on_imx && ssi_private->use_dma) {
+        if (fsl_ssi_on_imx(ssi_private) && ssi_private->use_dma) {
                 dai->playback_dma_data = &ssi_private->dma_params_tx;
                 dai->capture_dma_data = &ssi_private->dma_params_rx;
         }
@@ -1184,11 +975,6 @@ static struct snd_soc_dai_driver fsl_ssi_ac97_dai = {
 
 static struct fsl_ssi_private *fsl_ac97_data;
 
-static void fsl_ssi_ac97_init(void)
-{
-        fsl_ssi_setup(fsl_ac97_data);
-}
-
 static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
                 unsigned short val)
 {
@@ -1251,11 +1037,107 @@ static void make_lowercase(char *s)
         }
 }
 
+static int fsl_ssi_imx_probe(struct platform_device *pdev,
+                struct fsl_ssi_private *ssi_private, void __iomem *iomem)
+{
+        struct device_node *np = pdev->dev.of_node;
+        u32 dmas[4];
+        int ret;
+
+        ssi_private->clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(ssi_private->clk)) {
+                ret = PTR_ERR(ssi_private->clk);
+                dev_err(&pdev->dev, "could not get clock: %d\n", ret);
+                return ret;
+        }
+
+        ret = clk_prepare_enable(ssi_private->clk);
+        if (ret) {
+                dev_err(&pdev->dev, "clk_prepare_enable failed: %d\n", ret);
+                return ret;
+        }
+
+        /* For those SLAVE implementations, we ingore non-baudclk cases
+         * and, instead, abandon MASTER mode that needs baud clock.
+         */
+        ssi_private->baudclk = devm_clk_get(&pdev->dev, "baud");
+        if (IS_ERR(ssi_private->baudclk))
+                dev_dbg(&pdev->dev, "could not get baud clock: %ld\n",
+                         PTR_ERR(ssi_private->baudclk));
+        else
+                clk_prepare_enable(ssi_private->baudclk);
+
+        /*
+         * We have burstsize be "fifo_depth - 2" to match the SSI
+         * watermark setting in fsl_ssi_startup().
+         */
+        ssi_private->dma_params_tx.maxburst = ssi_private->fifo_depth - 2;
+        ssi_private->dma_params_rx.maxburst = ssi_private->fifo_depth - 2;
+        ssi_private->dma_params_tx.addr = ssi_private->ssi_phys +
+                        offsetof(struct ccsr_ssi, stx0);
+        ssi_private->dma_params_rx.addr = ssi_private->ssi_phys +
+                        offsetof(struct ccsr_ssi, srx0);
+
+        ret = !of_property_read_u32_array(np, "dmas", dmas, 4);
+        if (ssi_private->use_dma && !ret && dmas[2] == IMX_DMATYPE_SSI_DUAL) {
+                ssi_private->use_dual_fifo = true;
+                /* When using dual fifo mode, we need to keep watermark
+                 * as even numbers due to dma script limitation.
+                 */
+                ssi_private->dma_params_tx.maxburst &= ~0x1;
+                ssi_private->dma_params_rx.maxburst &= ~0x1;
+        }
+
+        if (!ssi_private->use_dma) {
+
+                /*
+                 * Some boards use an incompatible codec. To get it
+                 * working, we are using imx-fiq-pcm-audio, that
+                 * can handle those codecs. DMA is not possible in this
+                 * situation.
+                 */
+
+                ssi_private->fiq_params.irq = ssi_private->irq;
+                ssi_private->fiq_params.base = iomem;
+                ssi_private->fiq_params.dma_params_rx =
+                        &ssi_private->dma_params_rx;
+                ssi_private->fiq_params.dma_params_tx =
+                        &ssi_private->dma_params_tx;
+
+                ret = imx_pcm_fiq_init(pdev, &ssi_private->fiq_params);
+                if (ret)
+                        goto error_pcm;
+        } else {
+                ret = imx_pcm_dma_init(pdev);
+                if (ret)
+                        goto error_pcm;
+        }
+
+        return 0;
+
+error_pcm:
+        if (!IS_ERR(ssi_private->baudclk))
+                clk_disable_unprepare(ssi_private->baudclk);
+
+        clk_disable_unprepare(ssi_private->clk);
+
+        return ret;
+}
+
+static void fsl_ssi_imx_clean(struct platform_device *pdev,
+                struct fsl_ssi_private *ssi_private)
+{
+        if (!ssi_private->use_dma)
+                imx_pcm_fiq_exit(pdev);
+        if (!IS_ERR(ssi_private->baudclk))
+                clk_disable_unprepare(ssi_private->baudclk);
+        clk_disable_unprepare(ssi_private->clk);
+}
+
 static int fsl_ssi_probe(struct platform_device *pdev)
 {
         struct fsl_ssi_private *ssi_private;
         int ret = 0;
-        struct device_attribute *dev_attr = NULL;
         struct device_node *np = pdev->dev.of_node;
         const struct of_device_id *of_id;
         enum fsl_ssi_type hw_type;
@@ -1263,7 +1145,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         const uint32_t *iprop;
         struct resource res;
         char name[64];
-        bool shared;
         bool ac97 = false;
 
         /* SSIs that are not connected on the board should have a
@@ -1286,17 +1167,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         if (!strcmp(sprop, "ac97-slave"))
                 ac97 = true;
 
-        /* The DAI name is the last part of the full name of the node. */
-        p = strrchr(np->full_name, '/') + 1;
-        ssi_private = devm_kzalloc(&pdev->dev, sizeof(*ssi_private) + strlen(p),
-                              GFP_KERNEL);
+        ssi_private = devm_kzalloc(&pdev->dev, sizeof(*ssi_private),
+                        GFP_KERNEL);
         if (!ssi_private) {
                 dev_err(&pdev->dev, "could not allocate DAI object\n");
                 return -ENOMEM;
         }
 
-        strcpy(ssi_private->name, p);
-
         ssi_private->use_dma = !of_property_read_bool(np,
                         "fsl,fiq-stream-filter");
         ssi_private->hw_type = hw_type;
@@ -1306,7 +1183,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                                 sizeof(fsl_ssi_ac97_dai));
 
                 fsl_ac97_data = ssi_private;
-                ssi_private->imx_ac97 = true;
 
                 snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev);
         } else {
@@ -1314,7 +1190,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                 memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template,
                        sizeof(fsl_ssi_dai_template));
         }
-        ssi_private->cpu_dai_drv.name = ssi_private->name;
+        ssi_private->cpu_dai_drv.name = dev_name(&pdev->dev);
 
         /* Get the addresses and IRQ */
         ret = of_address_to_resource(np, 0, &res);
@@ -1353,177 +1229,43 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         ssi_private->baudclk_locked = false;
         spin_lock_init(&ssi_private->baudclk_lock);
 
-        /*
-         * imx51 and later SoCs have a slightly different IP that allows the
-         * SSI configuration while the SSI unit is running.
-         *
-         * More important, it is necessary on those SoCs to configure the
-         * sperate TX/RX DMA bits just before starting the stream
-         * (fsl_ssi_trigger). The SDMA unit has to be configured before fsl_ssi
-         * sends any DMA requests to the SDMA unit, otherwise it is not defined
-         * how the SDMA unit handles the DMA request.
-         *
-         * SDMA units are present on devices starting at imx35 but the imx35
-         * reference manual states that the DMA bits should not be changed
-         * while the SSI unit is running (SSIEN). So we support the necessary
-         * online configuration of fsl-ssi starting at imx51.
-         */
-        switch (hw_type) {
-        case FSL_SSI_MCP8610:
-        case FSL_SSI_MX21:
-        case FSL_SSI_MX35:
-                ssi_private->offline_config = true;
-                break;
-        case FSL_SSI_MX51:
-                ssi_private->offline_config = false;
-                break;
-        }
-
-        if (hw_type == FSL_SSI_MX21 || hw_type == FSL_SSI_MX51 ||
-                        hw_type == FSL_SSI_MX35) {
-                u32 dma_events[2], dmas[4];
-                ssi_private->ssi_on_imx = true;
+        dev_set_drvdata(&pdev->dev, ssi_private);
 
-                ssi_private->clk = devm_clk_get(&pdev->dev, NULL);
-                if (IS_ERR(ssi_private->clk)) {
-                        ret = PTR_ERR(ssi_private->clk);
-                        dev_err(&pdev->dev, "could not get clock: %d\n", ret);
-                        goto error_irqmap;
-                }
-                ret = clk_prepare_enable(ssi_private->clk);
-                if (ret) {
-                        dev_err(&pdev->dev, "clk_prepare_enable failed: %d\n",
-                                ret);
+        if (fsl_ssi_on_imx(ssi_private)) {
+                ret = fsl_ssi_imx_probe(pdev, ssi_private, ssi_private->ssi);
+                if (ret)
                         goto error_irqmap;
-                }
-
-                /* For those SLAVE implementations, we ingore non-baudclk cases
-                 * and, instead, abandon MASTER mode that needs baud clock.
-                 */
-                ssi_private->baudclk = devm_clk_get(&pdev->dev, "baud");
-                if (IS_ERR(ssi_private->baudclk))
-                        dev_dbg(&pdev->dev, "could not get baud clock: %ld\n",
-                                 PTR_ERR(ssi_private->baudclk));
-                else
-                        clk_prepare_enable(ssi_private->baudclk);
-
-                /*
-                 * We have burstsize be "fifo_depth - 2" to match the SSI
-                 * watermark setting in fsl_ssi_startup().
-                 */
-                ssi_private->dma_params_tx.maxburst =
-                        ssi_private->fifo_depth - 2;
-                ssi_private->dma_params_rx.maxburst =
-                        ssi_private->fifo_depth - 2;
-                ssi_private->dma_params_tx.addr =
-                        ssi_private->ssi_phys + offsetof(struct ccsr_ssi, stx0);
-                ssi_private->dma_params_rx.addr =
-                        ssi_private->ssi_phys + offsetof(struct ccsr_ssi, srx0);
-                ssi_private->dma_params_tx.filter_data =
-                        &ssi_private->filter_data_tx;
-                ssi_private->dma_params_rx.filter_data =
-                        &ssi_private->filter_data_rx;
-                if (!of_property_read_bool(pdev->dev.of_node, "dmas") &&
-                                ssi_private->use_dma) {
-                        /*
-                         * FIXME: This is a temporary solution until all
-                         * necessary dma drivers support the generic dma
-                         * bindings.
-                         */
-                        ret = of_property_read_u32_array(pdev->dev.of_node,
-                                        "fsl,ssi-dma-events", dma_events, 2);
-                        if (ret && ssi_private->use_dma) {
-                                dev_err(&pdev->dev, "could not get dma events but fsl-ssi is configured to use DMA\n");
-                                goto error_clk;
-                        }
-                }
-                /* Should this be merge with the above? */
-                if (!of_property_read_u32_array(pdev->dev.of_node, "dmas", dmas, 4)
-                                && dmas[2] == IMX_DMATYPE_SSI_DUAL) {
-                        ssi_private->use_dual_fifo = true;
-                        /* When using dual fifo mode, we need to keep watermark
-                         * as even numbers due to dma script limitation.
-                         */
-                        ssi_private->dma_params_tx.maxburst &= ~0x1;
-                        ssi_private->dma_params_rx.maxburst &= ~0x1;
-                }
-
-                shared = of_device_is_compatible(of_get_parent(np),
-                            "fsl,spba-bus");
+        }
 
-                imx_pcm_dma_params_init_data(&ssi_private->filter_data_tx,
-                        dma_events[0], shared ? IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI);
-                imx_pcm_dma_params_init_data(&ssi_private->filter_data_rx,
-                        dma_events[1], shared ? IMX_DMATYPE_SSI_SP : IMX_DMATYPE_SSI);
+        ret = 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;
         }
 
-        /*
-         * Enable interrupts only for MCP8610 and MX51. The other MXs have
-         * different writeable interrupt status registers.
-         */
         if (ssi_private->use_dma) {
-                /* The 'name' should not have any slashes in it. */
                 ret = devm_request_irq(&pdev->dev, ssi_private->irq,
-                                        fsl_ssi_isr, 0, ssi_private->name,
+                                        fsl_ssi_isr, 0, dev_name(&pdev->dev),
                                         ssi_private);
-                ssi_private->irq_stats = true;
                 if (ret < 0) {
                         dev_err(&pdev->dev, "could not claim irq %u\n",
                                         ssi_private->irq);
-                        goto error_clk;
+                        goto error_irq;
                 }
         }
 
-        /* Register with ASoC */
-        dev_set_drvdata(&pdev->dev, ssi_private);
-
-        ret = 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_dev;
-        }
-
-        ret = fsl_ssi_debugfs_create(ssi_private, &pdev->dev);
+        ret = fsl_ssi_debugfs_create(&ssi_private->dbg_stats, &pdev->dev);
         if (ret)
-                goto error_dbgfs;
-
-        if (ssi_private->ssi_on_imx) {
-                if (!ssi_private->use_dma) {
-
-                        /*
-                         * Some boards use an incompatible codec. To get it
-                         * working, we are using imx-fiq-pcm-audio, that
-                         * can handle those codecs. DMA is not possible in this
-                         * situation.
-                         */
-
-                        ssi_private->fiq_params.irq = ssi_private->irq;
-                        ssi_private->fiq_params.base = ssi_private->ssi;
-                        ssi_private->fiq_params.dma_params_rx =
-                                &ssi_private->dma_params_rx;
-                        ssi_private->fiq_params.dma_params_tx =
-                                &ssi_private->dma_params_tx;
-
-                        ret = imx_pcm_fiq_init(pdev, &ssi_private->fiq_params);
-                        if (ret)
-                                goto error_pcm;
-                } else {
-                        ret = imx_pcm_dma_init(pdev);
-                        if (ret)
-                                goto error_pcm;
-                }
-        }
+                goto error_asoc_register;
 
         /*
          * If codec-handle property is missing from SSI node, we assume
          * that the machine driver uses new binding which does not require
          * SSI driver to trigger machine driver's probe.
          */
-        if (!of_get_property(np, "codec-handle", NULL)) {
-                ssi_private->new_binding = true;
+        if (!of_get_property(np, "codec-handle", NULL))
                 goto done;
-        }
 
         /* Trigger the machine driver's probe function.  The platform driver
          * name of the machine driver is taken from /compatible property of the
@@ -1543,37 +1285,24 @@ static int fsl_ssi_probe(struct platform_device *pdev)
         if (IS_ERR(ssi_private->pdev)) {
                 ret = PTR_ERR(ssi_private->pdev);
                 dev_err(&pdev->dev, "failed to register platform: %d\n", ret);
-                goto error_dai;
+                goto error_sound_card;
         }
 
 done:
-        if (ssi_private->imx_ac97)
-                fsl_ssi_ac97_init();
-
         return 0;
 
-error_dai:
-        if (ssi_private->ssi_on_imx && !ssi_private->use_dma)
-                imx_pcm_fiq_exit(pdev);
-
-error_pcm:
-        fsl_ssi_debugfs_remove(ssi_private);
+error_sound_card:
+        fsl_ssi_debugfs_remove(&ssi_private->dbg_stats);
 
-error_dbgfs:
+error_irq:
         snd_soc_unregister_component(&pdev->dev);
 
-error_dev:
-        device_remove_file(&pdev->dev, dev_attr);
-
-error_clk:
-        if (ssi_private->ssi_on_imx) {
-                if (!IS_ERR(ssi_private->baudclk))
-                        clk_disable_unprepare(ssi_private->baudclk);
-                clk_disable_unprepare(ssi_private->clk);
-        }
+error_asoc_register:
+        if (fsl_ssi_on_imx(ssi_private))
+                fsl_ssi_imx_clean(pdev, ssi_private);
 
 error_irqmap:
-        if (ssi_private->irq_stats)
+        if (ssi_private->use_dma)
                 irq_dispose_mapping(ssi_private->irq);
 
         return ret;
@@ -1583,17 +1312,16 @@ static int fsl_ssi_remove(struct platform_device *pdev)
 {
         struct fsl_ssi_private *ssi_private = dev_get_drvdata(&pdev->dev);
 
-        fsl_ssi_debugfs_remove(ssi_private);
+        fsl_ssi_debugfs_remove(&ssi_private->dbg_stats);
 
-        if (!ssi_private->new_binding)
+        if (ssi_private->pdev)
                 platform_device_unregister(ssi_private->pdev);
         snd_soc_unregister_component(&pdev->dev);
-        if (ssi_private->ssi_on_imx) {
-                if (!IS_ERR(ssi_private->baudclk))
-                        clk_disable_unprepare(ssi_private->baudclk);
-                clk_disable_unprepare(ssi_private->clk);
-        }
-        if (ssi_private->irq_stats)
+
+        if (fsl_ssi_on_imx(ssi_private))
+                fsl_ssi_imx_clean(pdev, ssi_private);
+
+        if (ssi_private->use_dma)
                 irq_dispose_mapping(ssi_private->irq);
 
         return 0;
diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h
index e6b63240a3d7..71c3e7e4340d 100644
--- a/sound/soc/fsl/fsl_ssi.h
+++ b/sound/soc/fsl/fsl_ssi.h
@@ -39,6 +39,7 @@ struct ccsr_ssi {
         __be32 saccdis; /* 0x.0058 - SSI AC97 Channel Disable Register */
 };
 
+#define CCSR_SSI_SCR_SYNC_TX_FS         0x00001000
 #define CCSR_SSI_SCR_RFR_CLK_DIS        0x00000800
 #define CCSR_SSI_SCR_TFR_CLK_DIS        0x00000400
 #define CCSR_SSI_SCR_TCH_EN             0x00000100
@@ -206,5 +207,64 @@ struct ccsr_ssi {
 #define CCSR_SSI_SACNT_FV               0x00000002
 #define CCSR_SSI_SACNT_AC97EN           0x00000001
 
-#endif
 
+struct device;
+
+#if IS_ENABLED(CONFIG_DEBUG_FS)
+
+struct fsl_ssi_dbg {
+        struct dentry *dbg_dir;
+        struct dentry *dbg_stats;
+
+        struct {
+                unsigned int rfrc;
+                unsigned int tfrc;
+                unsigned int cmdau;
+                unsigned int cmddu;
+                unsigned int rxt;
+                unsigned int rdr1;
+                unsigned int rdr0;
+                unsigned int tde1;
+                unsigned int tde0;
+                unsigned int roe1;
+                unsigned int roe0;
+                unsigned int tue1;
+                unsigned int tue0;
+                unsigned int tfs;
+                unsigned int rfs;
+                unsigned int tls;
+                unsigned int rls;
+                unsigned int rff1;
+                unsigned int rff0;
+                unsigned int tfe1;
+                unsigned int tfe0;
+        } stats;
+};
+
+void fsl_ssi_dbg_isr(struct fsl_ssi_dbg *ssi_dbg, u32 sisr);
+
+int fsl_ssi_debugfs_create(struct fsl_ssi_dbg *ssi_dbg, struct device *dev);
+
+void fsl_ssi_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg);
+
+#else
+
+struct fsl_ssi_dbg {
+};
+
+static inline void fsl_ssi_dbg_isr(struct fsl_ssi_dbg *stats, u32 sisr)
+{
+}
+
+static inline int fsl_ssi_debugfs_create(struct fsl_ssi_dbg *ssi_dbg,
+                struct device *dev)
+{
+        return 0;
+}
+
+static inline void fsl_ssi_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg)
+{
+}
+#endif  /* ! IS_ENABLED(CONFIG_DEBUG_FS) */
+
+#endif
diff --git a/sound/soc/fsl/fsl_ssi_dbg.c b/sound/soc/fsl/fsl_ssi_dbg.c
new file mode 100644
index 000000000000..5469ffbc0253
--- /dev/null
+++ b/sound/soc/fsl/fsl_ssi_dbg.c
@@ -0,0 +1,163 @@
+/*
+ * Freescale SSI ALSA SoC Digital Audio Interface (DAI) debugging functions
+ *
+ * Copyright 2014 Markus Pargmann <mpa@pengutronix.de>, Pengutronix
+ *
+ * Splitted from fsl_ssi.c
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/debugfs.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+
+#include "fsl_ssi.h"
+
+void fsl_ssi_dbg_isr(struct fsl_ssi_dbg *dbg, u32 sisr)
+{
+        if (sisr & CCSR_SSI_SISR_RFRC)
+                dbg->stats.rfrc++;
+
+        if (sisr & CCSR_SSI_SISR_TFRC)
+                dbg->stats.tfrc++;
+
+        if (sisr & CCSR_SSI_SISR_CMDAU)
+                dbg->stats.cmdau++;
+
+        if (sisr & CCSR_SSI_SISR_CMDDU)
+                dbg->stats.cmddu++;
+
+        if (sisr & CCSR_SSI_SISR_RXT)
+                dbg->stats.rxt++;
+
+        if (sisr & CCSR_SSI_SISR_RDR1)
+                dbg->stats.rdr1++;
+
+        if (sisr & CCSR_SSI_SISR_RDR0)
+                dbg->stats.rdr0++;
+
+        if (sisr & CCSR_SSI_SISR_TDE1)
+                dbg->stats.tde1++;
+
+        if (sisr & CCSR_SSI_SISR_TDE0)
+                dbg->stats.tde0++;
+
+        if (sisr & CCSR_SSI_SISR_ROE1)
+                dbg->stats.roe1++;
+
+        if (sisr & CCSR_SSI_SISR_ROE0)
+                dbg->stats.roe0++;
+
+        if (sisr & CCSR_SSI_SISR_TUE1)
+                dbg->stats.tue1++;
+
+        if (sisr & CCSR_SSI_SISR_TUE0)
+                dbg->stats.tue0++;
+
+        if (sisr & CCSR_SSI_SISR_TFS)
+                dbg->stats.tfs++;
+
+        if (sisr & CCSR_SSI_SISR_RFS)
+                dbg->stats.rfs++;
+
+        if (sisr & CCSR_SSI_SISR_TLS)
+                dbg->stats.tls++;
+
+        if (sisr & CCSR_SSI_SISR_RLS)
+                dbg->stats.rls++;
+
+        if (sisr & CCSR_SSI_SISR_RFF1)
+                dbg->stats.rff1++;
+
+        if (sisr & CCSR_SSI_SISR_RFF0)
+                dbg->stats.rff0++;
+
+        if (sisr & CCSR_SSI_SISR_TFE1)
+                dbg->stats.tfe1++;
+
+        if (sisr & CCSR_SSI_SISR_TFE0)
+                dbg->stats.tfe0++;
+}
+
+/* Show the statistics of a flag only if its interrupt is enabled.  The
+ * compiler will optimze this code to a no-op if the interrupt is not
+ * enabled.
+ */
+#define SIER_SHOW(flag, name) \
+        do { \
+                if (CCSR_SSI_SIER_##flag) \
+                        seq_printf(s, #name "=%u\n", ssi_dbg->stats.name); \
+        } while (0)
+
+
+/**
+ * fsl_sysfs_ssi_show: display SSI statistics
+ *
+ * Display the statistics for the current SSI device.  To avoid confusion,
+ * we only show those counts that are enabled.
+ */
+static int fsl_ssi_stats_show(struct seq_file *s, void *unused)
+{
+        struct fsl_ssi_dbg *ssi_dbg = s->private;
+
+        SIER_SHOW(RFRC_EN, rfrc);
+        SIER_SHOW(TFRC_EN, tfrc);
+        SIER_SHOW(CMDAU_EN, cmdau);
+        SIER_SHOW(CMDDU_EN, cmddu);
+        SIER_SHOW(RXT_EN, rxt);
+        SIER_SHOW(RDR1_EN, rdr1);
+        SIER_SHOW(RDR0_EN, rdr0);
+        SIER_SHOW(TDE1_EN, tde1);
+        SIER_SHOW(TDE0_EN, tde0);
+        SIER_SHOW(ROE1_EN, roe1);
+        SIER_SHOW(ROE0_EN, roe0);
+        SIER_SHOW(TUE1_EN, tue1);
+        SIER_SHOW(TUE0_EN, tue0);
+        SIER_SHOW(TFS_EN, tfs);
+        SIER_SHOW(RFS_EN, rfs);
+        SIER_SHOW(TLS_EN, tls);
+        SIER_SHOW(RLS_EN, rls);
+        SIER_SHOW(RFF1_EN, rff1);
+        SIER_SHOW(RFF0_EN, rff0);
+        SIER_SHOW(TFE1_EN, tfe1);
+        SIER_SHOW(TFE0_EN, tfe0);
+
+        return 0;
+}
+
+static int fsl_ssi_stats_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, fsl_ssi_stats_show, inode->i_private);
+}
+
+static const struct file_operations fsl_ssi_stats_ops = {
+        .open = fsl_ssi_stats_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+};
+
+int fsl_ssi_debugfs_create(struct fsl_ssi_dbg *ssi_dbg, struct device *dev)
+{
+        ssi_dbg->dbg_dir = debugfs_create_dir(dev_name(dev), NULL);
+        if (!ssi_dbg->dbg_dir)
+                return -ENOMEM;
+
+        ssi_dbg->dbg_stats = debugfs_create_file("stats", S_IRUGO,
+                        ssi_dbg->dbg_dir, ssi_dbg, &fsl_ssi_stats_ops);
+        if (!ssi_dbg->dbg_stats) {
+                debugfs_remove(ssi_dbg->dbg_dir);
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+void fsl_ssi_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg)
+{
+        debugfs_remove(ssi_dbg->dbg_stats);
+        debugfs_remove(ssi_dbg->dbg_dir);
+}
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index 2585ae44e634..0849b7b83f0a 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -40,7 +40,6 @@ static const struct snd_pcm_hardware imx_pcm_hardware = {
                 SNDRV_PCM_INFO_MMAP_VALID |
                 SNDRV_PCM_INFO_PAUSE |
                 SNDRV_PCM_INFO_RESUME,
-        .formats = SNDRV_PCM_FMTBIT_S16_LE,
         .buffer_bytes_max = IMX_SSI_DMABUF_SIZE,
         .period_bytes_min = 128,
         .period_bytes_max = 65535, /* Limited by SDMA engine */
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 21f1ccbdf582..98f97e543c29 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -66,8 +66,7 @@ err:
 
 static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct simple_card_data *priv =
-                                snd_soc_card_get_drvdata(rtd->card);
+        struct simple_card_data *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 simple_dai_props *dai_props;
@@ -88,7 +87,6 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 
 static int
 asoc_simple_card_sub_parse_of(struct device_node *np,
-                              unsigned int daifmt,
                               struct asoc_simple_dai *dai,
                               const struct device_node **p_node,
                               const char **name)
@@ -117,14 +115,6 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
                 return ret;
 
         /*
-         * bitclock-inversion, frame-inversion
-         * bitclock-master,    frame-master
-         * and specific "format" if it has
-         */
-        dai->fmt = snd_soc_of_parse_daifmt(np, NULL);
-        dai->fmt |= daifmt;
-
-        /*
          * dai->sysclk come from
          *  "clocks = <&xxx>" (if system has common clock)
          *  or "system-clock-frequency = <xxx>"
@@ -151,37 +141,132 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
         return 0;
 }
 
-static int simple_card_cpu_codec_of(struct device_node *node,
-                                int daifmt,
-                                struct snd_soc_dai_link *dai_link,
-                                struct simple_dai_props *dai_props)
+static int simple_card_dai_link_of(struct device_node *node,
+                                   struct device *dev,
+                                   struct snd_soc_dai_link *dai_link,
+                                   struct simple_dai_props *dai_props)
 {
-        struct device_node *np;
+        struct device_node *np = NULL;
+        struct device_node *bitclkmaster = NULL;
+        struct device_node *framemaster = NULL;
+        unsigned int daifmt;
+        char *name;
+        char prop[128];
+        char *prefix = "";
         int ret;
 
-        /* CPU sub-node */
-        ret = -EINVAL;
-        np = of_get_child_by_name(node, "simple-audio-card,cpu");
-        if (np) {
-                ret = asoc_simple_card_sub_parse_of(np, daifmt,
-                                                &dai_props->cpu_dai,
-                                                &dai_link->cpu_of_node,
-                                                &dai_link->cpu_dai_name);
-                of_node_put(np);
+        prefix = "simple-audio-card,";
+
+        daifmt = snd_soc_of_parse_daifmt(node, prefix,
+                                         &bitclkmaster, &framemaster);
+        daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
+
+        snprintf(prop, sizeof(prop), "%scpu", prefix);
+        np = of_get_child_by_name(node, prop);
+        if (!np) {
+                ret = -EINVAL;
+                dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop);
+                goto dai_link_of_err;
         }
+
+        ret = asoc_simple_card_sub_parse_of(np, &dai_props->cpu_dai,
+                                            &dai_link->cpu_of_node,
+                                            &dai_link->cpu_dai_name);
         if (ret < 0)
-                return ret;
+                goto dai_link_of_err;
+
+        dai_props->cpu_dai.fmt = daifmt;
+        switch (((np == bitclkmaster) << 4) | (np == framemaster)) {
+        case 0x11:
+                dai_props->cpu_dai.fmt |= SND_SOC_DAIFMT_CBS_CFS;
+                break;
+        case 0x10:
+                dai_props->cpu_dai.fmt |= SND_SOC_DAIFMT_CBS_CFM;
+                break;
+        case 0x01:
+                dai_props->cpu_dai.fmt |= SND_SOC_DAIFMT_CBM_CFS;
+                break;
+        default:
+                dai_props->cpu_dai.fmt |= SND_SOC_DAIFMT_CBM_CFM;
+                break;
+        }
 
-        /* CODEC sub-node */
-        ret = -EINVAL;
-        np = of_get_child_by_name(node, "simple-audio-card,codec");
-        if (np) {
-                ret = asoc_simple_card_sub_parse_of(np, daifmt,
-                                                &dai_props->codec_dai,
-                                                &dai_link->codec_of_node,
-                                                &dai_link->codec_dai_name);
-                of_node_put(np);
+        of_node_put(np);
+        snprintf(prop, sizeof(prop), "%scodec", prefix);
+        np = of_get_child_by_name(node, prop);
+        if (!np) {
+                ret = -EINVAL;
+                dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop);
+                goto dai_link_of_err;
         }
+
+        ret = asoc_simple_card_sub_parse_of(np, &dai_props->codec_dai,
+                                            &dai_link->codec_of_node,
+                                            &dai_link->codec_dai_name);
+        if (ret < 0)
+                goto dai_link_of_err;
+
+        if (strlen(prefix) && !bitclkmaster && !framemaster) {
+                /* No dai-link level and master setting was not found from
+                   sound node level, revert back to legacy DT parsing and
+                   take the settings from codec node. */
+                dev_dbg(dev, "%s: Revert to legacy daifmt parsing\n",
+                        __func__);
+                dai_props->cpu_dai.fmt = dai_props->codec_dai.fmt =
+                        snd_soc_of_parse_daifmt(np, NULL, NULL, NULL) |
+                        (daifmt & ~SND_SOC_DAIFMT_CLOCK_MASK);
+        } else {
+                dai_props->codec_dai.fmt = daifmt;
+                switch (((np == bitclkmaster) << 4) | (np == framemaster)) {
+                case 0x11:
+                        dai_props->codec_dai.fmt |= SND_SOC_DAIFMT_CBM_CFM;
+                        break;
+                case 0x10:
+                        dai_props->codec_dai.fmt |= SND_SOC_DAIFMT_CBM_CFS;
+                        break;
+                case 0x01:
+                        dai_props->codec_dai.fmt |= SND_SOC_DAIFMT_CBS_CFM;
+                        break;
+                default:
+                        dai_props->codec_dai.fmt |= SND_SOC_DAIFMT_CBS_CFS;
+                        break;
+                }
+        }
+
+        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;
+
+        /* 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);
+        sprintf(name, "%s-%s", dai_link->cpu_dai_name,
+                                dai_link->codec_dai_name);
+        dai_link->name = dai_link->stream_name = name;
+
+        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);
+
+dai_link_of_err:
+        if (np)
+                of_node_put(np);
+        if (bitclkmaster)
+                of_node_put(bitclkmaster);
+        if (framemaster)
+                of_node_put(framemaster);
         return ret;
 }
 
@@ -192,18 +277,11 @@ static int asoc_simple_card_parse_of(struct device_node *node,
 {
         struct snd_soc_dai_link *dai_link = priv->snd_card.dai_link;
         struct simple_dai_props *dai_props = priv->dai_props;
-        struct device_node *np;
-        char *name;
-        unsigned int daifmt;
         int ret;
 
         /* parsing the card name from DT */
         snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");
 
-        /* get CPU/CODEC common format via simple-audio-card,format */
-        daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
-                (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
-
         /* off-codec widgets */
         if (of_property_read_bool(node, "simple-audio-card,widgets")) {
                 ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card,
@@ -220,71 +298,31 @@ static int asoc_simple_card_parse_of(struct device_node *node,
                         return ret;
         }
 
-        /* loop on the DAI links */
-        np = NULL;
-        for (;;) {
-                if (multi) {
-                        np = of_get_next_child(node, np);
-                        if (!np)
-                                break;
+        dev_dbg(dev, "New simple-card: %s\n", priv->snd_card.name ?
+                priv->snd_card.name : "");
+
+        if (multi) {
+                struct device_node *np = NULL;
+                int i;
+                for (i = 0; (np = of_get_next_child(node, np)); i++) {
+                        dev_dbg(dev, "\tlink %d:\n", i);
+                        ret = simple_card_dai_link_of(np, dev, dai_link + i,
+                                                      dai_props + i);
+                        if (ret < 0) {
+                                of_node_put(np);
+                                return ret;
+                        }
                 }
-
-                ret = simple_card_cpu_codec_of(multi ? np : node,
-                                        daifmt, dai_link, dai_props);
+        } else {
+                ret = simple_card_dai_link_of(node, dev, dai_link, dai_props);
                 if (ret < 0)
-                        goto err;
-
-                /*
-                 * overwrite cpu_dai->fmt as its DAIFMT_MASTER bit is based on CODEC
-                 * while the other bits should be identical unless buggy SW/HW design.
-                 */
-                dai_props->cpu_dai.fmt = dai_props->codec_dai.fmt;
-
-                if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) {
-                        ret = -EINVAL;
-                        goto err;
-                }
-
-                /* simple-card assumes platform == cpu */
-                dai_link->platform_of_node = dai_link->cpu_of_node;
-
-                name = devm_kzalloc(dev,
-                                    strlen(dai_link->cpu_dai_name)   +
-                                    strlen(dai_link->codec_dai_name) + 2,
-                                    GFP_KERNEL);
-                sprintf(name, "%s-%s", dai_link->cpu_dai_name,
-                                        dai_link->codec_dai_name);
-                dai_link->name = dai_link->stream_name = name;
-
-                if (!multi)
-                        break;
-
-                dai_link++;
-                dai_props++;
+                        return ret;
         }
 
-        /* card name is created from CPU/CODEC dai name */
-        dai_link = priv->snd_card.dai_link;
         if (!priv->snd_card.name)
-                priv->snd_card.name = dai_link->name;
-
-        dev_dbg(dev, "card-name : %s\n", priv->snd_card.name);
-        dev_dbg(dev, "platform : %04x\n", daifmt);
-        dai_props = priv->dai_props;
-        dev_dbg(dev, "cpu : %s / %04x / %d\n",
-                dai_link->cpu_dai_name,
-                dai_props->cpu_dai.fmt,
-                dai_props->cpu_dai.sysclk);
-        dev_dbg(dev, "codec : %s / %04x / %d\n",
-                dai_link->codec_dai_name,
-                dai_props->codec_dai.fmt,
-                dai_props->codec_dai.sysclk);
+                priv->snd_card.name = priv->snd_card.dai_link->name;
 
         return 0;
-
-err:
-        of_node_put(np);
-        return ret;
 }
 
 /* update the reference count of the devices nodes at end of probe */
@@ -378,10 +416,10 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
                         return -EINVAL;
                 }
 
-                if (!cinfo->name        ||
-                    !cinfo->codec_dai.name      ||
-                    !cinfo->codec       ||
-                    !cinfo->platform    ||
+                if (!cinfo->name ||
+                    !cinfo->codec_dai.name ||
+                    !cinfo->codec ||
+                    !cinfo->platform ||
                     !cinfo->cpu_dai.name) {
                         dev_err(dev, "insufficient asoc_simple_card_info settings\n");
                         return -EINVAL;
@@ -425,11 +463,11 @@ MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
 
 static struct platform_driver asoc_simple_card = {
         .driver = {
-                .name   = "asoc-simple-card",
+                .name = "asoc-simple-card",
                 .owner = THIS_MODULE,
                 .of_match_table = asoc_simple_of_match,
         },
-        .probe          = asoc_simple_card_probe,
+        .probe = asoc_simple_card_probe,
 };
 
 module_platform_driver(asoc_simple_card);
diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile
index edeb79ae3dff..0db4e2f336dc 100644
--- a/sound/soc/intel/Makefile
+++ b/sound/soc/intel/Makefile
@@ -2,7 +2,7 @@
 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.o
+snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o sst-mfld-platform-compress.o
 snd-soc-mfld-machine-objs := mfld_machine.o
 
 obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index eff97c8e5218..5535c3fb7922 100644
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -100,12 +100,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
         snd_soc_dapm_ignore_suspend(dapm, "SPORP");
         snd_soc_dapm_ignore_suspend(dapm, "SPORN");
 
-        snd_soc_dapm_enable_pin(dapm, "Headset Mic");
-        snd_soc_dapm_enable_pin(dapm, "Headphone");
-        snd_soc_dapm_enable_pin(dapm, "Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Internal Mic");
-
-        snd_soc_dapm_sync(dapm);
         return ret;
 }
 
@@ -117,27 +111,13 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
         {
                 .name = "Baytrail Audio",
                 .stream_name = "Audio",
-                .cpu_dai_name = "Front-cpu-dai",
+                .cpu_dai_name = "baytrail-pcm-audio",
                 .codec_dai_name = "rt5640-aif1",
                 .codec_name = "i2c-10EC5640:00",
                 .platform_name = "baytrail-pcm-audio",
                 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                            SND_SOC_DAIFMT_CBS_CFS,
                 .init = byt_rt5640_init,
-                .ignore_suspend = 1,
-                .ops = &byt_rt5640_ops,
-        },
-        {
-                .name = "Baytrail Voice",
-                .stream_name = "Voice",
-                .cpu_dai_name = "Mic1-cpu-dai",
-                .codec_dai_name = "rt5640-aif1",
-                .codec_name = "i2c-10EC5640:00",
-                .platform_name = "baytrail-pcm-audio",
-                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                           SND_SOC_DAIFMT_CBS_CFS,
-                .init = NULL,
-                .ignore_suspend = 1,
                 .ops = &byt_rt5640_ops,
         },
 };
@@ -152,6 +132,17 @@ static struct snd_soc_card byt_rt5640_card = {
         .num_dapm_routes = ARRAY_SIZE(byt_rt5640_audio_map),
 };
 
+#ifdef CONFIG_PM_SLEEP
+static const struct dev_pm_ops byt_rt5640_pm_ops = {
+        .suspend = snd_soc_suspend,
+        .resume = snd_soc_resume,
+};
+
+#define BYT_RT5640_PM_OPS       (&byt_rt5640_pm_ops)
+#else
+#define BYT_RT5640_PM_OPS       NULL
+#endif
+
 static int byt_rt5640_probe(struct platform_device *pdev)
 {
         struct snd_soc_card *card = &byt_rt5640_card;
@@ -177,6 +168,7 @@ static struct platform_driver byt_rt5640_audio = {
         .driver = {
                 .name = "byt-rt5640",
                 .owner = THIS_MODULE,
+                .pm = BYT_RT5640_PM_OPS,
         },
 };
 module_platform_driver(byt_rt5640_audio)
diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/haswell.c
index 54345a2a7386..94c2c33ffe49 100644
--- a/sound/soc/intel/haswell.c
+++ b/sound/soc/intel/haswell.c
@@ -89,8 +89,6 @@ static struct snd_soc_ops haswell_rt5640_ops = {
 
 static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct sst_pdata *pdata = dev_get_platdata(rtd->platform->dev);
         struct sst_hsw *haswell = pdata->dsp;
         int ret;
@@ -104,10 +102,6 @@ static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd)
                 return ret;
         }
 
-        /* always connected */
-        snd_soc_dapm_enable_pin(dapm, "Headphones");
-        snd_soc_dapm_enable_pin(dapm, "Mic");
-
         return 0;
 }
 
diff --git a/sound/soc/intel/sst-baytrail-dsp.c b/sound/soc/intel/sst-baytrail-dsp.c
index adf0aca5aca6..fc588764ffa3 100644
--- a/sound/soc/intel/sst-baytrail-dsp.c
+++ b/sound/soc/intel/sst-baytrail-dsp.c
@@ -214,6 +214,13 @@ static void sst_byt_boot(struct sst_dsp *sst)
 {
         int tries = 10;
 
+        /*
+         * save the physical address of extended firmware block in the first
+         * 4 bytes of the mailbox
+         */
+        memcpy_toio(sst->addr.lpe + SST_BYT_MAILBOX_OFFSET,
+               &sst->pdata->fw_base, sizeof(u32));
+
         /* release stall and wait to unstall */
         sst_dsp_shim_update_bits64(sst, SST_CSR, SST_BYT_CSR_STALL, 0x0);
         while (tries--) {
@@ -317,13 +324,6 @@ static int sst_byt_init(struct sst_dsp *sst, struct sst_pdata *pdata)
                 return ret;
         }
 
-        /*
-         * save the physical address of extended firmware block in the first
-         * 4 bytes of the mailbox
-         */
-        memcpy_toio(sst->addr.lpe + SST_BYT_MAILBOX_OFFSET,
-               &pdata->fw_base, sizeof(u32));
-
         ret = dma_coerce_mask_and_coherent(sst->dma_dev, DMA_BIT_MASK(32));
         if (ret)
                 return ret;
diff --git a/sound/soc/intel/sst-baytrail-ipc.c b/sound/soc/intel/sst-baytrail-ipc.c
index 0d31dbbf4806..7c1ec003d55d 100644
--- a/sound/soc/intel/sst-baytrail-ipc.c
+++ b/sound/soc/intel/sst-baytrail-ipc.c
@@ -173,6 +173,7 @@ struct sst_byt {
         /* boot */
         wait_queue_head_t boot_wait;
         bool boot_complete;
+        struct sst_fw *fw;
 
         /* IPC messaging */
         struct list_head tx_list;
@@ -299,6 +300,24 @@ static inline void sst_byt_tx_msg_reply_complete(struct sst_byt *byt,
                 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)
 {
@@ -661,36 +680,33 @@ out:
 static int sst_byt_stream_operations(struct sst_byt *byt, int type,
                                      int stream_id, int wait)
 {
-        struct sst_byt_start_stream_params start_stream;
         u64 header;
-        void *tx_msg = NULL;
-        size_t size = 0;
-
-        if (type != IPC_IA_START_STREAM) {
-                header = sst_byt_header(type, 0, false, stream_id);
-        } else {
-                start_stream.byte_offset = 0;
-                header = sst_byt_header(IPC_IA_START_STREAM,
-                                        sizeof(start_stream) + sizeof(u32),
-                                        true, stream_id);
-                tx_msg = &start_stream;
-                size = sizeof(start_stream);
-        }
 
+        header = sst_byt_header(type, 0, false, stream_id);
         if (wait)
-                return sst_byt_ipc_tx_msg_wait(byt, header,
-                                               tx_msg, size, NULL, 0);
+                return sst_byt_ipc_tx_msg_wait(byt, header, NULL, 0, NULL, 0);
         else
-                return sst_byt_ipc_tx_msg_nowait(byt, header, tx_msg, size);
+                return sst_byt_ipc_tx_msg_nowait(byt, header, NULL, 0);
 }
 
 /* stream ALSA trigger operations */
-int sst_byt_stream_start(struct sst_byt *byt, struct sst_byt_stream *stream)
+int sst_byt_stream_start(struct sst_byt *byt, struct sst_byt_stream *stream,
+                         u32 start_offset)
 {
+        struct sst_byt_start_stream_params start_stream;
+        void *tx_msg;
+        size_t size;
+        u64 header;
         int ret;
 
-        ret = sst_byt_stream_operations(byt, IPC_IA_START_STREAM,
-                                        stream->str_id, 0);
+        start_stream.byte_offset = start_offset;
+        header = sst_byt_header(IPC_IA_START_STREAM,
+                                sizeof(start_stream) + sizeof(u32),
+                                true, stream->str_id);
+        tx_msg = &start_stream;
+        size = sizeof(start_stream);
+
+        ret = sst_byt_ipc_tx_msg_nowait(byt, header, tx_msg, size);
         if (ret < 0)
                 dev_err(byt->dev, "ipc: error failed to start stream %d\n",
                         stream->str_id);
@@ -782,6 +798,73 @@ static struct sst_dsp_device byt_dev = {
         .ops = &sst_byt_ops,
 };
 
+int sst_byt_dsp_suspend_noirq(struct device *dev, struct sst_pdata *pdata)
+{
+        struct sst_byt *byt = pdata->dsp;
+
+        dev_dbg(byt->dev, "dsp reset\n");
+        sst_dsp_reset(byt->dsp);
+        sst_byt_drop_all(byt);
+        dev_dbg(byt->dev, "dsp in reset\n");
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(sst_byt_dsp_suspend_noirq);
+
+int sst_byt_dsp_suspend_late(struct device *dev, struct sst_pdata *pdata)
+{
+        struct sst_byt *byt = pdata->dsp;
+
+        dev_dbg(byt->dev, "free all blocks and unload fw\n");
+        sst_fw_unload(byt->fw);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(sst_byt_dsp_suspend_late);
+
+int sst_byt_dsp_boot(struct device *dev, struct sst_pdata *pdata)
+{
+        struct sst_byt *byt = pdata->dsp;
+        int ret;
+
+        dev_dbg(byt->dev, "reload dsp fw\n");
+
+        sst_dsp_reset(byt->dsp);
+
+        ret = sst_fw_reload(byt->fw);
+        if (ret <  0) {
+                dev_err(dev, "error: failed to reload firmware\n");
+                return ret;
+        }
+
+        /* wait for DSP boot completion */
+        byt->boot_complete = false;
+        sst_dsp_boot(byt->dsp);
+        dev_dbg(byt->dev, "dsp booting...\n");
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(sst_byt_dsp_boot);
+
+int sst_byt_dsp_wait_for_ready(struct device *dev, struct sst_pdata *pdata)
+{
+        struct sst_byt *byt = pdata->dsp;
+        int err;
+
+        dev_dbg(byt->dev, "wait for dsp reboot\n");
+
+        err = wait_event_timeout(byt->boot_wait, byt->boot_complete,
+                                 msecs_to_jiffies(IPC_BOOT_MSECS));
+        if (err == 0) {
+                dev_err(byt->dev, "ipc: error DSP boot timeout\n");
+                return -EIO;
+        }
+
+        dev_dbg(byt->dev, "dsp rebooted\n");
+        return 0;
+}
+EXPORT_SYMBOL_GPL(sst_byt_dsp_wait_for_ready);
+
 int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
 {
         struct sst_byt *byt;
@@ -848,6 +931,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
         }
 
         pdata->dsp = byt;
+        byt->fw = byt_sst_fw;
 
         return 0;
 
diff --git a/sound/soc/intel/sst-baytrail-ipc.h b/sound/soc/intel/sst-baytrail-ipc.h
index f172b6440fa9..06a4d202689b 100644
--- a/sound/soc/intel/sst-baytrail-ipc.h
+++ b/sound/soc/intel/sst-baytrail-ipc.h
@@ -53,7 +53,8 @@ int sst_byt_stream_commit(struct sst_byt *byt, struct sst_byt_stream *stream);
 int sst_byt_stream_free(struct sst_byt *byt, struct sst_byt_stream *stream);
 
 /* stream ALSA trigger operations */
-int sst_byt_stream_start(struct sst_byt *byt, struct sst_byt_stream *stream);
+int sst_byt_stream_start(struct sst_byt *byt, struct sst_byt_stream *stream,
+                         u32 start_offset);
 int sst_byt_stream_stop(struct sst_byt *byt, struct sst_byt_stream *stream);
 int sst_byt_stream_pause(struct sst_byt *byt, struct sst_byt_stream *stream);
 int sst_byt_stream_resume(struct sst_byt *byt, struct sst_byt_stream *stream);
@@ -65,5 +66,9 @@ int sst_byt_get_dsp_position(struct sst_byt *byt,
 int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata);
 void sst_byt_dsp_free(struct device *dev, struct sst_pdata *pdata);
 struct sst_dsp *sst_byt_get_dsp(struct sst_byt *byt);
+int sst_byt_dsp_suspend_noirq(struct device *dev, struct sst_pdata *pdata);
+int sst_byt_dsp_suspend_late(struct device *dev, struct sst_pdata *pdata);
+int sst_byt_dsp_boot(struct device *dev, struct sst_pdata *pdata);
+int sst_byt_dsp_wait_for_ready(struct device *dev, struct sst_pdata *pdata);
 
 #endif
diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c
index 6d101f3813b4..3af38576e91e 100644
--- a/sound/soc/intel/sst-baytrail-pcm.c
+++ b/sound/soc/intel/sst-baytrail-pcm.c
@@ -45,6 +45,11 @@ struct sst_byt_pcm_data {
         struct sst_byt_stream *stream;
         struct snd_pcm_substream *substream;
         struct mutex mutex;
+
+        /* latest DSP DMA hw pointer */
+        u32 hw_ptr;
+
+        struct work_struct work;
 };
 
 /* private data for the driver */
@@ -63,7 +68,7 @@ static int sst_byt_pcm_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct sst_byt_priv_data *pdata =
                 snd_soc_platform_get_drvdata(rtd->platform);
-        struct sst_byt_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(rtd);
+        struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];
         struct sst_byt *byt = pdata->byt;
         u32 rate, bits;
         u8 channels;
@@ -130,21 +135,56 @@ static int sst_byt_pcm_hw_free(struct snd_pcm_substream *substream)
         return 0;
 }
 
+static int sst_byt_pcm_restore_stream_context(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct sst_byt_priv_data *pdata =
+                snd_soc_platform_get_drvdata(rtd->platform);
+        struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];
+        struct sst_byt *byt = pdata->byt;
+        int ret;
+
+        /* commit stream using existing stream params */
+        ret = sst_byt_stream_commit(byt, pcm_data->stream);
+        if (ret < 0) {
+                dev_err(rtd->dev, "PCM: failed stream commit %d\n", ret);
+                return ret;
+        }
+
+        sst_byt_stream_start(byt, pcm_data->stream, pcm_data->hw_ptr);
+
+        dev_dbg(rtd->dev, "stream context restored at offset %d\n",
+                pcm_data->hw_ptr);
+
+        return 0;
+}
+
+static void sst_byt_pcm_work(struct work_struct *work)
+{
+        struct sst_byt_pcm_data *pcm_data =
+                container_of(work, struct sst_byt_pcm_data, work);
+
+        if (snd_pcm_running(pcm_data->substream))
+                sst_byt_pcm_restore_stream_context(pcm_data->substream);
+}
+
 static int sst_byt_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct sst_byt_priv_data *pdata =
                 snd_soc_platform_get_drvdata(rtd->platform);
-        struct sst_byt_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(rtd);
+        struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];
         struct sst_byt *byt = pdata->byt;
 
         dev_dbg(rtd->dev, "PCM: trigger %d\n", cmd);
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
-                sst_byt_stream_start(byt, pcm_data->stream);
+                sst_byt_stream_start(byt, pcm_data->stream, 0);
                 break;
         case SNDRV_PCM_TRIGGER_RESUME:
+                schedule_work(&pcm_data->work);
+                break;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
                 sst_byt_stream_resume(byt, pcm_data->stream);
                 break;
@@ -168,13 +208,19 @@ static u32 byt_notify_pointer(struct sst_byt_stream *stream, void *data)
         struct snd_pcm_substream *substream = pcm_data->substream;
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        u32 pos;
+        struct sst_byt_priv_data *pdata =
+                snd_soc_platform_get_drvdata(rtd->platform);
+        struct sst_byt *byt = pdata->byt;
+        u32 pos, hw_pos;
 
+        hw_pos = sst_byt_get_dsp_position(byt, pcm_data->stream,
+                                          snd_pcm_lib_buffer_bytes(substream));
+        pcm_data->hw_ptr = hw_pos;
         pos = frames_to_bytes(runtime,
                               (runtime->control->appl_ptr %
                                runtime->buffer_size));
 
-        dev_dbg(rtd->dev, "PCM: App pointer %d bytes\n", pos);
+        dev_dbg(rtd->dev, "PCM: App/DMA pointer %u/%u bytes\n", pos, hw_pos);
 
         snd_pcm_period_elapsed(substream);
         return pos;
@@ -186,18 +232,11 @@ static snd_pcm_uframes_t sst_byt_pcm_pointer(struct snd_pcm_substream *substream
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct sst_byt_priv_data *pdata =
                 snd_soc_platform_get_drvdata(rtd->platform);
-        struct sst_byt_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(rtd);
-        struct sst_byt *byt = pdata->byt;
-        snd_pcm_uframes_t offset;
-        int pos;
+        struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];
 
-        pos = sst_byt_get_dsp_position(byt, pcm_data->stream,
-                                       snd_pcm_lib_buffer_bytes(substream));
-        offset = bytes_to_frames(runtime, pos);
+        dev_dbg(rtd->dev, "PCM: DMA pointer %u bytes\n", pcm_data->hw_ptr);
 
-        dev_dbg(rtd->dev, "PCM: DMA pointer %zu bytes\n",
-                frames_to_bytes(runtime, (u32)offset));
-        return offset;
+        return bytes_to_frames(runtime, pcm_data->hw_ptr);
 }
 
 static int sst_byt_pcm_open(struct snd_pcm_substream *substream)
@@ -205,20 +244,18 @@ static int sst_byt_pcm_open(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct sst_byt_priv_data *pdata =
                 snd_soc_platform_get_drvdata(rtd->platform);
-        struct sst_byt_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(rtd);
+        struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];
         struct sst_byt *byt = pdata->byt;
 
         dev_dbg(rtd->dev, "PCM: open\n");
 
-        pcm_data = &pdata->pcm[rtd->cpu_dai->id];
         mutex_lock(&pcm_data->mutex);
 
-        snd_soc_pcm_set_drvdata(rtd, pcm_data);
         pcm_data->substream = substream;
 
         snd_soc_set_runtime_hwparams(substream, &sst_byt_pcm_hardware);
 
-        pcm_data->stream = sst_byt_stream_new(byt, rtd->cpu_dai->id + 1,
+        pcm_data->stream = sst_byt_stream_new(byt, substream->stream + 1,
                                               byt_notify_pointer, pcm_data);
         if (pcm_data->stream == NULL) {
                 dev_err(rtd->dev, "failed to create stream\n");
@@ -235,12 +272,13 @@ static int sst_byt_pcm_close(struct snd_pcm_substream *substream)
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct sst_byt_priv_data *pdata =
                 snd_soc_platform_get_drvdata(rtd->platform);
-        struct sst_byt_pcm_data *pcm_data = snd_soc_pcm_get_drvdata(rtd);
+        struct sst_byt_pcm_data *pcm_data = &pdata->pcm[substream->stream];
         struct sst_byt *byt = pdata->byt;
         int ret;
 
         dev_dbg(rtd->dev, "PCM: close\n");
 
+        cancel_work_sync(&pcm_data->work);
         mutex_lock(&pcm_data->mutex);
         ret = sst_byt_stream_free(byt, pcm_data->stream);
         if (ret < 0) {
@@ -283,18 +321,16 @@ static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_pcm *pcm = rtd->pcm;
         size_t size;
+        struct snd_soc_platform *platform = rtd->platform;
+        struct sst_pdata *pdata = dev_get_platdata(platform->dev);
         int ret = 0;
 
-        ret = dma_coerce_mask_and_coherent(rtd->card->dev, DMA_BIT_MASK(32));
-        if (ret)
-                return ret;
-
         if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream ||
             pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
                 size = sst_byt_pcm_hardware.buffer_bytes_max;
                 ret = snd_pcm_lib_preallocate_pages_for_all(pcm,
                                                             SNDRV_DMA_TYPE_DEV,
-                                                            rtd->card->dev,
+                                                            pdata->dma_dev,
                                                             size, size);
                 if (ret) {
                         dev_err(rtd->dev, "dma buffer allocation failed %d\n",
@@ -308,7 +344,7 @@ static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd)
 
 static struct snd_soc_dai_driver byt_dais[] = {
         {
-                .name  = "Front-cpu-dai",
+                .name  = "Baytrail PCM",
                 .playback = {
                         .stream_name = "System Playback",
                         .channels_min = 2,
@@ -317,9 +353,6 @@ static struct snd_soc_dai_driver byt_dais[] = {
                         .formats = SNDRV_PCM_FMTBIT_S24_3LE |
                                    SNDRV_PCM_FMTBIT_S16_LE,
                 },
-        },
-        {
-                .name  = "Mic1-cpu-dai",
                 .capture = {
                         .stream_name = "Analog Capture",
                         .channels_min = 2,
@@ -344,8 +377,10 @@ static int sst_byt_pcm_probe(struct snd_soc_platform *platform)
         priv_data->byt = plat_data->dsp;
         snd_soc_platform_set_drvdata(platform, priv_data);
 
-        for (i = 0; i < ARRAY_SIZE(byt_dais); i++)
+        for (i = 0; i < BYT_PCM_COUNT; i++) {
                 mutex_init(&priv_data->pcm[i].mutex);
+                INIT_WORK(&priv_data->pcm[i].work, sst_byt_pcm_work);
+        }
 
         return 0;
 }
@@ -367,6 +402,72 @@ static const struct snd_soc_component_driver byt_dai_component = {
         .name           = "byt-dai",
 };
 
+#ifdef CONFIG_PM
+static int sst_byt_pcm_dev_suspend_noirq(struct device *dev)
+{
+        struct sst_pdata *sst_pdata = dev_get_platdata(dev);
+        int ret;
+
+        dev_dbg(dev, "suspending noirq\n");
+
+        /* at this point all streams will be stopped and context saved */
+        ret = sst_byt_dsp_suspend_noirq(dev, sst_pdata);
+        if (ret < 0) {
+                dev_err(dev, "failed to suspend %d\n", ret);
+                return ret;
+        }
+
+        return ret;
+}
+
+static int sst_byt_pcm_dev_suspend_late(struct device *dev)
+{
+        struct sst_pdata *sst_pdata = dev_get_platdata(dev);
+        int ret;
+
+        dev_dbg(dev, "suspending late\n");
+
+        ret = sst_byt_dsp_suspend_late(dev, sst_pdata);
+        if (ret < 0) {
+                dev_err(dev, "failed to suspend %d\n", ret);
+                return ret;
+        }
+
+        return ret;
+}
+
+static int sst_byt_pcm_dev_resume_early(struct device *dev)
+{
+        struct sst_pdata *sst_pdata = dev_get_platdata(dev);
+
+        dev_dbg(dev, "resume early\n");
+
+        /* load fw and boot DSP */
+        return sst_byt_dsp_boot(dev, sst_pdata);
+}
+
+static int sst_byt_pcm_dev_resume(struct device *dev)
+{
+        struct sst_pdata *sst_pdata = dev_get_platdata(dev);
+
+        dev_dbg(dev, "resume\n");
+
+        /* wait for FW to finish booting */
+        return sst_byt_dsp_wait_for_ready(dev, sst_pdata);
+}
+
+static const struct dev_pm_ops sst_byt_pm_ops = {
+        .suspend_noirq = sst_byt_pcm_dev_suspend_noirq,
+        .suspend_late = sst_byt_pcm_dev_suspend_late,
+        .resume_early = sst_byt_pcm_dev_resume_early,
+        .resume = sst_byt_pcm_dev_resume,
+};
+
+#define SST_BYT_PM_OPS  (&sst_byt_pm_ops)
+#else
+#define SST_BYT_PM_OPS  NULL
+#endif
+
 static int sst_byt_pcm_dev_probe(struct platform_device *pdev)
 {
         struct sst_pdata *sst_pdata = dev_get_platdata(&pdev->dev);
@@ -409,6 +510,7 @@ static struct platform_driver sst_byt_pcm_driver = {
         .driver = {
                 .name = "baytrail-pcm-audio",
                 .owner = THIS_MODULE,
+                .pm = SST_BYT_PM_OPS,
         },
 
         .probe = sst_byt_pcm_dev_probe,
diff --git a/sound/soc/intel/sst-dsp-priv.h b/sound/soc/intel/sst-dsp-priv.h
index 401213455497..ffb308bd81ce 100644
--- a/sound/soc/intel/sst-dsp-priv.h
+++ b/sound/soc/intel/sst-dsp-priv.h
@@ -284,6 +284,8 @@ struct sst_fw *sst_fw_new(struct sst_dsp *dsp,
         const struct firmware *fw, void *private);
 void sst_fw_free(struct sst_fw *sst_fw);
 void sst_fw_free_all(struct sst_dsp *dsp);
+int sst_fw_reload(struct sst_fw *sst_fw);
+void sst_fw_unload(struct sst_fw *sst_fw);
 
 /* Create/Free firmware modules */
 struct sst_module *sst_module_new(struct sst_fw *sst_fw,
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index 928f228c38e7..3bb43dac892d 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -30,6 +30,8 @@
 #include "sst-dsp.h"
 #include "sst-dsp-priv.h"
 
+static void block_module_remove(struct sst_module *module);
+
 static void sst_memcpy32(volatile void __iomem *dest, void *src, u32 bytes)
 {
         u32 i;
@@ -91,6 +93,42 @@ parse_err:
 }
 EXPORT_SYMBOL_GPL(sst_fw_new);
 
+int sst_fw_reload(struct sst_fw *sst_fw)
+{
+        struct sst_dsp *dsp = sst_fw->dsp;
+        int ret;
+
+        dev_dbg(dsp->dev, "reloading firmware\n");
+
+        /* call core specific FW paser to load FW data into DSP */
+        ret = dsp->ops->parse_fw(sst_fw);
+        if (ret < 0)
+                dev_err(dsp->dev, "error: parse fw failed %d\n", ret);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(sst_fw_reload);
+
+void sst_fw_unload(struct sst_fw *sst_fw)
+{
+        struct sst_dsp *dsp = sst_fw->dsp;
+        struct sst_module *module, *tmp;
+
+        dev_dbg(dsp->dev, "unloading firmware\n");
+
+        mutex_lock(&dsp->mutex);
+        list_for_each_entry_safe(module, tmp, &dsp->module_list, list) {
+                if (module->sst_fw == sst_fw) {
+                        block_module_remove(module);
+                        list_del(&module->list);
+                        kfree(module);
+                }
+        }
+
+        mutex_unlock(&dsp->mutex);
+}
+EXPORT_SYMBOL_GPL(sst_fw_unload);
+
 /* free single firmware object */
 void sst_fw_free(struct sst_fw *sst_fw)
 {
@@ -496,9 +534,7 @@ struct sst_module *sst_mem_block_alloc_scratch(struct sst_dsp *dsp)
 
         /* calculate required scratch size */
         list_for_each_entry(sst_module, &dsp->module_list, list) {
-                if (scratch->s.size > sst_module->s.size)
-                        scratch->s.size = scratch->s.size;
-                else
+                if (scratch->s.size < sst_module->s.size)
                         scratch->s.size = sst_module->s.size;
         }
 
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c
index 9d5f64a583a3..ce27b507d5ef 100644
--- a/sound/soc/intel/sst-haswell-pcm.c
+++ b/sound/soc/intel/sst-haswell-pcm.c
@@ -139,7 +139,7 @@ static inline unsigned int hsw_ipc_to_mixer(u32 value)
 static int hsw_stream_volume_put(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_platform *platform = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_platform *platform = snd_soc_kcontrol_platform(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct hsw_priv_data *pdata =
@@ -177,7 +177,7 @@ static int hsw_stream_volume_put(struct snd_kcontrol *kcontrol,
 static int hsw_stream_volume_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_platform *platform = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_platform *platform = snd_soc_kcontrol_platform(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct hsw_priv_data *pdata =
@@ -209,7 +209,7 @@ static int hsw_stream_volume_get(struct snd_kcontrol *kcontrol,
 static int hsw_volume_put(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_platform *platform = snd_kcontrol_chip(kcontrol);
+        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;
         u32 volume;
@@ -234,7 +234,7 @@ static int hsw_volume_put(struct snd_kcontrol *kcontrol,
 static int hsw_volume_get(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_platform *platform = snd_kcontrol_chip(kcontrol);
+        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;
         unsigned int volume = 0;
diff --git a/sound/soc/intel/sst-mfld-dsp.h b/sound/soc/intel/sst-mfld-dsp.h
index 3b63edc04b7f..8d482d76475a 100644
--- a/sound/soc/intel/sst-mfld-dsp.h
+++ b/sound/soc/intel/sst-mfld-dsp.h
@@ -16,10 +16,6 @@
  *  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.
- *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
@@ -40,7 +36,6 @@ enum stream_type {
 };
 
 struct snd_pcm_params {
-        u16 codec;      /* codec type */
         u8 num_chan;    /* 1=Mono, 2=Stereo */
         u8 pcm_wd_sz;   /* 16/24 - bit*/
         u32 reserved;   /* Bitrate in bits per second */
@@ -53,7 +48,6 @@ struct snd_pcm_params {
 
 /* MP3 Music Parameters Message */
 struct snd_mp3_params {
-        u16 codec;
         u8  num_chan;   /* 1=Mono, 2=Stereo     */
         u8  pcm_wd_sz; /* 16/24 - bit*/
         u8  crc_check; /* crc_check - disable (0) or enable (1) */
@@ -67,7 +61,6 @@ struct snd_mp3_params {
 
 /* AAC Music Parameters Message */
 struct snd_aac_params {
-        u16 codec;
         u8 num_chan; /* 1=Mono, 2=Stereo*/
         u8 pcm_wd_sz; /* 16/24 - bit*/
         u8 bdownsample; /*SBR downsampling 0 - disable 1 -enabled AAC+ only */
@@ -81,7 +74,6 @@ struct snd_aac_params {
 
 /* WMA Music Parameters Message */
 struct snd_wma_params {
-        u16 codec;
         u8  num_chan;   /* 1=Mono, 2=Stereo */
         u8  pcm_wd_sz;  /* 16/24 - bit*/
         u32 brate;      /* Use the hard coded value. */
diff --git a/sound/soc/intel/sst-mfld-platform-compress.c b/sound/soc/intel/sst-mfld-platform-compress.c
new file mode 100644
index 000000000000..02abd19fce1d
--- /dev/null
+++ b/sound/soc/intel/sst-mfld-platform-compress.c
@@ -0,0 +1,237 @@
+/*
+ *  sst_mfld_platform.c - Intel MID Platform driver
+ *
+ *  Copyright (C) 2010-2014 Intel Corp
+ *  Author: Vinod Koul <vinod.koul@intel.com>
+ *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  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.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/slab.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/compress_driver.h>
+#include "sst-mfld-platform.h"
+
+/* compress stream operations */
+static void sst_compr_fragment_elapsed(void *arg)
+{
+        struct snd_compr_stream *cstream = (struct snd_compr_stream *)arg;
+
+        pr_debug("fragment elapsed by driver\n");
+        if (cstream)
+                snd_compr_fragment_elapsed(cstream);
+}
+
+static void sst_drain_notify(void *arg)
+{
+        struct snd_compr_stream *cstream = (struct snd_compr_stream *)arg;
+
+        pr_debug("drain notify by driver\n");
+        if (cstream)
+                snd_compr_drain_notify(cstream);
+}
+
+static int sst_platform_compr_open(struct snd_compr_stream *cstream)
+{
+
+        int ret_val = 0;
+        struct snd_compr_runtime *runtime = cstream->runtime;
+        struct sst_runtime_stream *stream;
+
+        stream = kzalloc(sizeof(*stream), GFP_KERNEL);
+        if (!stream)
+                return -ENOMEM;
+
+        spin_lock_init(&stream->status_lock);
+
+        /* get the sst ops */
+        if (!sst || !try_module_get(sst->dev->driver->owner)) {
+                pr_err("no device available to run\n");
+                ret_val = -ENODEV;
+                goto out_ops;
+        }
+        stream->compr_ops = sst->compr_ops;
+
+        stream->id = 0;
+        sst_set_stream_status(stream, SST_PLATFORM_INIT);
+        runtime->private_data = stream;
+        return 0;
+out_ops:
+        kfree(stream);
+        return ret_val;
+}
+
+static int sst_platform_compr_free(struct snd_compr_stream *cstream)
+{
+        struct sst_runtime_stream *stream;
+        int ret_val = 0, str_id;
+
+        stream = cstream->runtime->private_data;
+        /*need to check*/
+        str_id = stream->id;
+        if (str_id)
+                ret_val = stream->compr_ops->close(str_id);
+        module_put(sst->dev->driver->owner);
+        kfree(stream);
+        pr_debug("%s: %d\n", __func__, ret_val);
+        return 0;
+}
+
+static int sst_platform_compr_set_params(struct snd_compr_stream *cstream,
+                                        struct snd_compr_params *params)
+{
+        struct sst_runtime_stream *stream;
+        int retval;
+        struct snd_sst_params str_params;
+        struct sst_compress_cb cb;
+
+        stream = cstream->runtime->private_data;
+        /* construct fw structure for this*/
+        memset(&str_params, 0, sizeof(str_params));
+
+        str_params.ops = STREAM_OPS_PLAYBACK;
+        str_params.stream_type = SST_STREAM_TYPE_MUSIC;
+        str_params.device_type = SND_SST_DEVICE_COMPRESS;
+
+        switch (params->codec.id) {
+        case SND_AUDIOCODEC_MP3: {
+                str_params.codec = SST_CODEC_TYPE_MP3;
+                str_params.sparams.uc.mp3_params.num_chan = params->codec.ch_in;
+                str_params.sparams.uc.mp3_params.pcm_wd_sz = 16;
+                break;
+        }
+
+        case SND_AUDIOCODEC_AAC: {
+                str_params.codec = SST_CODEC_TYPE_AAC;
+                str_params.sparams.uc.aac_params.num_chan = params->codec.ch_in;
+                str_params.sparams.uc.aac_params.pcm_wd_sz = 16;
+                if (params->codec.format == SND_AUDIOSTREAMFORMAT_MP4ADTS)
+                        str_params.sparams.uc.aac_params.bs_format =
+                                                        AAC_BIT_STREAM_ADTS;
+                else if (params->codec.format == SND_AUDIOSTREAMFORMAT_RAW)
+                        str_params.sparams.uc.aac_params.bs_format =
+                                                        AAC_BIT_STREAM_RAW;
+                else {
+                        pr_err("Undefined format%d\n", params->codec.format);
+                        return -EINVAL;
+                }
+                str_params.sparams.uc.aac_params.externalsr =
+                                                params->codec.sample_rate;
+                break;
+        }
+
+        default:
+                pr_err("codec not supported, id =%d\n", params->codec.id);
+                return -EINVAL;
+        }
+
+        str_params.aparams.ring_buf_info[0].addr  =
+                                        virt_to_phys(cstream->runtime->buffer);
+        str_params.aparams.ring_buf_info[0].size =
+                                        cstream->runtime->buffer_size;
+        str_params.aparams.sg_count = 1;
+        str_params.aparams.frag_size = cstream->runtime->fragment_size;
+
+        cb.param = cstream;
+        cb.compr_cb = sst_compr_fragment_elapsed;
+        cb.drain_cb_param = cstream;
+        cb.drain_notify = sst_drain_notify;
+
+        retval = stream->compr_ops->open(&str_params, &cb);
+        if (retval < 0) {
+                pr_err("stream allocation failed %d\n", retval);
+                return retval;
+        }
+
+        stream->id = retval;
+        return 0;
+}
+
+static int sst_platform_compr_trigger(struct snd_compr_stream *cstream, int cmd)
+{
+        struct sst_runtime_stream *stream =
+                cstream->runtime->private_data;
+
+        return stream->compr_ops->control(cmd, stream->id);
+}
+
+static int sst_platform_compr_pointer(struct snd_compr_stream *cstream,
+                                        struct snd_compr_tstamp *tstamp)
+{
+        struct sst_runtime_stream *stream;
+
+        stream  = cstream->runtime->private_data;
+        stream->compr_ops->tstamp(stream->id, tstamp);
+        tstamp->byte_offset = tstamp->copied_total %
+                                 (u32)cstream->runtime->buffer_size;
+        pr_debug("calc bytes offset/copied bytes as %d\n", tstamp->byte_offset);
+        return 0;
+}
+
+static int sst_platform_compr_ack(struct snd_compr_stream *cstream,
+                                        size_t bytes)
+{
+        struct sst_runtime_stream *stream;
+
+        stream  = cstream->runtime->private_data;
+        stream->compr_ops->ack(stream->id, (unsigned long)bytes);
+        stream->bytes_written += bytes;
+
+        return 0;
+}
+
+static int sst_platform_compr_get_caps(struct snd_compr_stream *cstream,
+                                        struct snd_compr_caps *caps)
+{
+        struct sst_runtime_stream *stream =
+                cstream->runtime->private_data;
+
+        return stream->compr_ops->get_caps(caps);
+}
+
+static int sst_platform_compr_get_codec_caps(struct snd_compr_stream *cstream,
+                                        struct snd_compr_codec_caps *codec)
+{
+        struct sst_runtime_stream *stream =
+                cstream->runtime->private_data;
+
+        return stream->compr_ops->get_codec_caps(codec);
+}
+
+static int sst_platform_compr_set_metadata(struct snd_compr_stream *cstream,
+                                        struct snd_compr_metadata *metadata)
+{
+        struct sst_runtime_stream *stream  =
+                 cstream->runtime->private_data;
+
+        return stream->compr_ops->set_metadata(stream->id, metadata);
+}
+
+struct snd_compr_ops sst_platform_compr_ops = {
+
+        .open = sst_platform_compr_open,
+        .free = sst_platform_compr_free,
+        .set_params = sst_platform_compr_set_params,
+        .set_metadata = sst_platform_compr_set_metadata,
+        .trigger = sst_platform_compr_trigger,
+        .pointer = sst_platform_compr_pointer,
+        .ack = sst_platform_compr_ack,
+        .get_caps = sst_platform_compr_get_caps,
+        .get_codec_caps = sst_platform_compr_get_codec_caps,
+};
diff --git a/sound/soc/intel/sst-mfld-platform.c b/sound/soc/intel/sst-mfld-platform-pcm.c
index 840306c2ef14..7c790f51d259 100644
--- a/sound/soc/intel/sst-mfld-platform.c
+++ b/sound/soc/intel/sst-mfld-platform-pcm.c
@@ -15,13 +15,7 @@
  *  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.
- *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -35,8 +29,9 @@
 #include <sound/compress_driver.h>
 #include "sst-mfld-platform.h"
 
-static struct sst_device *sst;
+struct sst_device *sst;
 static DEFINE_MUTEX(sst_lock);
+extern struct snd_compr_ops sst_platform_compr_ops;
 
 int sst_register_dsp(struct sst_device *dev)
 {
@@ -116,36 +111,6 @@ static struct snd_soc_dai_driver sst_platform_dai[] = {
         },
 },
 {
-        .name = "Speaker-cpu-dai",
-        .id = 1,
-        .playback = {
-                .channels_min = SST_MONO,
-                .channels_max = SST_STEREO,
-                .rates = SNDRV_PCM_RATE_48000,
-                .formats = SNDRV_PCM_FMTBIT_S24_LE,
-        },
-},
-{
-        .name = "Vibra1-cpu-dai",
-        .id = 2,
-        .playback = {
-                .channels_min = SST_MONO,
-                .channels_max = SST_MONO,
-                .rates = SNDRV_PCM_RATE_48000,
-                .formats = SNDRV_PCM_FMTBIT_S24_LE,
-        },
-},
-{
-        .name = "Vibra2-cpu-dai",
-        .id = 3,
-        .playback = {
-                .channels_min = SST_MONO,
-                .channels_max = SST_STEREO,
-                .rates = SNDRV_PCM_RATE_48000,
-                .formats = SNDRV_PCM_FMTBIT_S24_LE,
-        },
-},
-{
         .name = "Compress-cpu-dai",
         .compress_dai = 1,
         .playback = {
@@ -157,12 +122,8 @@ static struct snd_soc_dai_driver sst_platform_dai[] = {
 },
 };
 
-static const struct snd_soc_component_driver sst_component = {
-        .name           = "sst",
-};
-
 /* helper functions */
-static inline void sst_set_stream_status(struct sst_runtime_stream *stream,
+void sst_set_stream_status(struct sst_runtime_stream *stream,
                                         int state)
 {
         unsigned long flags;
@@ -186,7 +147,6 @@ static void sst_fill_pcm_params(struct snd_pcm_substream *substream,
                                 struct sst_pcm_params *param)
 {
 
-        param->codec = SST_CODEC_TYPE_PCM;
         param->num_chan = (u8) substream->runtime->channels;
         param->pcm_wd_sz = substream->runtime->sample_bits;
         param->reserved = 0;
@@ -471,205 +431,6 @@ static int sst_pcm_new(struct snd_soc_pcm_runtime *rtd)
         return retval;
 }
 
-/* compress stream operations */
-static void sst_compr_fragment_elapsed(void *arg)
-{
-        struct snd_compr_stream *cstream = (struct snd_compr_stream *)arg;
-
-        pr_debug("fragment elapsed by driver\n");
-        if (cstream)
-                snd_compr_fragment_elapsed(cstream);
-}
-
-static int sst_platform_compr_open(struct snd_compr_stream *cstream)
-{
-
-        int ret_val = 0;
-        struct snd_compr_runtime *runtime = cstream->runtime;
-        struct sst_runtime_stream *stream;
-
-        stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-        if (!stream)
-                return -ENOMEM;
-
-        spin_lock_init(&stream->status_lock);
-
-        /* get the sst ops */
-        if (!sst || !try_module_get(sst->dev->driver->owner)) {
-                pr_err("no device available to run\n");
-                ret_val = -ENODEV;
-                goto out_ops;
-        }
-        stream->compr_ops = sst->compr_ops;
-
-        stream->id = 0;
-        sst_set_stream_status(stream, SST_PLATFORM_INIT);
-        runtime->private_data = stream;
-        return 0;
-out_ops:
-        kfree(stream);
-        return ret_val;
-}
-
-static int sst_platform_compr_free(struct snd_compr_stream *cstream)
-{
-        struct sst_runtime_stream *stream;
-        int ret_val = 0, str_id;
-
-        stream = cstream->runtime->private_data;
-        /*need to check*/
-        str_id = stream->id;
-        if (str_id)
-                ret_val = stream->compr_ops->close(str_id);
-        module_put(sst->dev->driver->owner);
-        kfree(stream);
-        pr_debug("%s: %d\n", __func__, ret_val);
-        return 0;
-}
-
-static int sst_platform_compr_set_params(struct snd_compr_stream *cstream,
-                                        struct snd_compr_params *params)
-{
-        struct sst_runtime_stream *stream;
-        int retval;
-        struct snd_sst_params str_params;
-        struct sst_compress_cb cb;
-
-        stream = cstream->runtime->private_data;
-        /* construct fw structure for this*/
-        memset(&str_params, 0, sizeof(str_params));
-
-        str_params.ops = STREAM_OPS_PLAYBACK;
-        str_params.stream_type = SST_STREAM_TYPE_MUSIC;
-        str_params.device_type = SND_SST_DEVICE_COMPRESS;
-
-        switch (params->codec.id) {
-        case SND_AUDIOCODEC_MP3: {
-                str_params.codec = SST_CODEC_TYPE_MP3;
-                str_params.sparams.uc.mp3_params.codec = SST_CODEC_TYPE_MP3;
-                str_params.sparams.uc.mp3_params.num_chan = params->codec.ch_in;
-                str_params.sparams.uc.mp3_params.pcm_wd_sz = 16;
-                break;
-        }
-
-        case SND_AUDIOCODEC_AAC: {
-                str_params.codec = SST_CODEC_TYPE_AAC;
-                str_params.sparams.uc.aac_params.codec = SST_CODEC_TYPE_AAC;
-                str_params.sparams.uc.aac_params.num_chan = params->codec.ch_in;
-                str_params.sparams.uc.aac_params.pcm_wd_sz = 16;
-                if (params->codec.format == SND_AUDIOSTREAMFORMAT_MP4ADTS)
-                        str_params.sparams.uc.aac_params.bs_format =
-                                                        AAC_BIT_STREAM_ADTS;
-                else if (params->codec.format == SND_AUDIOSTREAMFORMAT_RAW)
-                        str_params.sparams.uc.aac_params.bs_format =
-                                                        AAC_BIT_STREAM_RAW;
-                else {
-                        pr_err("Undefined format%d\n", params->codec.format);
-                        return -EINVAL;
-                }
-                str_params.sparams.uc.aac_params.externalsr =
-                                                params->codec.sample_rate;
-                break;
-        }
-
-        default:
-                pr_err("codec not supported, id =%d\n", params->codec.id);
-                return -EINVAL;
-        }
-
-        str_params.aparams.ring_buf_info[0].addr  =
-                                        virt_to_phys(cstream->runtime->buffer);
-        str_params.aparams.ring_buf_info[0].size =
-                                        cstream->runtime->buffer_size;
-        str_params.aparams.sg_count = 1;
-        str_params.aparams.frag_size = cstream->runtime->fragment_size;
-
-        cb.param = cstream;
-        cb.compr_cb = sst_compr_fragment_elapsed;
-
-        retval = stream->compr_ops->open(&str_params, &cb);
-        if (retval < 0) {
-                pr_err("stream allocation failed %d\n", retval);
-                return retval;
-        }
-
-        stream->id = retval;
-        return 0;
-}
-
-static int sst_platform_compr_trigger(struct snd_compr_stream *cstream, int cmd)
-{
-        struct sst_runtime_stream *stream =
-                cstream->runtime->private_data;
-
-        return stream->compr_ops->control(cmd, stream->id);
-}
-
-static int sst_platform_compr_pointer(struct snd_compr_stream *cstream,
-                                        struct snd_compr_tstamp *tstamp)
-{
-        struct sst_runtime_stream *stream;
-
-        stream  = cstream->runtime->private_data;
-        stream->compr_ops->tstamp(stream->id, tstamp);
-        tstamp->byte_offset = tstamp->copied_total %
-                                 (u32)cstream->runtime->buffer_size;
-        pr_debug("calc bytes offset/copied bytes as %d\n", tstamp->byte_offset);
-        return 0;
-}
-
-static int sst_platform_compr_ack(struct snd_compr_stream *cstream,
-                                        size_t bytes)
-{
-        struct sst_runtime_stream *stream;
-
-        stream  = cstream->runtime->private_data;
-        stream->compr_ops->ack(stream->id, (unsigned long)bytes);
-        stream->bytes_written += bytes;
-
-        return 0;
-}
-
-static int sst_platform_compr_get_caps(struct snd_compr_stream *cstream,
-                                        struct snd_compr_caps *caps)
-{
-        struct sst_runtime_stream *stream =
-                cstream->runtime->private_data;
-
-        return stream->compr_ops->get_caps(caps);
-}
-
-static int sst_platform_compr_get_codec_caps(struct snd_compr_stream *cstream,
-                                        struct snd_compr_codec_caps *codec)
-{
-        struct sst_runtime_stream *stream =
-                cstream->runtime->private_data;
-
-        return stream->compr_ops->get_codec_caps(codec);
-}
-
-static int sst_platform_compr_set_metadata(struct snd_compr_stream *cstream,
-                                        struct snd_compr_metadata *metadata)
-{
-        struct sst_runtime_stream *stream  =
-                 cstream->runtime->private_data;
-
-        return stream->compr_ops->set_metadata(stream->id, metadata);
-}
-
-static struct snd_compr_ops sst_platform_compr_ops = {
-
-        .open = sst_platform_compr_open,
-        .free = sst_platform_compr_free,
-        .set_params = sst_platform_compr_set_params,
-        .set_metadata = sst_platform_compr_set_metadata,
-        .trigger = sst_platform_compr_trigger,
-        .pointer = sst_platform_compr_pointer,
-        .ack = sst_platform_compr_ack,
-        .get_caps = sst_platform_compr_get_caps,
-        .get_codec_caps = sst_platform_compr_get_codec_caps,
-};
-
 static struct snd_soc_platform_driver sst_soc_platform_drv = {
         .ops            = &sst_platform_ops,
         .compr_ops      = &sst_platform_compr_ops,
@@ -677,6 +438,11 @@ static struct snd_soc_platform_driver sst_soc_platform_drv = {
         .pcm_free       = sst_pcm_free,
 };
 
+static const struct snd_soc_component_driver sst_component = {
+        .name           = "sst",
+};
+
+
 static int sst_platform_probe(struct platform_device *pdev)
 {
         int ret;
diff --git a/sound/soc/intel/sst-mfld-platform.h b/sound/soc/intel/sst-mfld-platform.h
index 0c4e2ddcecb1..6c5e7dc49e3c 100644
--- a/sound/soc/intel/sst-mfld-platform.h
+++ b/sound/soc/intel/sst-mfld-platform.h
@@ -15,13 +15,7 @@
  *  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.
- *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *
  */
 
 #ifndef __SST_PLATFORMDRV_H__
@@ -29,6 +23,8 @@
 
 #include "sst-mfld-dsp.h"
 
+extern struct sst_device *sst;
+
 #define SST_MONO                1
 #define SST_STEREO              2
 #define SST_MAX_CAP             5
@@ -108,6 +104,8 @@ struct sst_stream_params {
 struct sst_compress_cb {
         void *param;
         void (*compr_cb)(void *param);
+        void *drain_cb_param;
+        void (*drain_notify)(void *param);
 };
 
 struct compress_sst_ops {
@@ -148,6 +146,7 @@ struct sst_device {
         struct compress_sst_ops *compr_ops;
 };
 
+void sst_set_stream_status(struct sst_runtime_stream *stream, int state);
 int sst_register_dsp(struct sst_device *sst);
 int sst_unregister_dsp(struct sst_device *sst);
 #endif
diff --git a/sound/soc/jz4740/Kconfig b/sound/soc/jz4740/Kconfig
index 29f76af5d963..1a354a6b6e87 100644
--- a/sound/soc/jz4740/Kconfig
+++ b/sound/soc/jz4740/Kconfig
@@ -1,24 +1,29 @@
 config SND_JZ4740_SOC
         tristate "SoC Audio for Ingenic JZ4740 SoC"
-        depends on MACH_JZ4740 && SND_SOC
+        depends on MACH_JZ4740 || COMPILE_TEST
         select SND_SOC_GENERIC_DMAENGINE_PCM
         help
           Say Y or M if you want to add support for codecs attached to
           the JZ4740 I2S interface. You will also need to select the audio
           interfaces to support below.
 
+if SND_JZ4740_SOC
+
 config SND_JZ4740_SOC_I2S
-        depends on SND_JZ4740_SOC
         tristate "SoC Audio (I2S protocol) for Ingenic JZ4740 SoC"
+        depends on HAS_IOMEM
         help
           Say Y if you want to use I2S protocol and I2S codec on Ingenic JZ4740
           based boards.
 
 config SND_JZ4740_SOC_QI_LB60
         tristate "SoC Audio support for Qi LB60"
-        depends on SND_JZ4740_SOC && JZ4740_QI_LB60
+        depends on HAS_IOMEM
+        depends on JZ4740_QI_LB60 || COMPILE_TEST
         select SND_JZ4740_SOC_I2S
     select SND_SOC_JZ4740_CODEC
         help
           Say Y if you want to add support for ASoC audio on the Qi LB60 board
           a.k.a Qi Ben NanoNote.
+
+endif
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 8f220009e0f6..3f9c3a9ae36f 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -31,10 +31,11 @@
 #include <sound/initval.h>
 #include <sound/dmaengine_pcm.h>
 
-#include <asm/mach-jz4740/dma.h>
-
 #include "jz4740-i2s.h"
 
+#define JZ4740_DMA_TYPE_AIC_TRANSMIT 24
+#define JZ4740_DMA_TYPE_AIC_RECEIVE 25
+
 #define JZ_REG_AIC_CONF         0x00
 #define JZ_REG_AIC_CTRL         0x04
 #define JZ_REG_AIC_I2S_FMT      0x10
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index 82b5f37cd2c7..5cb91f9e8626 100644
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -19,18 +19,21 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 
-#define QI_LB60_SND_GPIO JZ_GPIO_PORTB(29)
-#define QI_LB60_AMP_GPIO JZ_GPIO_PORTD(4)
+struct qi_lb60 {
+        struct gpio_desc *snd_gpio;
+        struct gpio_desc *amp_gpio;
+};
 
 static int qi_lb60_spk_event(struct snd_soc_dapm_widget *widget,
                              struct snd_kcontrol *ctrl, int event)
 {
+        struct qi_lb60 *qi_lb60 = snd_soc_card_get_drvdata(widget->dapm->card);
         int on = !SND_SOC_DAPM_EVENT_OFF(event);
 
-        gpio_set_value(QI_LB60_SND_GPIO, on);
-        gpio_set_value(QI_LB60_AMP_GPIO, on);
+        gpiod_set_value_cansleep(qi_lb60->snd_gpio, on);
+        gpiod_set_value_cansleep(qi_lb60->amp_gpio, on);
 
         return 0;
 }
@@ -46,29 +49,6 @@ static const struct snd_soc_dapm_route qi_lb60_routes[] = {
         {"Speaker", NULL, "ROUT"},
 };
 
-#define QI_LB60_DAIFMT (SND_SOC_DAIFMT_I2S | \
-                        SND_SOC_DAIFMT_NB_NF | \
-                        SND_SOC_DAIFMT_CBM_CFM)
-
-static int qi_lb60_codec_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-        int ret;
-
-        snd_soc_dapm_nc_pin(dapm, "LIN");
-        snd_soc_dapm_nc_pin(dapm, "RIN");
-
-        ret = snd_soc_dai_set_fmt(cpu_dai, QI_LB60_DAIFMT);
-        if (ret < 0) {
-                dev_err(codec->dev, "Failed to set cpu dai format: %d\n", ret);
-                return ret;
-        }
-
-        return 0;
-}
-
 static struct snd_soc_dai_link qi_lb60_dai = {
         .name = "jz4740",
         .stream_name = "jz4740",
@@ -76,10 +56,11 @@ static struct snd_soc_dai_link qi_lb60_dai = {
         .platform_name = "jz4740-i2s",
         .codec_dai_name = "jz4740-hifi",
         .codec_name = "jz4740-codec",
-        .init = qi_lb60_codec_init,
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                SND_SOC_DAIFMT_CBM_CFM,
 };
 
-static struct snd_soc_card qi_lb60 = {
+static struct snd_soc_card qi_lb60_card = {
         .name = "QI LB60",
         .owner = THIS_MODULE,
         .dai_link = &qi_lb60_dai,
@@ -89,40 +70,38 @@ static struct snd_soc_card qi_lb60 = {
         .num_dapm_widgets = ARRAY_SIZE(qi_lb60_widgets),
         .dapm_routes = qi_lb60_routes,
         .num_dapm_routes = ARRAY_SIZE(qi_lb60_routes),
-};
-
-static const struct gpio qi_lb60_gpios[] = {
-        { QI_LB60_SND_GPIO, GPIOF_OUT_INIT_LOW, "SND" },
-        { QI_LB60_AMP_GPIO, GPIOF_OUT_INIT_LOW, "AMP" },
+        .fully_routed = true,
 };
 
 static int qi_lb60_probe(struct platform_device *pdev)
 {
-        struct snd_soc_card *card = &qi_lb60;
+        struct qi_lb60 *qi_lb60;
+        struct snd_soc_card *card = &qi_lb60_card;
         int ret;
 
-        ret = gpio_request_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
+        qi_lb60 = devm_kzalloc(&pdev->dev, sizeof(*qi_lb60), GFP_KERNEL);
+        if (!qi_lb60)
+                return -ENOMEM;
+
+        qi_lb60->snd_gpio = devm_gpiod_get(&pdev->dev, "snd");
+        if (IS_ERR(qi_lb60->snd_gpio))
+                return PTR_ERR(qi_lb60->snd_gpio);
+        ret = gpiod_direction_output(qi_lb60->snd_gpio, 0);
         if (ret)
                 return ret;
 
-        card->dev = &pdev->dev;
+        qi_lb60->amp_gpio = devm_gpiod_get(&pdev->dev, "amp");
+        if (IS_ERR(qi_lb60->amp_gpio))
+                return PTR_ERR(qi_lb60->amp_gpio);
+        ret = gpiod_direction_output(qi_lb60->amp_gpio, 0);
+        if (ret)
+                return ret;
 
-        ret = snd_soc_register_card(card);
-        if (ret) {
-                dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
-                        ret);
-                gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
-        }
-        return ret;
-}
+        card->dev = &pdev->dev;
 
-static int qi_lb60_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
+        snd_soc_card_set_drvdata(card, qi_lb60);
 
-        snd_soc_unregister_card(card);
-        gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
-        return 0;
+        return devm_snd_soc_register_card(&pdev->dev, card);
 }
 
 static struct platform_driver qi_lb60_driver = {
@@ -131,7 +110,6 @@ static struct platform_driver qi_lb60_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = qi_lb60_probe,
-        .remove         = qi_lb60_remove,
 };
 
 module_platform_driver(qi_lb60_driver);
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
index d213832b0c72..844b8415a011 100644
--- a/sound/soc/kirkwood/kirkwood-t5325.c
+++ b/sound/soc/kirkwood/kirkwood-t5325.c
@@ -52,18 +52,6 @@ static const struct snd_soc_dapm_route t5325_route[] = {
         { "MIC2",               NULL,   "Mic Jack" },
 };
 
-static int t5325_dai_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Speaker");
-
-        return 0;
-}
-
 static struct snd_soc_dai_link t5325_dai[] = {
 {
         .name = "ALC5621",
@@ -74,7 +62,6 @@ static struct snd_soc_dai_link t5325_dai[] = {
         .codec_name = "alc562x-codec.0-001a",
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
         .ops = &t5325_ops,
-        .init = t5325_dai_init,
 },
 };
 
diff --git a/sound/soc/nuc900/Kconfig b/sound/soc/nuc900/Kconfig
index a0ed1c618f60..7f0c954dff6f 100644
--- a/sound/soc/nuc900/Kconfig
+++ b/sound/soc/nuc900/Kconfig
@@ -4,6 +4,7 @@
 config SND_SOC_NUC900
         tristate "SoC Audio for NUC900 series"
         depends on ARCH_W90X900
+        select SND_SOC_NUC900_AC97
         help
           This option enables support for AC97 mode on the NUC900 SoC.
 
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index 8987bf987e58..f2f67942b229 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -28,6 +28,7 @@
 
 static DEFINE_MUTEX(ac97_mutex);
 struct nuc900_audio *nuc900_ac97_data;
+EXPORT_SYMBOL_GPL(nuc900_ac97_data);
 
 static int nuc900_checkready(void)
 {
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index e00659351a4e..d44463a7b0fa 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -26,7 +26,7 @@ config SND_OMAP_SOC_N810
 
 config SND_OMAP_SOC_RX51
         tristate "SoC Audio support for Nokia RX-51"
-        depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 || COMPILE_TEST)
+        depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 || COMPILE_TEST) && I2C
         select SND_OMAP_SOC_MCBSP
         select SND_SOC_TLV320AIC3X
         select SND_SOC_TPA6130A2
@@ -37,7 +37,7 @@ config SND_OMAP_SOC_RX51
 
 config SND_OMAP_SOC_AMS_DELTA
         tristate "SoC Audio support for Amstrad E3 (Delta) videophone"
-        depends on SND_OMAP_SOC && MACH_AMS_DELTA
+        depends on SND_OMAP_SOC && MACH_AMS_DELTA && TTY
         select SND_OMAP_SOC_MCBSP
         select SND_SOC_CX20442
         help
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index 994dcf345975..25a33e9d417a 100644
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -77,7 +77,7 @@ static struct snd_soc_dai_link am3517evm_dai = {
         .stream_name = "AIC23",
         .cpu_dai_name = "omap-mcbsp.1",
         .codec_dai_name = "tlv320aic23-hifi",
-        .platform_name = "omap-pcm-audio",
+        .platform_name = "omap-mcbsp.1",
         .codec_name = "tlv320aic23-codec.2-001a",
         .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
                    SND_SOC_DAIFMT_CBM_CFM,
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 56a5219c0a00..bb243c663e6b 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -38,7 +38,6 @@
 #include "omap-mcbsp.h"
 #include "../codecs/cx20442.h"
 
-
 /* Board specific DAPM widgets */
 static const struct snd_soc_dapm_widget ams_delta_dapm_widgets[] = {
         /* Handset */
@@ -90,17 +89,23 @@ static const unsigned short ams_delta_audio_mode_pins[] = {
 
 static unsigned short ams_delta_audio_agc;
 
+/*
+ * Used for passing a codec structure pointer
+ * from the board initialization code to the tty line discipline.
+ */
+static struct snd_soc_codec *cx20442_codec;
+
 static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
+        struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_context *dapm = &card->dapm;
         struct soc_enum *control = (struct soc_enum *)kcontrol->private_value;
         unsigned short pins;
         int pin, changed = 0;
 
         /* Refuse any mode changes if we are not able to control the codec. */
-        if (!codec->hw_write)
+        if (!cx20442_codec->hw_write)
                 return -EUNATCH;
 
         if (ucontrol->value.enumerated.item[0] >= control->items)
@@ -166,8 +171,8 @@ static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol,
 static int ams_delta_get_audio_mode(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
+        struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_dapm_context *dapm = &card->dapm;
         unsigned short pins, mode;
 
         pins = ((snd_soc_dapm_get_pin_status(dapm, "Mouthpiece") <<
@@ -270,12 +275,6 @@ static void cx81801_timeout(unsigned long data)
                 ams_delta_latch2_write(AMS_DELTA_LATCH2_MODEM_CODEC, 0);
 }
 
-/*
- * Used for passing a codec structure pointer
- * from the board initialization code to the tty line discipline.
- */
-static struct snd_soc_codec *cx20442_codec;
-
 /* Line discipline .open() */
 static int cx81801_open(struct tty_struct *tty)
 {
@@ -302,7 +301,7 @@ static int cx81801_open(struct tty_struct *tty)
 static void cx81801_close(struct tty_struct *tty)
 {
         struct snd_soc_codec *codec = tty->disc_data;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
+        struct snd_soc_dapm_context *dapm = &codec->card->dapm;
 
         del_timer_sync(&cx81801_timer);
 
@@ -475,15 +474,14 @@ static void ams_delta_shutdown(struct snd_pcm_substream *substream)
 
 static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_card *card = rtd->card;
+        struct snd_soc_dapm_context *dapm = &card->dapm;
         int ret;
         /* Codec is ready, now add/activate board specific controls */
 
         /* Store a pointer to the codec structure for tty ldisc use */
-        cx20442_codec = codec;
+        cx20442_codec = rtd->codec;
 
         /* Set up digital mute if not provided by the codec */
         if (!codec_dai->driver->ops) {
@@ -520,41 +518,12 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
                 return 0;
         }
 
-        /* Add board specific DAPM widgets and routes */
-        ret = snd_soc_dapm_new_controls(dapm, ams_delta_dapm_widgets,
-                                        ARRAY_SIZE(ams_delta_dapm_widgets));
-        if (ret) {
-                dev_warn(card->dev,
-                                "Failed to register DAPM controls, "
-                                "will continue without any.\n");
-                return 0;
-        }
-
-        ret = snd_soc_dapm_add_routes(dapm, ams_delta_audio_map,
-                                        ARRAY_SIZE(ams_delta_audio_map));
-        if (ret) {
-                dev_warn(card->dev,
-                                "Failed to set up DAPM routes, "
-                                "will continue with codec default map.\n");
-                return 0;
-        }
-
         /* Set up initial pin constellation */
         snd_soc_dapm_disable_pin(dapm, "Mouthpiece");
-        snd_soc_dapm_enable_pin(dapm, "Earpiece");
-        snd_soc_dapm_enable_pin(dapm, "Microphone");
         snd_soc_dapm_disable_pin(dapm, "Speaker");
         snd_soc_dapm_disable_pin(dapm, "AGCIN");
         snd_soc_dapm_disable_pin(dapm, "AGCOUT");
 
-        /* Add virtual switch */
-        ret = snd_soc_add_codec_controls(codec, ams_delta_audio_controls,
-                                        ARRAY_SIZE(ams_delta_audio_controls));
-        if (ret)
-                dev_warn(card->dev,
-                                "Failed to register audio mode control, "
-                                "will continue without it.\n");
-
         return 0;
 }
 
@@ -565,7 +534,7 @@ static struct snd_soc_dai_link ams_delta_dai_link = {
         .cpu_dai_name = "omap-mcbsp.1",
         .codec_dai_name = "cx20442-voice",
         .init = ams_delta_cx20442_init,
-        .platform_name = "omap-pcm-audio",
+        .platform_name = "omap-mcbsp.1",
         .codec_name = "cx20442-codec",
         .ops = &ams_delta_ops,
 };
@@ -576,6 +545,13 @@ static struct snd_soc_card ams_delta_audio_card = {
         .owner = THIS_MODULE,
         .dai_link = &ams_delta_dai_link,
         .num_links = 1,
+
+        .controls = ams_delta_audio_controls,
+        .num_controls = ARRAY_SIZE(ams_delta_audio_controls),
+        .dapm_widgets = ams_delta_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(ams_delta_dapm_widgets),
+        .dapm_routes = ams_delta_audio_map,
+        .num_dapm_routes = ARRAY_SIZE(ams_delta_audio_map),
 };
 
 /* Module init/exit */
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index fd4d9c809e50..5d7f9cebe041 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -278,7 +278,7 @@ static struct snd_soc_dai_link n810_dai = {
         .name = "TLV320AIC33",
         .stream_name = "AIC33",
         .cpu_dai_name = "omap-mcbsp.2",
-        .platform_name = "omap-pcm-audio",
+        .platform_name = "omap-mcbsp.2",
         .codec_name = "tlv320aic3x-codec.2-0018",
         .codec_dai_name = "tlv320aic3x-hifi",
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 024dafc3e298..cec836ed0c01 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -47,8 +47,7 @@ static int omap_abe_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_card *card = codec->card;
+        struct snd_soc_card *card = rtd->card;
         struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
         int clk_id, freq;
         int ret;
@@ -168,7 +167,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
 static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_card *card = codec->card;
+        struct snd_soc_card *card = rtd->card;
         struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
         int hs_trim;
         int ret = 0;
@@ -214,9 +213,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
         {
                 .name = "TWL6040",
                 .stream_name = "TWL6040",
-                .cpu_dai_name = "omap-mcpdm",
                 .codec_dai_name = "twl6040-legacy",
-                .platform_name = "omap-pcm-audio",
                 .codec_name = "twl6040-codec",
                 .init = omap_abe_twl6040_init,
                 .ops = &omap_abe_ops,
@@ -224,9 +221,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
         {
                 .name = "DMIC",
                 .stream_name = "DMIC Capture",
-                .cpu_dai_name = "omap-dmic",
                 .codec_dai_name = "dmic-hifi",
-                .platform_name = "omap-pcm-audio",
                 .codec_name = "dmic-codec",
                 .init = omap_abe_dmic_init,
                 .ops = &omap_abe_dmic_ops,
@@ -281,14 +276,14 @@ static int omap_abe_probe(struct platform_device *pdev)
                 dev_err(&pdev->dev, "McPDM node is not provided\n");
                 return -EINVAL;
         }
-        abe_twl6040_dai_links[0].cpu_dai_name  = NULL;
         abe_twl6040_dai_links[0].cpu_of_node = dai_node;
+        abe_twl6040_dai_links[0].platform_of_node = dai_node;
 
         dai_node = of_parse_phandle(node, "ti,dmic", 0);
         if (dai_node) {
                 num_links = 2;
-                abe_twl6040_dai_links[1].cpu_dai_name  = NULL;
                 abe_twl6040_dai_links[1].cpu_of_node = dai_node;
+                abe_twl6040_dai_links[1].platform_of_node = dai_node;
 
                 priv->dmic_codec_dev = platform_device_register_simple(
                                                 "dmic-codec", -1, NULL, 0);
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 1bd531d718f9..53da041896c4 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -42,6 +42,7 @@
 #include <sound/dmaengine_pcm.h>
 
 #include "omap-dmic.h"
+#include "omap-pcm.h"
 
 struct omap_dmic {
         struct device *dev;
@@ -113,7 +114,6 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream,
 
         mutex_unlock(&dmic->mutex);
 
-        snd_soc_dai_set_dma_data(dai, substream, &dmic->dma_data);
         return ret;
 }
 
@@ -417,6 +417,9 @@ static int omap_dmic_probe(struct snd_soc_dai *dai)
 
         /* Configure DMIC threshold value */
         dmic->threshold = OMAP_DMIC_THRES_MAX - 3;
+
+        snd_soc_dai_init_dma_data(dai, NULL, &dmic->dma_data);
+
         return 0;
 }
 
@@ -492,6 +495,10 @@ static int asoc_dmic_probe(struct platform_device *pdev)
         if (ret)
                 goto err_put_clk;
 
+        ret = omap_pcm_platform_register(&pdev->dev);
+        if (ret)
+                goto err_put_clk;
+
         return 0;
 
 err_put_clk:
diff --git a/sound/soc/omap/omap-hdmi-card.c b/sound/soc/omap/omap-hdmi-card.c
index 7e66e9cba5a8..f649fe84b629 100644
--- a/sound/soc/omap/omap-hdmi-card.c
+++ b/sound/soc/omap/omap-hdmi-card.c
@@ -33,7 +33,7 @@ static struct snd_soc_dai_link omap_hdmi_dai = {
         .name = "HDMI",
         .stream_name = "HDMI",
         .cpu_dai_name = "omap-hdmi-audio-dai",
-        .platform_name = "omap-pcm-audio",
+        .platform_name = "omap-hdmi-audio-dai",
         .codec_name = "hdmi-audio-codec",
         .codec_dai_name = "hdmi-hifi",
 };
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index ced3b88b44d4..537a1ec8ad61 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -36,6 +36,7 @@
 #include <video/omapdss.h>
 
 #include "omap-hdmi.h"
+#include "omap-pcm.h"
 
 #define DRV_NAME "omap-hdmi-audio-dai"
 
@@ -324,7 +325,10 @@ static int omap_hdmi_probe(struct platform_device *pdev)
         ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component,
                                          &omap_hdmi_dai, 1);
 
-        return ret;
+        if (ret)
+                return ret;
+
+        return omap_pcm_platform_register(&pdev->dev);
 }
 
 static int omap_hdmi_remove(struct platform_device *pdev)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 6c19bba23570..71d226626f7c 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -38,6 +38,7 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include "mcbsp.h"
 #include "omap-mcbsp.h"
+#include "omap-pcm.h"
 
 #define OMAP_MCBSP_RATES        (SNDRV_PCM_RATE_8000_96000)
 
@@ -149,9 +150,6 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream,
                                            SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 2);
         }
 
-        snd_soc_dai_set_dma_data(cpu_dai, substream,
-                                 &mcbsp->dma_data[substream->stream]);
-
         return err;
 }
 
@@ -559,6 +557,10 @@ static int omap_mcbsp_probe(struct snd_soc_dai *dai)
 
         pm_runtime_enable(mcbsp->dev);
 
+        snd_soc_dai_init_dma_data(dai,
+                                  &mcbsp->dma_data[SNDRV_PCM_STREAM_PLAYBACK],
+                                  &mcbsp->dma_data[SNDRV_PCM_STREAM_CAPTURE]);
+
         return 0;
 }
 
@@ -691,7 +693,7 @@ OMAP_MCBSP_SOC_SINGLE_S16_EXT("McBSP" #port " Sidetone Channel 1 Volume", \
 OMAP_MCBSP_ST_CONTROLS(2);
 OMAP_MCBSP_ST_CONTROLS(3);
 
-int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd)
+int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd, int port_id)
 {
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
@@ -701,7 +703,7 @@ int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd)
                 return 0;
         }
 
-        switch (mcbsp->id) {
+        switch (port_id) {
         case 2: /* McBSP 2 */
                 return snd_soc_add_dai_controls(cpu_dai,
                                         omap_mcbsp2_st_controls,
@@ -711,6 +713,7 @@ int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd)
                                         omap_mcbsp3_st_controls,
                                         ARRAY_SIZE(omap_mcbsp3_st_controls));
         default:
+                dev_err(mcbsp->dev, "Port %d not supported\n", port_id);
                 break;
         }
 
@@ -799,11 +802,15 @@ static int asoc_mcbsp_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, mcbsp);
 
         ret = omap_mcbsp_init(pdev);
-        if (!ret)
-                return snd_soc_register_component(&pdev->dev, &omap_mcbsp_component,
-                                                  &omap_mcbsp_dai, 1);
+        if (ret)
+                return ret;
+
+        ret = snd_soc_register_component(&pdev->dev, &omap_mcbsp_component,
+                                         &omap_mcbsp_dai, 1);
+        if (ret)
+                return ret;
 
-        return ret;
+        return omap_pcm_platform_register(&pdev->dev);
 }
 
 static int asoc_mcbsp_remove(struct platform_device *pdev)
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
index ba8386a0d8dc..2e3369c27be3 100644
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
@@ -39,6 +39,6 @@ enum omap_mcbsp_div {
         OMAP_MCBSP_CLKGDV,              /* Sample rate generator divider */
 };
 
-int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd);
+int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd, int port_id);
 
 #endif
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 2f5b1536477e..d8ebb52645a9 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -42,6 +42,7 @@
 #include <sound/dmaengine_pcm.h>
 
 #include "omap-mcpdm.h"
+#include "omap-pcm.h"
 
 struct mcpdm_link_config {
         u32 link_mask; /* channel mask for the direction */
@@ -265,9 +266,6 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
         }
         mutex_unlock(&mcpdm->mutex);
 
-        snd_soc_dai_set_dma_data(dai, substream,
-                                 &mcpdm->dma_data[substream->stream]);
-
         return 0;
 }
 
@@ -406,6 +404,11 @@ static int omap_mcpdm_probe(struct snd_soc_dai *dai)
         mcpdm->config[SNDRV_PCM_STREAM_PLAYBACK].threshold = 2;
         mcpdm->config[SNDRV_PCM_STREAM_CAPTURE].threshold =
                                                         MCPDM_UP_THRES_MAX - 3;
+
+        snd_soc_dai_init_dma_data(dai,
+                                  &mcpdm->dma_data[SNDRV_PCM_STREAM_PLAYBACK],
+                                  &mcpdm->dma_data[SNDRV_PCM_STREAM_CAPTURE]);
+
         return ret;
 }
 
@@ -460,6 +463,7 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
 {
         struct omap_mcpdm *mcpdm;
         struct resource *res;
+        int ret;
 
         mcpdm = devm_kzalloc(&pdev->dev, sizeof(struct omap_mcpdm), GFP_KERNEL);
         if (!mcpdm)
@@ -490,9 +494,13 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
 
         mcpdm->dev = &pdev->dev;
 
-        return devm_snd_soc_register_component(&pdev->dev,
+        ret =  devm_snd_soc_register_component(&pdev->dev,
                                                &omap_mcpdm_component,
                                                &omap_mcpdm_dai, 1);
+        if (ret)
+                return ret;
+
+        return omap_pcm_platform_register(&pdev->dev);
 }
 
 static const struct of_device_id omap_mcpdm_of_match[] = {
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c
index 07b8b7bc9d20..8d809f8509c8 100644
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@ -232,31 +232,12 @@ static struct snd_soc_platform_driver omap_soc_platform = {
         .pcm_free       = omap_pcm_free_dma_buffers,
 };
 
-static int omap_pcm_probe(struct platform_device *pdev)
+int omap_pcm_platform_register(struct device *dev)
 {
-        return snd_soc_register_platform(&pdev->dev,
-                        &omap_soc_platform);
+        return devm_snd_soc_register_platform(dev, &omap_soc_platform);
 }
-
-static int omap_pcm_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_platform(&pdev->dev);
-        return 0;
-}
-
-static struct platform_driver omap_pcm_driver = {
-        .driver = {
-                        .name = "omap-pcm-audio",
-                        .owner = THIS_MODULE,
-        },
-
-        .probe = omap_pcm_probe,
-        .remove = omap_pcm_remove,
-};
-
-module_platform_driver(omap_pcm_driver);
+EXPORT_SYMBOL_GPL(omap_pcm_platform_register);
 
 MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>");
 MODULE_DESCRIPTION("OMAP PCM DMA module");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:omap-pcm-audio");
diff --git a/sound/soc/omap/omap-pcm.h b/sound/soc/omap/omap-pcm.h
new file mode 100644
index 000000000000..c1d2f31d71e9
--- /dev/null
+++ b/sound/soc/omap/omap-pcm.h
@@ -0,0 +1,30 @@
+/*
+ * omap-pcm.h - OMAP PCM driver
+ *
+ * Copyright (C) 2014 Texas Instruments, Inc.
+ *
+ * Author: Peter Ujfalusi <peter.ujfalusi@ti.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.
+ *
+ * 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 __OMAP_PCM_H__
+#define __OMAP_PCM_H__
+
+#if IS_ENABLED(CONFIG_SND_OMAP_SOC)
+int omap_pcm_platform_register(struct device *dev);
+#else
+static inline int omap_pcm_platform_register(struct device *dev)
+{
+        return 0;
+}
+#endif /* CONFIG_SND_OMAP_SOC */
+
+#endif /* __OMAP_PCM_H__ */
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index 6a8d6b5f160d..64141db311b2 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -55,8 +55,7 @@ static int omap_twl4030_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_card *card = codec->card;
+        struct snd_soc_card *card = rtd->card;
         unsigned int fmt;
         int ret;
 
@@ -179,7 +178,7 @@ static inline void twl4030_disconnect_pin(struct snd_soc_dapm_context *dapm,
 static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_card *card = codec->card;
+        struct snd_soc_card *card = rtd->card;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
         struct omap_tw4030_pdata *pdata = dev_get_platdata(card->dev);
         struct omap_twl4030 *priv = snd_soc_card_get_drvdata(card);
@@ -239,7 +238,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
                 .stream_name = "TWL4030 HiFi",
                 .cpu_dai_name = "omap-mcbsp.2",
                 .codec_dai_name = "twl4030-hifi",
-                .platform_name = "omap-pcm-audio",
+                .platform_name = "omap-mcbsp.2",
                 .codec_name = "twl4030-codec",
                 .init = omap_twl4030_init,
                 .ops = &omap_twl4030_ops,
@@ -249,7 +248,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
                 .stream_name = "TWL4030 Voice",
                 .cpu_dai_name = "omap-mcbsp.3",
                 .codec_dai_name = "twl4030-voice",
-                .platform_name = "omap-pcm-audio",
+                .platform_name = "omap-mcbsp.2",
                 .codec_name = "twl4030-codec",
                 .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
                            SND_SOC_DAIFMT_CBM_CFM,
@@ -299,12 +298,18 @@ static int omap_twl4030_probe(struct platform_device *pdev)
                 omap_twl4030_dai_links[0].cpu_dai_name  = NULL;
                 omap_twl4030_dai_links[0].cpu_of_node = dai_node;
 
+                omap_twl4030_dai_links[0].platform_name  = NULL;
+                omap_twl4030_dai_links[0].platform_of_node = dai_node;
+
                 dai_node = of_parse_phandle(node, "ti,mcbsp-voice", 0);
                 if (!dai_node) {
                         card->num_links = 1;
                 } else {
                         omap_twl4030_dai_links[1].cpu_dai_name  = NULL;
                         omap_twl4030_dai_links[1].cpu_of_node = dai_node;
+
+                        omap_twl4030_dai_links[1].platform_name  = NULL;
+                        omap_twl4030_dai_links[1].platform_of_node = dai_node;
                 }
 
                 priv->jack_detect = of_get_named_gpio(node,
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index cf604a2faa18..076bec606d78 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -121,7 +121,7 @@ static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w,
  *  |A| <~~clk~~+
  *  |P| <--- TWL4030 <--------- Line In and MICs
  */
-static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = {
+static const struct snd_soc_dapm_widget omap3pandora_dapm_widgets[] = {
         SND_SOC_DAPM_DAC_E("PCM DAC", "HiFi Playback", SND_SOC_NOPM,
                            0, 0, omap3pandora_dac_event,
                            SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
@@ -130,22 +130,18 @@ static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = {
                            SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
         SND_SOC_DAPM_HP("Headphone Jack", NULL),
         SND_SOC_DAPM_LINE("Line Out", NULL),
-};
 
-static const struct snd_soc_dapm_widget omap3pandora_in_dapm_widgets[] = {
         SND_SOC_DAPM_MIC("Mic (internal)", NULL),
         SND_SOC_DAPM_MIC("Mic (external)", NULL),
         SND_SOC_DAPM_LINE("Line In", NULL),
 };
 
-static const struct snd_soc_dapm_route omap3pandora_out_map[] = {
+static const struct snd_soc_dapm_route omap3pandora_map[] = {
         {"PCM DAC", NULL, "APLL Enable"},
         {"Headphone Amplifier", NULL, "PCM DAC"},
         {"Line Out", NULL, "PCM DAC"},
         {"Headphone Jack", NULL, "Headphone Amplifier"},
-};
 
-static const struct snd_soc_dapm_route omap3pandora_in_map[] = {
         {"AUXL", NULL, "Line In"},
         {"AUXR", NULL, "Line In"},
 
@@ -160,7 +156,6 @@ static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
-        int ret;
 
         /* All TWL4030 output pins are floating */
         snd_soc_dapm_nc_pin(dapm, "EARPIECE");
@@ -174,20 +169,13 @@ static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "HFR");
         snd_soc_dapm_nc_pin(dapm, "VIBRA");
 
-        ret = snd_soc_dapm_new_controls(dapm, omap3pandora_out_dapm_widgets,
-                                ARRAY_SIZE(omap3pandora_out_dapm_widgets));
-        if (ret < 0)
-                return ret;
-
-        return snd_soc_dapm_add_routes(dapm, omap3pandora_out_map,
-                ARRAY_SIZE(omap3pandora_out_map));
+        return 0;
 }
 
 static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
-        int ret;
 
         /* Not comnnected */
         snd_soc_dapm_nc_pin(dapm, "HSMIC");
@@ -195,13 +183,7 @@ static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "DIGIMIC0");
         snd_soc_dapm_nc_pin(dapm, "DIGIMIC1");
 
-        ret = snd_soc_dapm_new_controls(dapm, omap3pandora_in_dapm_widgets,
-                                ARRAY_SIZE(omap3pandora_in_dapm_widgets));
-        if (ret < 0)
-                return ret;
-
-        return snd_soc_dapm_add_routes(dapm, omap3pandora_in_map,
-                ARRAY_SIZE(omap3pandora_in_map));
+        return 0;
 }
 
 static struct snd_soc_ops omap3pandora_ops = {
@@ -215,7 +197,7 @@ static struct snd_soc_dai_link omap3pandora_dai[] = {
                 .stream_name = "HiFi Out",
                 .cpu_dai_name = "omap-mcbsp.2",
                 .codec_dai_name = "twl4030-hifi",
-                .platform_name = "omap-pcm-audio",
+                .platform_name = "omap-mcbsp.2",
                 .codec_name = "twl4030-codec",
                 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                            SND_SOC_DAIFMT_CBS_CFS,
@@ -226,7 +208,7 @@ static struct snd_soc_dai_link omap3pandora_dai[] = {
                 .stream_name = "Line/Mic In",
                 .cpu_dai_name = "omap-mcbsp.4",
                 .codec_dai_name = "twl4030-hifi",
-                .platform_name = "omap-pcm-audio",
+                .platform_name = "omap-mcbsp.4",
                 .codec_name = "twl4030-codec",
                 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                            SND_SOC_DAIFMT_CBS_CFS,
@@ -241,6 +223,11 @@ static struct snd_soc_card snd_soc_card_omap3pandora = {
         .owner = THIS_MODULE,
         .dai_link = omap3pandora_dai,
         .num_links = ARRAY_SIZE(omap3pandora_dai),
+
+        .dapm_widgets = omap3pandora_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(omap3pandora_dapm_widgets),
+        .dapm_routes = omap3pandora_map,
+        .num_dapm_routes = ARRAY_SIZE(omap3pandora_map),
 };
 
 static struct platform_device *omap3pandora_snd_device;
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index d03e57da7708..aa4053bf6710 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -96,7 +96,7 @@ static struct snd_soc_dai_link osk_dai = {
         .stream_name = "AIC23",
         .cpu_dai_name = "omap-mcbsp.1",
         .codec_dai_name = "tlv320aic23-hifi",
-        .platform_name = "omap-pcm-audio",
+        .platform_name = "omap-mcbsp.1",
         .codec_name = "tlv320aic23-codec",
         .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
                    SND_SOC_DAIFMT_CBM_CFM,
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 7fb3d4b10370..6951dc812055 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 #include <sound/core.h>
 #include <sound/jack.h>
@@ -38,15 +39,6 @@
 
 #include "omap-mcbsp.h"
 
-#define RX51_TVOUT_SEL_GPIO             40
-#define RX51_JACK_DETECT_GPIO           177
-#define RX51_ECI_SW_GPIO                182
-/*
- * REVISIT: TWL4030 GPIO base in RX-51. Now statically defined to 192. This
- * gpio is reserved in arch/arm/mach-omap2/board-rx51-peripherals.c
- */
-#define RX51_SPEAKER_AMP_TWL_GPIO       (192 + 7)
-
 enum {
         RX51_JACK_DISABLED,
         RX51_JACK_TVOUT,                /* tv-out with stereo output */
@@ -54,12 +46,21 @@ enum {
         RX51_JACK_HS,                   /* headset: stereo output with mic */
 };
 
+struct rx51_audio_pdata {
+        struct gpio_desc *tvout_selection_gpio;
+        struct gpio_desc *jack_detection_gpio;
+        struct gpio_desc *eci_sw_gpio;
+        struct gpio_desc *speaker_amp_gpio;
+};
+
 static int rx51_spk_func;
 static int rx51_dmic_func;
 static int rx51_jack_func;
 
 static void rx51_ext_control(struct snd_soc_dapm_context *dapm)
 {
+        struct snd_soc_card *card = dapm->card;
+        struct rx51_audio_pdata *pdata = snd_soc_card_get_drvdata(card);
         int hp = 0, hs = 0, tvout = 0;
 
         switch (rx51_jack_func) {
@@ -93,7 +94,7 @@ static void rx51_ext_control(struct snd_soc_dapm_context *dapm)
         else
                 snd_soc_dapm_disable_pin_unlocked(dapm, "HS Mic");
 
-        gpio_set_value(RX51_TVOUT_SEL_GPIO, tvout);
+        gpiod_set_value(pdata->tvout_selection_gpio, tvout);
 
         snd_soc_dapm_sync_unlocked(dapm);
 
@@ -154,10 +155,12 @@ static int rx51_set_spk(struct snd_kcontrol *kcontrol,
 static int rx51_spk_event(struct snd_soc_dapm_widget *w,
                           struct snd_kcontrol *k, int event)
 {
-        if (SND_SOC_DAPM_EVENT_ON(event))
-                gpio_set_value_cansleep(RX51_SPEAKER_AMP_TWL_GPIO, 1);
-        else
-                gpio_set_value_cansleep(RX51_SPEAKER_AMP_TWL_GPIO, 0);
+        struct snd_soc_dapm_context *dapm = w->dapm;
+        struct snd_soc_card *card = dapm->card;
+        struct rx51_audio_pdata *pdata = snd_soc_card_get_drvdata(card);
+
+        gpiod_set_raw_value_cansleep(pdata->speaker_amp_gpio,
+                                     !!SND_SOC_DAPM_EVENT_ON(event));
 
         return 0;
 }
@@ -223,7 +226,6 @@ static struct snd_soc_jack rx51_av_jack;
 
 static struct snd_soc_jack_gpio rx51_av_jack_gpios[] = {
         {
-                .gpio = RX51_JACK_DETECT_GPIO,
                 .name = "avdet-gpio",
                 .report = SND_JACK_HEADSET,
                 .invert = 1,
@@ -237,9 +239,6 @@ static const struct snd_soc_dapm_widget aic34_dapm_widgets[] = {
         SND_SOC_DAPM_HP("Headphone Jack", rx51_hp_event),
         SND_SOC_DAPM_MIC("HS Mic", NULL),
         SND_SOC_DAPM_LINE("FM Transmitter", NULL),
-};
-
-static const struct snd_soc_dapm_widget aic34_dapm_widgetsb[] = {
         SND_SOC_DAPM_SPK("Earphone", NULL),
 };
 
@@ -253,9 +252,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
 
         {"DMic Rate 64", NULL, "Mic Bias"},
         {"Mic Bias", NULL, "DMic"},
-};
 
-static const struct snd_soc_dapm_route audio_mapb[] = {
         {"b LINE2R", NULL, "MONO_LOUT"},
         {"Earphone", NULL, "b HPLOUT"},
 
@@ -263,9 +260,11 @@ static const struct snd_soc_dapm_route audio_mapb[] = {
         {"b Mic Bias", NULL, "HS Mic"}
 };
 
-static const char *spk_function[] = {"Off", "On"};
-static const char *input_function[] = {"ADC", "Digital Mic"};
-static const char *jack_function[] = {"Off", "TV-OUT", "Headphone", "Headset"};
+static const char * const spk_function[] = {"Off", "On"};
+static const char * const input_function[] = {"ADC", "Digital Mic"};
+static const char * const jack_function[] = {
+        "Off", "TV-OUT", "Headphone", "Headset"
+};
 
 static const struct soc_enum rx51_enum[] = {
         SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),
@@ -281,15 +280,15 @@ static const struct snd_kcontrol_new aic34_rx51_controls[] = {
         SOC_ENUM_EXT("Jack Function", rx51_enum[2],
                      rx51_get_jack, rx51_set_jack),
         SOC_DAPM_PIN_SWITCH("FM Transmitter"),
-};
-
-static const struct snd_kcontrol_new aic34_rx51_controlsb[] = {
         SOC_DAPM_PIN_SWITCH("Earphone"),
 };
 
 static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_card *card = rtd->card;
+        struct rx51_audio_pdata *pdata = snd_soc_card_get_drvdata(card);
+
         struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
@@ -298,57 +297,41 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "MIC3R");
         snd_soc_dapm_nc_pin(dapm, "LINE1R");
 
-        /* Add RX-51 specific controls */
-        err = snd_soc_add_card_controls(rtd->card, aic34_rx51_controls,
-                                   ARRAY_SIZE(aic34_rx51_controls));
-        if (err < 0)
-                return err;
-
-        /* Add RX-51 specific widgets */
-        snd_soc_dapm_new_controls(dapm, aic34_dapm_widgets,
-                                  ARRAY_SIZE(aic34_dapm_widgets));
-
-        /* Set up RX-51 specific audio path audio_map */
-        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
         err = tpa6130a2_add_controls(codec);
-        if (err < 0)
+        if (err < 0) {
+                dev_err(card->dev, "Failed to add TPA6130A2 controls\n");
                 return err;
+        }
         snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42);
 
-        err = omap_mcbsp_st_add_controls(rtd);
-        if (err < 0)
+        err = omap_mcbsp_st_add_controls(rtd, 2);
+        if (err < 0) {
+                dev_err(card->dev, "Failed to add MCBSP controls\n");
                 return err;
+        }
 
         /* AV jack detection */
         err = snd_soc_jack_new(codec, "AV Jack",
                                SND_JACK_HEADSET | SND_JACK_VIDEOOUT,
                                &rx51_av_jack);
-        if (err)
+        if (err) {
+                dev_err(card->dev, "Failed to add AV Jack\n");
                 return err;
+        }
+
+        /* prepare gpio for snd_soc_jack_add_gpios */
+        rx51_av_jack_gpios[0].gpio = desc_to_gpio(pdata->jack_detection_gpio);
+        devm_gpiod_put(card->dev, pdata->jack_detection_gpio);
+
         err = snd_soc_jack_add_gpios(&rx51_av_jack,
                                      ARRAY_SIZE(rx51_av_jack_gpios),
                                      rx51_av_jack_gpios);
-
-        return err;
-}
-
-static int rx51_aic34b_init(struct snd_soc_dapm_context *dapm)
-{
-        int err;
-
-        err = snd_soc_add_card_controls(dapm->card, aic34_rx51_controlsb,
-                                   ARRAY_SIZE(aic34_rx51_controlsb));
-        if (err < 0)
+        if (err) {
+                dev_err(card->dev, "Failed to add GPIOs\n");
                 return err;
+        }
 
-        err = snd_soc_dapm_new_controls(dapm, aic34_dapm_widgetsb,
-                                        ARRAY_SIZE(aic34_dapm_widgetsb));
-        if (err < 0)
-                return 0;
-
-        return snd_soc_dapm_add_routes(dapm, audio_mapb,
-                                       ARRAY_SIZE(audio_mapb));
+        return err;
 }
 
 /* Digital audio interface glue - connects codec <--> CPU */
@@ -358,7 +341,7 @@ static struct snd_soc_dai_link rx51_dai[] = {
                 .stream_name = "AIC34",
                 .cpu_dai_name = "omap-mcbsp.2",
                 .codec_dai_name = "tlv320aic3x-hifi",
-                .platform_name = "omap-pcm-audio",
+                .platform_name = "omap-mcbsp.2",
                 .codec_name = "tlv320aic3x-codec.2-0018",
                 .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
                            SND_SOC_DAIFMT_CBM_CFM,
@@ -371,7 +354,6 @@ static struct snd_soc_aux_dev rx51_aux_dev[] = {
         {
                 .name = "TLV320AIC34b",
                 .codec_name = "tlv320aic3x-codec.2-0019",
-                .init = rx51_aic34b_init,
         },
 };
 
@@ -392,63 +374,160 @@ static struct snd_soc_card rx51_sound_card = {
         .num_aux_devs = ARRAY_SIZE(rx51_aux_dev),
         .codec_conf = rx51_codec_conf,
         .num_configs = ARRAY_SIZE(rx51_codec_conf),
-};
 
-static struct platform_device *rx51_snd_device;
+        .controls = aic34_rx51_controls,
+        .num_controls = ARRAY_SIZE(aic34_rx51_controls),
+        .dapm_widgets = aic34_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(aic34_dapm_widgets),
+        .dapm_routes = audio_map,
+        .num_dapm_routes = ARRAY_SIZE(audio_map),
+};
 
-static int __init rx51_soc_init(void)
+static int rx51_soc_probe(struct platform_device *pdev)
 {
+        struct rx51_audio_pdata *pdata;
+        struct device_node *np = pdev->dev.of_node;
+        struct snd_soc_card *card = &rx51_sound_card;
         int err;
 
         if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
                 return -ENODEV;
 
-        err = gpio_request_one(RX51_TVOUT_SEL_GPIO,
-                               GPIOF_DIR_OUT | GPIOF_INIT_LOW, "tvout_sel");
-        if (err)
-                goto err_gpio_tvout_sel;
-        err = gpio_request_one(RX51_ECI_SW_GPIO,
-                               GPIOF_DIR_OUT | GPIOF_INIT_HIGH, "eci_sw");
-        if (err)
-                goto err_gpio_eci_sw;
-
-        rx51_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!rx51_snd_device) {
-                err = -ENOMEM;
-                goto err1;
+        card->dev = &pdev->dev;
+
+        if (np) {
+                struct device_node *dai_node;
+
+                dai_node = of_parse_phandle(np, "nokia,cpu-dai", 0);
+                if (!dai_node) {
+                        dev_err(&pdev->dev, "McBSP node is not provided\n");
+                        return -EINVAL;
+                }
+                rx51_dai[0].cpu_dai_name = NULL;
+                rx51_dai[0].platform_name = NULL;
+                rx51_dai[0].cpu_of_node = dai_node;
+                rx51_dai[0].platform_of_node = dai_node;
+
+                dai_node = of_parse_phandle(np, "nokia,audio-codec", 0);
+                if (!dai_node) {
+                        dev_err(&pdev->dev, "Codec node is not provided\n");
+                        return -EINVAL;
+                }
+                rx51_dai[0].codec_name = NULL;
+                rx51_dai[0].codec_of_node = dai_node;
+
+                dai_node = of_parse_phandle(np, "nokia,audio-codec", 1);
+                if (!dai_node) {
+                        dev_err(&pdev->dev, "Auxiliary Codec node is not provided\n");
+                        return -EINVAL;
+                }
+                rx51_aux_dev[0].codec_name = NULL;
+                rx51_aux_dev[0].codec_of_node = dai_node;
+                rx51_codec_conf[0].dev_name = NULL;
+                rx51_codec_conf[0].of_node = dai_node;
+
+                dai_node = of_parse_phandle(np, "nokia,headphone-amplifier", 0);
+                if (!dai_node) {
+                        dev_err(&pdev->dev, "Headphone amplifier node is not provided\n");
+                        return -EINVAL;
+                }
+
+                /* TODO: tpa6130a2a driver supports only a single instance, so
+                 * this driver ignores the headphone-amplifier node for now.
+                 * It's already mandatory in the DT binding to be future proof.
+                 */
         }
 
-        platform_set_drvdata(rx51_snd_device, &rx51_sound_card);
+        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+        if (pdata == NULL) {
+                dev_err(card->dev, "failed to create private data\n");
+                return -ENOMEM;
+        }
+        snd_soc_card_set_drvdata(card, pdata);
 
-        err = platform_device_add(rx51_snd_device);
-        if (err)
-                goto err2;
+        pdata->tvout_selection_gpio = devm_gpiod_get(card->dev,
+                                                     "tvout-selection");
+        if (IS_ERR(pdata->tvout_selection_gpio)) {
+                dev_err(card->dev, "could not get tvout selection gpio\n");
+                return PTR_ERR(pdata->tvout_selection_gpio);
+        }
 
-        return 0;
-err2:
-        platform_device_put(rx51_snd_device);
-err1:
-        gpio_free(RX51_ECI_SW_GPIO);
-err_gpio_eci_sw:
-        gpio_free(RX51_TVOUT_SEL_GPIO);
-err_gpio_tvout_sel:
+        err = gpiod_direction_output(pdata->tvout_selection_gpio, 0);
+        if (err) {
+                dev_err(card->dev, "could not setup tvout selection gpio\n");
+                return err;
+        }
 
-        return err;
+        pdata->jack_detection_gpio = devm_gpiod_get(card->dev,
+                                                    "jack-detection");
+        if (IS_ERR(pdata->jack_detection_gpio)) {
+                dev_err(card->dev, "could not get jack detection gpio\n");
+                return PTR_ERR(pdata->jack_detection_gpio);
+        }
+
+        pdata->eci_sw_gpio = devm_gpiod_get(card->dev, "eci-switch");
+        if (IS_ERR(pdata->eci_sw_gpio)) {
+                dev_err(card->dev, "could not get eci switch gpio\n");
+                return PTR_ERR(pdata->eci_sw_gpio);
+        }
+
+        err = gpiod_direction_output(pdata->eci_sw_gpio, 1);
+        if (err) {
+                dev_err(card->dev, "could not setup eci switch gpio\n");
+                return err;
+        }
+
+        pdata->speaker_amp_gpio = devm_gpiod_get(card->dev,
+                                                 "speaker-amplifier");
+        if (IS_ERR(pdata->speaker_amp_gpio)) {
+                dev_err(card->dev, "could not get speaker enable gpio\n");
+                return PTR_ERR(pdata->speaker_amp_gpio);
+        }
+
+        err = gpiod_direction_output(pdata->speaker_amp_gpio, 0);
+        if (err) {
+                dev_err(card->dev, "could not setup speaker enable gpio\n");
+                return err;
+        }
+
+        err = devm_snd_soc_register_card(card->dev, card);
+        if (err) {
+                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", err);
+                return err;
+        }
+
+        return 0;
 }
 
-static void __exit rx51_soc_exit(void)
+static int rx51_soc_remove(struct platform_device *pdev)
 {
         snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios),
                                 rx51_av_jack_gpios);
 
-        platform_device_unregister(rx51_snd_device);
-        gpio_free(RX51_ECI_SW_GPIO);
-        gpio_free(RX51_TVOUT_SEL_GPIO);
+        return 0;
 }
 
-module_init(rx51_soc_init);
-module_exit(rx51_soc_exit);
+#if defined(CONFIG_OF)
+static const struct of_device_id rx51_audio_of_match[] = {
+        { .compatible = "nokia,n900-audio", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, rx51_audio_of_match);
+#endif
+
+static struct platform_driver rx51_soc_driver = {
+        .driver = {
+                .name = "rx51-audio",
+                .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(rx51_audio_of_match),
+        },
+        .probe = rx51_soc_probe,
+        .remove = rx51_soc_remove,
+};
+
+module_platform_driver(rx51_soc_driver);
 
 MODULE_AUTHOR("Nokia Corporation");
 MODULE_DESCRIPTION("ALSA SoC Nokia RX-51");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:rx51-audio");
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 6473052b6899..6acb225ec6fd 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -140,7 +140,7 @@ config SND_PXA910_SOC
 
 config SND_SOC_TTC_DKB
         bool "SoC Audio support for TTC DKB"
-        depends on SND_PXA910_SOC && MACH_TTC_DKB
+        depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y
         select PXA_SSP
         select SND_PXA_SOC_SSP
         select SND_MMP_SOC
diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
index 08acdc236bf8..c8dd53f9c35d 100644
--- a/sound/soc/pxa/brownstone.c
+++ b/sound/soc/pxa/brownstone.c
@@ -50,11 +50,6 @@ static int brownstone_wm8994_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_enable_pin(dapm, "Ext Spk");
-        snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
-        snd_soc_dapm_enable_pin(dapm, "Headset Mic");
-        snd_soc_dapm_enable_pin(dapm, "Main Mic");
-
         /* set endpoints to not connected */
         snd_soc_dapm_nc_pin(dapm, "HPOUT2P");
         snd_soc_dapm_nc_pin(dapm, "HPOUT2N");
@@ -70,8 +65,6 @@ static int brownstone_wm8994_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
         snd_soc_dapm_nc_pin(dapm, "IN2LN");
 
-        snd_soc_dapm_sync(dapm);
-
         return 0;
 }
 
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index 3284c4b901cb..17f9521ff6ea 100644
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -79,14 +79,6 @@ static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
-        /* connected pins */
-        if (machine_is_palmld())
-                snd_soc_dapm_enable_pin(dapm, "MIC1");
-        snd_soc_dapm_enable_pin(dapm, "HPOUTL");
-        snd_soc_dapm_enable_pin(dapm, "HPOUTR");
-        snd_soc_dapm_enable_pin(dapm, "LOUT2");
-        snd_soc_dapm_enable_pin(dapm, "ROUT2");
-
         /* not connected pins */
         snd_soc_dapm_nc_pin(dapm, "OUT3");
         snd_soc_dapm_nc_pin(dapm, "MONOOUT");
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index c6bdc6c0eff6..21f340065318 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -230,7 +230,6 @@ static int poodle_wm8731_init(struct snd_soc_pcm_runtime *rtd)
 
         snd_soc_dapm_nc_pin(dapm, "LLINEIN");
         snd_soc_dapm_nc_pin(dapm, "RLINEIN");
-        snd_soc_dapm_enable_pin(dapm, "MICIN");
 
         return 0;
 }
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index a3119a00d8fa..9b19ee70291f 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -34,8 +34,6 @@
 #include <sound/pxa2xx-lib.h>
 #include <sound/dmaengine_pcm.h>
 
-#include <mach/hardware.h>
-
 #include "../../arm/pxa2xx-pcm.h"
 #include "pxa-ssp.h"
 
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index d58b09f4f7a4..42f2f0175981 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -15,6 +15,8 @@
 #include <linux/dmaengine.h>
 #include <linux/of.h>
 
+#include <mach/dma.h>
+
 #include <sound/core.h>
 #include <sound/soc.h>
 #include <sound/pxa2xx-lib.h>
diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c
index 0b535b570622..9d7c5b7e9539 100644
--- a/sound/soc/pxa/ttc-dkb.c
+++ b/sound/soc/pxa/ttc-dkb.c
@@ -78,10 +78,6 @@ static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        /* connected pins */
-        snd_soc_dapm_enable_pin(dapm, "Ext Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Ext Mic 1");
-        snd_soc_dapm_enable_pin(dapm, "Ext Mic 3");
         snd_soc_dapm_disable_pin(dapm, "Headset Mic 2");
         snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
 
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index f2e289180e46..753b8c93ab51 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -64,6 +64,7 @@ config SND_SOC_SAMSUNG_JIVE_WM8750
 config SND_SOC_SAMSUNG_SMDK_WM8580
         tristate "SoC I2S Audio support for WM8580 on SMDK"
         depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110)
+        depends on REGMAP_I2C
         select SND_SOC_WM8580
         select SND_SAMSUNG_I2S
         help
@@ -115,21 +116,21 @@ config SND_SOC_SAMSUNG_SIMTEC
 
 config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23
         tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"
-        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
+        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX && I2C
         select SND_S3C24XX_I2S
         select SND_SOC_TLV320AIC23_I2C
         select SND_SOC_SAMSUNG_SIMTEC
 
 config SND_SOC_SAMSUNG_SIMTEC_HERMES
         tristate "SoC I2S Audio support for Simtec Hermes board"
-        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
+        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX && I2C
         select SND_S3C24XX_I2S
         select SND_SOC_TLV320AIC3X
         select SND_SOC_SAMSUNG_SIMTEC
 
 config SND_SOC_SAMSUNG_H1940_UDA1380
         tristate "Audio support for the HP iPAQ H1940"
-        depends on SND_SOC_SAMSUNG && ARCH_H1940
+        depends on SND_SOC_SAMSUNG && ARCH_H1940 && I2C
         select SND_S3C24XX_I2S
         select SND_SOC_UDA1380
         help
@@ -137,7 +138,7 @@ config SND_SOC_SAMSUNG_H1940_UDA1380
 
 config SND_SOC_SAMSUNG_RX1950_UDA1380
         tristate "Audio support for the HP iPAQ RX1950"
-        depends on SND_SOC_SAMSUNG && MACH_RX1950
+        depends on SND_SOC_SAMSUNG && MACH_RX1950 && I2C
         select SND_S3C24XX_I2S
         select SND_SOC_UDA1380
         help
@@ -178,6 +179,7 @@ config SND_SOC_SAMSUNG_SMDK_SPDIF
 config SND_SOC_SMDK_WM8580_PCM
         tristate "SoC PCM Audio support for WM8580 on SMDK"
         depends on SND_SOC_SAMSUNG && (MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110)
+        depends on REGMAP_I2C
         select SND_SOC_WM8580
         select SND_SAMSUNG_PCM
         help
@@ -204,7 +206,7 @@ config SND_SOC_SPEYSIDE
 
 config SND_SOC_TOBERMORY
         tristate "Audio support for Wolfson Tobermory"
-        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
+        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && INPUT
         select SND_SAMSUNG_I2S
         select SND_SOC_WM8962
 
@@ -231,3 +233,13 @@ config SND_SOC_LITTLEMILL
         select SND_SAMSUNG_I2S
         select MFD_WM8994
         select SND_SOC_WM8994
+
+config SND_SOC_SNOW
+        tristate "Audio support for Google Snow boards"
+        depends on SND_SOC_SAMSUNG
+        select SND_SOC_MAX98090
+        select SND_SOC_MAX98095
+        select SND_SAMSUNG_I2S
+        help
+          Say Y if you want to add audio support for various Snow
+          boards based on Exynos5 series of SoCs.
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index 86715d8efee6..6d0212ba571c 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -34,6 +34,7 @@ snd-soc-h1940-uda1380-objs := h1940_uda1380.o
 snd-soc-rx1950-uda1380-objs := rx1950_uda1380.o
 snd-soc-smdk-wm8580-objs := smdk_wm8580.o
 snd-soc-smdk-wm8994-objs := smdk_wm8994.o
+snd-soc-snow-objs := snow.o
 snd-soc-smdk-wm9713-objs := smdk_wm9713.o
 snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o
 snd-soc-goni-wm8994-objs := goni_wm8994.o
@@ -58,6 +59,7 @@ obj-$(CONFIG_SND_SOC_SAMSUNG_H1940_UDA1380) += snd-soc-h1940-uda1380.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8580) += snd-soc-smdk-wm8580.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994) += snd-soc-smdk-wm8994.o
+obj-$(CONFIG_SND_SOC_SNOW) += snd-soc-snow.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o
 obj-$(CONFIG_SND_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 76b072bd4ba2..68d9303047e8 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -433,7 +433,7 @@ static int s3c_ac97_probe(struct platform_device *pdev)
                 goto err4;
         }
 
-        ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
+        ret = devm_snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
                                          s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));
         if (ret)
                 goto err5;
@@ -441,12 +441,10 @@ static int s3c_ac97_probe(struct platform_device *pdev)
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);
-                goto err6;
+                goto err5;
         }
 
         return 0;
-err6:
-        snd_soc_unregister_component(&pdev->dev);
 err5:
         free_irq(irq_res->start, NULL);
 err4:
@@ -461,9 +459,6 @@ static int s3c_ac97_remove(struct platform_device *pdev)
 {
         struct resource *irq_res;
 
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-
         irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (irq_res)
                 free_irq(irq_res->start, NULL);
diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
index 84f5d8b76679..5b21207cf551 100644
--- a/sound/soc/samsung/bells.c
+++ b/sound/soc/samsung/bells.c
@@ -433,22 +433,13 @@ static int bells_probe(struct platform_device *pdev)
 
         bells_cards[pdev->id].dev = &pdev->dev;
 
-        ret = snd_soc_register_card(&bells_cards[pdev->id]);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, &bells_cards[pdev->id]);
+        if (ret)
                 dev_err(&pdev->dev,
                         "snd_soc_register_card(%s) failed: %d\n",
                         bells_cards[pdev->id].name, ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int bells_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_card(&bells_cards[pdev->id]);
 
-        return 0;
+        return ret;
 }
 
 static struct platform_driver bells_driver = {
@@ -458,7 +449,6 @@ static struct platform_driver bells_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = bells_probe,
-        .remove = bells_remove,
 };
 
 module_platform_driver(bells_driver);
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
index dc09b71b7d9f..d9dc7bcc0336 100644
--- a/sound/soc/samsung/dma.c
+++ b/sound/soc/samsung/dma.c
@@ -445,16 +445,10 @@ EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);
 
 int samsung_asoc_dma_platform_register(struct device *dev)
 {
-        return snd_soc_register_platform(dev, &samsung_asoc_platform);
+        return devm_snd_soc_register_platform(dev, &samsung_asoc_platform);
 }
 EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);
 
-void samsung_asoc_dma_platform_unregister(struct device *dev)
-{
-        snd_soc_unregister_platform(dev);
-}
-EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_unregister);
-
 MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
 MODULE_DESCRIPTION("Samsung ASoC DMA Driver");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h
index ad7c0f04f00d..070ab0f09609 100644
--- a/sound/soc/samsung/dma.h
+++ b/sound/soc/samsung/dma.h
@@ -33,6 +33,5 @@ void samsung_asoc_init_dma_data(struct snd_soc_dai *dai,
                                 struct s3c_dma_params *playback,
                                 struct s3c_dma_params *capture);
 int samsung_asoc_dma_platform_register(struct device *dev);
-void samsung_asoc_dma_platform_unregister(struct device *dev);
 
 #endif
diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c
index 750ce5808d9f..a0e4e7948909 100644
--- a/sound/soc/samsung/dmaengine.c
+++ b/sound/soc/samsung/dmaengine.c
@@ -66,18 +66,13 @@ EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);
 
 int samsung_asoc_dma_platform_register(struct device *dev)
 {
-        return snd_dmaengine_pcm_register(dev, &samsung_dmaengine_pcm_config,
-                                          SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME |
-                                          SND_DMAENGINE_PCM_FLAG_COMPAT);
+        return devm_snd_dmaengine_pcm_register(dev,
+                        &samsung_dmaengine_pcm_config,
+                        SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME |
+                        SND_DMAENGINE_PCM_FLAG_COMPAT);
 }
 EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);
 
-void samsung_asoc_dma_platform_unregister(struct device *dev)
-{
-        return snd_dmaengine_pcm_unregister(dev);
-}
-EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_unregister);
-
 MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");
 MODULE_DESCRIPTION("Samsung dmaengine ASoC driver");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index 415ad81999c4..9506d7617223 100644
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -274,8 +274,8 @@ static int __init goni_init(void)
                 return -ENOMEM;
 
         /* register voice DAI here */
-        ret = snd_soc_register_component(&goni_snd_device->dev, &voice_component,
-                                         &voice_dai, 1);
+        ret = devm_snd_soc_register_component(&goni_snd_device->dev,
+                        &voice_component, &voice_dai, 1);
         if (ret) {
                 platform_device_put(goni_snd_device);
                 return ret;
@@ -284,17 +284,14 @@ static int __init goni_init(void)
         platform_set_drvdata(goni_snd_device, &goni);
         ret = platform_device_add(goni_snd_device);
 
-        if (ret) {
-                snd_soc_unregister_component(&goni_snd_device->dev);
+        if (ret)
                 platform_device_put(goni_snd_device);
-        }
 
         return ret;
 }
 
 static void __exit goni_exit(void)
 {
-        snd_soc_unregister_component(&goni_snd_device->dev);
         platform_device_unregister(goni_snd_device);
 }
 
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
index 88b09e022503..9f2fb69dbaae 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -176,11 +176,6 @@ static struct platform_device *s3c24xx_snd_device;
 static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
 
         snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
                 &hp_jack);
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 048ead967199..07ff3e7cb890 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -451,6 +451,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
         u32 mod = readl(i2s->addr + I2SMOD);
 
         switch (clk_id) {
+        case SAMSUNG_I2S_OPCLK:
+                mod &= ~MOD_OPCLK_MASK;
+                mod |= dir;
+                break;
         case SAMSUNG_I2S_CDCLK:
                 /* Shouldn't matter in GATING(CLOCK_IN) mode */
                 if (dir == SND_SOC_CLOCK_IN)
@@ -724,9 +728,6 @@ static int i2s_startup(struct snd_pcm_substream *substream,
         else
                 i2s->mode |= DAI_MANAGER;
 
-        /* Enforce set_sysclk in Master mode */
-        i2s->rclk_srcrate = 0;
-
         if (!any_active(i2s) && (i2s->quirks & QUIRK_NEED_RSTCLR))
                 writel(CON_RSTCLR, i2s->addr + I2SCON);
 
@@ -984,6 +985,7 @@ probe_exit:
         /* Reset any constraint on RFS and BFS */
         i2s->rfs = 0;
         i2s->bfs = 0;
+        i2s->rclk_srcrate = 0;
         i2s_txctrl(i2s, 0);
         i2s_rxctrl(i2s, 0);
         i2s_fifo(i2s, FIC_TXFLUSH);
@@ -1293,8 +1295,6 @@ static int samsung_i2s_remove(struct platform_device *pdev)
         i2s->pri_dai = NULL;
         i2s->sec_dai = NULL;
 
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-
         return 0;
 }
 
diff --git a/sound/soc/samsung/i2s.h b/sound/soc/samsung/i2s.h
index 7966afc934db..21ff24e930db 100644
--- a/sound/soc/samsung/i2s.h
+++ b/sound/soc/samsung/i2s.h
@@ -18,5 +18,6 @@
 #define SAMSUNG_I2S_RCLKSRC_0   0
 #define SAMSUNG_I2S_RCLKSRC_1   1
 #define SAMSUNG_I2S_CDCLK               2
+#define SAMSUNG_I2S_OPCLK               3
 
 #endif /* __SND_SOC_SAMSUNG_I2S_H */
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c
index 3d5cf1530b6f..8cc5770abb39 100644
--- a/sound/soc/samsung/idma.c
+++ b/sound/soc/samsung/idma.c
@@ -274,7 +274,7 @@ static irqreturn_t iis_irq(int irqno, void *dev_id)
 
                 addr = readl(idma.regs + I2SLVL0ADDR) - idma.lp_tx_addr;
                 addr += prtd->periodsz;
-                addr %= (prtd->end - prtd->start);
+                addr %= (u32)(prtd->end - prtd->start);
                 addr += idma.lp_tx_addr;
 
                 writel(addr, idma.regs + I2SLVL0ADDR);
@@ -413,13 +413,7 @@ static int asoc_idma_platform_probe(struct platform_device *pdev)
         if (idma_irq < 0)
                 return idma_irq;
 
-        return snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
-}
-
-static int asoc_idma_platform_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_platform(&pdev->dev);
-        return 0;
+        return devm_snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
 }
 
 static struct platform_driver asoc_idma_driver = {
@@ -429,7 +423,6 @@ static struct platform_driver asoc_idma_driver = {
         },
 
         .probe = asoc_idma_platform_probe,
-        .remove = asoc_idma_platform_remove,
 };
 
 module_platform_driver(asoc_idma_driver);
diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c
index bfb91f34a22a..840787e63cb1 100644
--- a/sound/soc/samsung/littlemill.c
+++ b/sound/soc/samsung/littlemill.c
@@ -304,23 +304,12 @@ static int littlemill_probe(struct platform_device *pdev)
 
         card->dev = &pdev->dev;
 
-        ret = snd_soc_register_card(card);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                         ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int littlemill_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_card(card);
-
-        return 0;
+        return ret;
 }
 
 static struct platform_driver littlemill_driver = {
@@ -330,7 +319,6 @@ static struct platform_driver littlemill_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = littlemill_probe,
-        .remove = littlemill_remove,
 };
 
 module_platform_driver(littlemill_driver);
diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c
index 570cf5229508..bd5f0d643a86 100644
--- a/sound/soc/samsung/lowland.c
+++ b/sound/soc/samsung/lowland.c
@@ -187,23 +187,12 @@ static int lowland_probe(struct platform_device *pdev)
 
         card->dev = &pdev->dev;
 
-        ret = snd_soc_register_card(card);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                         ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int lowland_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_card(card);
-
-        return 0;
+        return ret;
 }
 
 static struct platform_driver lowland_driver = {
@@ -213,7 +202,6 @@ static struct platform_driver lowland_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = lowland_probe,
-        .remove = lowland_remove,
 };
 
 module_platform_driver(lowland_driver);
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index b0800337b79e..9b4a09f14b6c 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -271,15 +271,8 @@ static const struct snd_kcontrol_new neo1973_wm8753_controls[] = {
 
 static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_card *card = rtd->card;
 
-        /* set up NC codec pins */
-        snd_soc_dapm_nc_pin(&codec->dapm, "OUT3");
-        snd_soc_dapm_nc_pin(&codec->dapm, "OUT4");
-        snd_soc_dapm_nc_pin(&codec->dapm, "LINE1");
-        snd_soc_dapm_nc_pin(&codec->dapm, "LINE2");
-
         /* set endpoints to default off mode */
         snd_soc_dapm_disable_pin(&card->dapm, "GSM Line Out");
         snd_soc_dapm_disable_pin(&card->dapm, "GSM Line In");
@@ -355,6 +348,7 @@ static struct snd_soc_card neo1973 = {
         .num_dapm_widgets = ARRAY_SIZE(neo1973_wm8753_dapm_widgets),
         .dapm_routes = neo1973_wm8753_routes,
         .num_dapm_routes = ARRAY_SIZE(neo1973_wm8753_routes),
+        .fully_routed = true,
 };
 
 static struct platform_device *neo1973_snd_device;
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index ab54e297957c..a3c9c9cba3b0 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -542,7 +542,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
         /* Default is 128fs */
         pcm->sclk_per_fs = 128;
 
-        pcm->cclk = clk_get(&pdev->dev, "audio-bus");
+        pcm->cclk = devm_clk_get(&pdev->dev, "audio-bus");
         if (IS_ERR(pcm->cclk)) {
                 dev_err(&pdev->dev, "failed to get audio-bus\n");
                 ret = PTR_ERR(pcm->cclk);
@@ -567,7 +567,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
                 goto err3;
         }
 
-        pcm->pclk = clk_get(&pdev->dev, "pcm");
+        pcm->pclk = devm_clk_get(&pdev->dev, "pcm");
         if (IS_ERR(pcm->pclk)) {
                 dev_err(&pdev->dev, "failed to get pcm_clock\n");
                 ret = -ENOENT;
@@ -588,7 +588,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
 
         pm_runtime_enable(&pdev->dev);
 
-        ret = snd_soc_register_component(&pdev->dev, &s3c_pcm_component,
+        ret = devm_snd_soc_register_component(&pdev->dev, &s3c_pcm_component,
                                          &s3c_pcm_dai[pdev->id], 1);
         if (ret != 0) {
                 dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret);
@@ -598,23 +598,19 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);
-                goto err6;
+                goto err5;
         }
 
         return 0;
 
-err6:
-        snd_soc_unregister_component(&pdev->dev);
 err5:
         clk_disable_unprepare(pcm->pclk);
-        clk_put(pcm->pclk);
 err4:
         iounmap(pcm->regs);
 err3:
         release_mem_region(mem_res->start, resource_size(mem_res));
 err2:
         clk_disable_unprepare(pcm->cclk);
-        clk_put(pcm->cclk);
 err1:
         return ret;
 }
@@ -624,9 +620,6 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev)
         struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id];
         struct resource *mem_res;
 
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-
         pm_runtime_disable(&pdev->dev);
 
         iounmap(pcm->regs);
@@ -636,8 +629,6 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev)
 
         clk_disable_unprepare(pcm->cclk);
         clk_disable_unprepare(pcm->pclk);
-        clk_put(pcm->pclk);
-        clk_put(pcm->cclk);
 
         return 0;
 }
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
index 2982d9e7f268..5b3e504d3a32 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -221,11 +221,6 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
 static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
 
         snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
                 &hp_jack);
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 79e7efb9283c..77a2ae50dc94 100644
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -745,7 +745,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id,
         dai_drv->suspend = s3c2412_i2s_suspend;
         dai_drv->resume = s3c2412_i2s_resume;
 
-        return snd_soc_register_component(dev, cmp_drv, dai_drv, 1);
+        return devm_snd_soc_register_component(dev, cmp_drv, dai_drv, 1);
 }
 EXPORT_SYMBOL_GPL(s3c_i2sv2_register_component);
 
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index e9bb5d7a71ee..843f315dcb3a 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -179,27 +179,14 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev)
         }
 
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
-        if (ret) {
+        if (ret)
                 pr_err("failed to register the DMA: %d\n", ret);
-                goto err;
-        }
 
-        return 0;
-err:
-        snd_soc_unregister_component(&pdev->dev);
         return ret;
 }
 
-static int s3c2412_iis_dev_remove(struct platform_device *pdev)
-{
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-        return 0;
-}
-
 static struct platform_driver s3c2412_iis_driver = {
         .probe  = s3c2412_iis_dev_probe,
-        .remove = s3c2412_iis_dev_remove,
         .driver = {
                 .name = "s3c2412-iis",
                 .owner = THIS_MODULE,
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index d7b8457b5650..4a6d206db222 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -475,35 +475,22 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
 {
         int ret = 0;
 
-        ret = snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component,
-                                         &s3c24xx_i2s_dai, 1);
+        ret = devm_snd_soc_register_component(&pdev->dev,
+                        &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1);
         if (ret) {
                 pr_err("failed to register the dai\n");
                 return ret;
         }
 
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
-        if (ret) {
+        if (ret)
                 pr_err("failed to register the dma: %d\n", ret);
-                goto err;
-        }
 
-        return 0;
-err:
-        snd_soc_unregister_component(&pdev->dev);
         return ret;
 }
 
-static int s3c24xx_iis_dev_remove(struct platform_device *pdev)
-{
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-        return 0;
-}
-
 static struct platform_driver s3c24xx_iis_driver = {
         .probe  = s3c24xx_iis_dev_probe,
-        .remove = s3c24xx_iis_dev_remove,
         .driver = {
                 .name = "s3c24xx-iis",
                 .owner = THIS_MODULE,
diff --git a/sound/soc/samsung/s3c24xx_simtec_hermes.c b/sound/soc/samsung/s3c24xx_simtec_hermes.c
index d8a0543cae5e..2d30b7b6818a 100644
--- a/sound/soc/samsung/s3c24xx_simtec_hermes.c
+++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c
@@ -63,14 +63,6 @@ static const struct snd_soc_dapm_route base_map[] = {
 */
 static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Line In");
-        snd_soc_dapm_enable_pin(dapm, "Line Out");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
-
         simtec_audio_init(rtd);
 
         return 0;
diff --git a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
index 1ac0d7a63a3a..83f6c7d49cd6 100644
--- a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
+++ b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
@@ -52,14 +52,6 @@ static const struct snd_soc_dapm_route base_map[] = {
 */
 static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Line In");
-        snd_soc_dapm_enable_pin(dapm, "Line Out");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
-
         simtec_audio_init(rtd);
 
         return 0;
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c
index c3b2adafb7b5..df55db5d3554 100644
--- a/sound/soc/samsung/smartq_wm8987.c
+++ b/sound/soc/samsung/smartq_wm8987.c
@@ -162,8 +162,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "ROUT1");
 
         /* set endpoints to default off mode */
-        snd_soc_dapm_enable_pin(dapm, "Internal Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Internal Mic");
         snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
 
         /* Headphone jack detection */
diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c
index 23a9204b106d..e119aaa91c28 100644
--- a/sound/soc/samsung/smdk_wm8580pcm.c
+++ b/sound/soc/samsung/smdk_wm8580pcm.c
@@ -164,19 +164,11 @@ static int snd_smdk_probe(struct platform_device *pdev)
                 xtal_freq = mclk_freq = SMDK_WM8580_EXT_VOICE;
 
         smdk_pcm.dev = &pdev->dev;
-        ret = snd_soc_register_card(&smdk_pcm);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
-                return ret;
-        }
 
-        return 0;
-}
-
-static int snd_smdk_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_card(&smdk_pcm);
-        return 0;
+        return ret;
 }
 
 static struct platform_driver snd_smdk_driver = {
@@ -185,7 +177,6 @@ static struct platform_driver snd_smdk_driver = {
                 .name = "samsung-smdk-pcm",
         },
         .probe = snd_smdk_probe,
-        .remove = snd_smdk_remove,
 };
 
 module_platform_driver(snd_smdk_driver);
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index 682eb4f7ba0c..fc25cc00f0f2 100644
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -89,18 +89,6 @@ static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        /* HeadPhone */
-        snd_soc_dapm_enable_pin(dapm, "HPOUT1R");
-        snd_soc_dapm_enable_pin(dapm, "HPOUT1L");
-
-        /* MicIn */
-        snd_soc_dapm_enable_pin(dapm, "IN1LN");
-        snd_soc_dapm_enable_pin(dapm, "IN1RN");
-
-        /* LineIn */
-        snd_soc_dapm_enable_pin(dapm, "IN2LN");
-        snd_soc_dapm_enable_pin(dapm, "IN2RN");
-
         /* Other pins NC */
         snd_soc_dapm_nc_pin(dapm, "HPOUT2P");
         snd_soc_dapm_nc_pin(dapm, "HPOUT2N");
diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c
index 0c84ca099612..b6c09979be1f 100644
--- a/sound/soc/samsung/smdk_wm8994pcm.c
+++ b/sound/soc/samsung/smdk_wm8994pcm.c
@@ -134,19 +134,11 @@ static int snd_smdk_probe(struct platform_device *pdev)
         int ret = 0;
 
         smdk_pcm.dev = &pdev->dev;
-        ret = snd_soc_register_card(&smdk_pcm);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
-                return ret;
-        }
 
-        return 0;
-}
-
-static int snd_smdk_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_card(&smdk_pcm);
-        return 0;
+        return ret;
 }
 
 static struct platform_driver snd_smdk_driver = {
@@ -155,7 +147,6 @@ static struct platform_driver snd_smdk_driver = {
                 .name = "samsung-smdk-pcm",
         },
         .probe = snd_smdk_probe,
-        .remove = snd_smdk_remove,
 };
 
 module_platform_driver(snd_smdk_driver);
diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c
new file mode 100644
index 000000000000..014c177840ba
--- /dev/null
+++ b/sound/soc/samsung/snow.c
@@ -0,0 +1,123 @@
+/*
+ * ASoC machine driver for Snow boards
+ *
+ * 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/module.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+
+#include <sound/soc.h>
+
+#include "i2s.h"
+
+#define FIN_PLL_RATE            24000000
+
+static struct snd_soc_dai_link snow_dai[] = {
+        {
+                .name = "Primary",
+                .stream_name = "Primary",
+                .codec_dai_name = "HiFi",
+                .dai_fmt = SND_SOC_DAIFMT_I2S |
+                                SND_SOC_DAIFMT_NB_NF |
+                                SND_SOC_DAIFMT_CBS_CFS,
+        },
+};
+
+static int snow_late_probe(struct snd_soc_card *card)
+{
+        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
+        struct snd_soc_dai *cpu_dai = card->rtd[0].cpu_dai;
+        int ret;
+
+        /* Set the MCLK rate for the codec */
+        ret = snd_soc_dai_set_sysclk(codec_dai, 0,
+                                        FIN_PLL_RATE, SND_SOC_CLOCK_IN);
+        if (ret < 0)
+                return ret;
+
+        /* Select I2S Bus clock to set RCLK and BCLK */
+        ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0,
+                                        0, SND_SOC_CLOCK_IN);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static struct snd_soc_card snow_snd = {
+        .name = "Snow-I2S",
+        .dai_link = snow_dai,
+        .num_links = ARRAY_SIZE(snow_dai),
+
+        .late_probe = snow_late_probe,
+};
+
+static int snow_probe(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = &snow_snd;
+        struct device_node *i2s_node, *codec_node;
+        int i, ret;
+
+        i2s_node = of_parse_phandle(pdev->dev.of_node,
+                                    "samsung,i2s-controller", 0);
+        if (!i2s_node) {
+                dev_err(&pdev->dev,
+                        "Property 'i2s-controller' missing or invalid\n");
+                return -EINVAL;
+        }
+
+        codec_node = of_parse_phandle(pdev->dev.of_node,
+                                      "samsung,audio-codec", 0);
+        if (!codec_node) {
+                dev_err(&pdev->dev,
+                        "Property 'audio-codec' missing or invalid\n");
+                return -EINVAL;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(snow_dai); i++) {
+                snow_dai[i].codec_of_node = codec_node;
+                snow_dai[i].cpu_of_node = i2s_node;
+                snow_dai[i].platform_of_node = i2s_node;
+        }
+
+        card->dev = &pdev->dev;
+
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret) {
+                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+                return ret;
+        }
+
+        return ret;
+}
+
+static const struct of_device_id snow_of_match[] = {
+        { .compatible = "google,snow-audio-max98090", },
+        { .compatible = "google,snow-audio-max98095", },
+        {},
+};
+
+static struct platform_driver snow_driver = {
+        .driver = {
+                .name = "snow-audio",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+                .of_match_table = snow_of_match,
+        },
+        .probe = snow_probe,
+};
+
+module_platform_driver(snow_driver);
+
+MODULE_DESCRIPTION("ALSA SoC Audio machine driver for Snow");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index cfe63b7bcc9f..e93a93e296f4 100644
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -427,8 +427,8 @@ static int spdif_probe(struct platform_device *pdev)
 
         dev_set_drvdata(&pdev->dev, spdif);
 
-        ret = snd_soc_register_component(&pdev->dev, &samsung_spdif_component,
-                                         &samsung_spdif_dai, 1);
+        ret = devm_snd_soc_register_component(&pdev->dev,
+                        &samsung_spdif_component, &samsung_spdif_dai, 1);
         if (ret != 0) {
                 dev_err(&pdev->dev, "fail to register dai\n");
                 goto err4;
@@ -444,12 +444,10 @@ static int spdif_probe(struct platform_device *pdev)
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register DMA: %d\n", ret);
-                goto err5;
+                goto err4;
         }
 
         return 0;
-err5:
-        snd_soc_unregister_component(&pdev->dev);
 err4:
         iounmap(spdif->regs);
 err3:
@@ -467,9 +465,6 @@ static int spdif_remove(struct platform_device *pdev)
         struct samsung_spdif_info *spdif = &spdif_info;
         struct resource *mem_res;
 
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-
         iounmap(spdif->regs);
 
         mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 57df90d6b7c1..9902efcb8ea1 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -327,23 +327,12 @@ static int speyside_probe(struct platform_device *pdev)
 
         card->dev = &pdev->dev;
 
-        ret = snd_soc_register_card(card);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                         ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int speyside_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_card(card);
-
-        return 0;
+        return ret;
 }
 
 static struct platform_driver speyside_driver = {
@@ -353,7 +342,6 @@ static struct platform_driver speyside_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = speyside_probe,
-        .remove = speyside_remove,
 };
 
 module_platform_driver(speyside_driver);
diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c
index 1807b75ccc12..6a2b9f14d624 100644
--- a/sound/soc/samsung/tobermory.c
+++ b/sound/soc/samsung/tobermory.c
@@ -223,23 +223,12 @@ static int tobermory_probe(struct platform_device *pdev)
 
         card->dev = &pdev->dev;
 
-        ret = snd_soc_register_card(card);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                         ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int tobermory_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_card(card);
-
-        return 0;
+        return ret;
 }
 
 static struct platform_driver tobermory_driver = {
@@ -249,7 +238,6 @@ static struct platform_driver tobermory_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = tobermory_probe,
-        .remove = tobermory_remove,
 };
 
 module_platform_driver(tobermory_driver);
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index ff60e11ecb56..b43fdf0d08af 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -56,7 +56,7 @@ config SND_SH7760_AC97
 
 config SND_SIU_MIGOR
         tristate "SIU sound support on Migo-R"
-        depends on SH_MIGOR
+        depends on SH_MIGOR && I2C
         select SND_SOC_SH4_SIU
         select SND_SOC_WM8978
         help
diff --git a/sound/soc/sh/rcar/Makefile b/sound/soc/sh/rcar/Makefile
index 7d0051ced838..9ac536429800 100644
--- a/sound/soc/sh/rcar/Makefile
+++ b/sound/soc/sh/rcar/Makefile
@@ -1,2 +1,2 @@
-snd-soc-rcar-objs       := core.o gen.o src.o adg.o ssi.o
+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
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 69c44269ebdb..fc41a0e8b09f 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -57,6 +57,24 @@ static u32 rsnd_adg_ssi_ws_timing_gen2(struct rsnd_dai_stream *io)
         return (0x6 + ws) << 8;
 }
 
+int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_dai *rdai,
+                                 struct rsnd_mod *mod,
+                                 struct rsnd_dai_stream *io)
+{
+        int id = rsnd_mod_id(mod);
+        int shift = (id % 2) ? 16 : 0;
+        u32 mask, val;
+
+        val = rsnd_adg_ssi_ws_timing_gen2(io);
+
+        val  = val      << shift;
+        mask = 0xffff   << shift;
+
+        rsnd_mod_bset(mod, CMDOUT_TIMSEL, mask, val);
+
+        return 0;
+}
+
 static int rsnd_adg_set_src_timsel_gen2(struct rsnd_dai *rdai,
                                         struct rsnd_mod *mod,
                                         struct rsnd_dai_stream *io,
@@ -397,9 +415,8 @@ int rsnd_adg_probe(struct platform_device *pdev,
 {
         struct rsnd_adg *adg;
         struct device *dev = rsnd_priv_to_dev(priv);
-        struct clk *clk, *clk_orig;
+        struct clk *clk;
         int i;
-        bool use_old_style = false;
 
         adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL);
         if (!adg) {
@@ -407,45 +424,13 @@ int rsnd_adg_probe(struct platform_device *pdev,
                 return -ENOMEM;
         }
 
-        clk_orig        = devm_clk_get(dev, NULL);
         adg->clk[CLKA]  = devm_clk_get(dev, "clk_a");
         adg->clk[CLKB]  = devm_clk_get(dev, "clk_b");
         adg->clk[CLKC]  = devm_clk_get(dev, "clk_c");
         adg->clk[CLKI]  = devm_clk_get(dev, "clk_i");
 
-        /*
-         * It request device dependent audio clock.
-         * But above all clks will indicate rsnd module clock
-         * if platform doesn't it
-         */
-        for_each_rsnd_clk(clk, adg, i) {
-                if (clk_orig == clk) {
-                        dev_warn(dev,
-                                 "doesn't have device dependent clock, use independent clock\n");
-                        use_old_style = true;
-                        break;
-                }
-        }
-
-        /*
-         * note:
-         * these exist in order to keep compatible with
-         * platform which has device independent audio clock,
-         * but will be removed soon
-         */
-        if (use_old_style) {
-                adg->clk[CLKA] = devm_clk_get(NULL, "audio_clk_a");
-                adg->clk[CLKB] = devm_clk_get(NULL, "audio_clk_b");
-                adg->clk[CLKC] = devm_clk_get(NULL, "audio_clk_c");
-                adg->clk[CLKI] = devm_clk_get(NULL, "audio_clk_internal");
-        }
-
-        for_each_rsnd_clk(clk, adg, i) {
-                if (IS_ERR(clk)) {
-                        dev_err(dev, "Audio clock failed\n");
-                        return -EIO;
-                }
-        }
+        for_each_rsnd_clk(clk, adg, i)
+                dev_dbg(dev, "clk %d : %p\n", i, clk);
 
         rsnd_adg_ssi_clk_init(priv, adg);
 
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 89424470a1f3..964463dada87 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -309,23 +309,49 @@ void  rsnd_dma_quit(struct rsnd_priv *priv,
 }
 
 /*
+ *      settting function
+ */
+u32 rsnd_get_adinr(struct rsnd_mod *mod)
+{
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        u32 adinr = runtime->channels;
+
+        switch (runtime->sample_bits) {
+        case 16:
+                adinr |= (8 << 16);
+                break;
+        case 32:
+                adinr |= (0 << 16);
+                break;
+        default:
+                dev_warn(dev, "not supported sample bits\n");
+                return 0;
+        }
+
+        return adinr;
+}
+
+/*
  *      rsnd_dai functions
  */
-#define __rsnd_mod_call(mod, func, rdai, io)                    \
+#define __rsnd_mod_call(mod, func, rdai...)                     \
 ({                                                              \
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);         \
         struct device *dev = rsnd_priv_to_dev(priv);            \
         dev_dbg(dev, "%s [%d] %s\n",                            \
                 rsnd_mod_name(mod), rsnd_mod_id(mod), #func);   \
-        (mod)->ops->func(mod, rdai, io);                        \
+        (mod)->ops->func(mod, rdai);                            \
 })
 
-#define rsnd_mod_call(mod, func, rdai, io)      \
+#define rsnd_mod_call(mod, func, rdai...)       \
         (!(mod) ? -ENODEV :                     \
          !((mod)->ops->func) ? 0 :              \
-         __rsnd_mod_call(mod, func, (rdai), (io)))
+         __rsnd_mod_call(mod, func, rdai))
 
-#define rsnd_dai_call(rdai, io, fn)                             \
+#define rsnd_dai_call(fn, io, rdai...)                          \
 ({                                                              \
         struct rsnd_mod *mod;                                   \
         int ret = 0, i;                                         \
@@ -333,7 +359,7 @@ void  rsnd_dma_quit(struct rsnd_priv *priv,
                 mod = (io)->mod[i];                             \
                 if (!mod)                                       \
                         continue;                               \
-                ret = rsnd_mod_call(mod, fn, (rdai), (io));     \
+                ret = rsnd_mod_call(mod, fn, rdai);             \
                 if (ret < 0)                                    \
                         break;                                  \
         }                                                       \
@@ -467,10 +493,7 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd,
         struct rsnd_priv *priv = snd_soc_dai_get_drvdata(dai);
         struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
         struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream);
-        struct rsnd_mod *mod = rsnd_ssi_mod_get_frm_dai(priv,
-                                                rsnd_dai_id(priv, rdai),
-                                                rsnd_dai_is_play(rdai, io));
-        int ssi_id = rsnd_mod_id(mod);
+        int ssi_id = rsnd_mod_id(rsnd_io_to_mod_ssi(io));
         int ret;
         unsigned long flags;
 
@@ -486,20 +509,20 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd,
                 if (ret < 0)
                         goto dai_trigger_end;
 
-                ret = rsnd_dai_call(rdai, io, init);
+                ret = rsnd_dai_call(init, io, rdai);
                 if (ret < 0)
                         goto dai_trigger_end;
 
-                ret = rsnd_dai_call(rdai, io, start);
+                ret = rsnd_dai_call(start, io, rdai);
                 if (ret < 0)
                         goto dai_trigger_end;
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
-                ret = rsnd_dai_call(rdai, io, stop);
+                ret = rsnd_dai_call(stop, io, rdai);
                 if (ret < 0)
                         goto dai_trigger_end;
 
-                ret = rsnd_dai_call(rdai, io, quit);
+                ret = rsnd_dai_call(quit, io, rdai);
                 if (ret < 0)
                         goto dai_trigger_end;
 
@@ -578,15 +601,27 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
         .set_fmt        = rsnd_soc_dai_set_fmt,
 };
 
+#define rsnd_path_parse(priv, io, type)                         \
+({                                                              \
+        struct rsnd_mod *mod;                                   \
+        int ret = 0;                                            \
+        int id = -1;                                            \
+                                                                \
+        if (rsnd_is_enable_path(io, type)) {                    \
+                id = rsnd_info_id(priv, io, type);              \
+                if (id >= 0) {                                  \
+                        mod = rsnd_##type##_mod_get(priv, id);  \
+                        ret = rsnd_dai_connect(mod, io);        \
+                }                                               \
+        }                                                       \
+        ret;                                                    \
+})
+
 static int rsnd_path_init(struct rsnd_priv *priv,
                           struct rsnd_dai *rdai,
                           struct rsnd_dai_stream *io)
 {
-        struct rsnd_mod *mod;
-        struct rsnd_dai_platform_info *dai_info = rdai->info;
         int ret;
-        int ssi_id = -1;
-        int src_id = -1;
 
         /*
          * Gen1 is created by SRU/SSI, and this SRU is base module of
@@ -598,38 +633,21 @@ static int rsnd_path_init(struct rsnd_priv *priv,
          * Gen2 SCU path is very flexible, but, Gen1 SRU (SCU parts) is
          * using fixed path.
          */
-        if (dai_info) {
-                if (rsnd_is_enable_path(io, ssi))
-                        ssi_id = rsnd_info_id(priv, io, ssi);
-                if (rsnd_is_enable_path(io, src))
-                        src_id = rsnd_info_id(priv, io, src);
-        } else {
-                /* get SSI's ID */
-                mod = rsnd_ssi_mod_get_frm_dai(priv,
-                                               rsnd_dai_id(priv, rdai),
-                                               rsnd_dai_is_play(rdai, io));
-                if (!mod)
-                        return 0;
-                ssi_id = src_id = rsnd_mod_id(mod);
-        }
-
-        ret = 0;
 
         /* SRC */
-        if (src_id >= 0) {
-                mod = rsnd_src_mod_get(priv, src_id);
-                ret = rsnd_dai_connect(mod, io);
-                if (ret < 0)
-                        return ret;
-        }
+        ret = rsnd_path_parse(priv, io, src);
+        if (ret < 0)
+                return ret;
 
         /* SSI */
-        if (ssi_id >= 0) {
-                mod = rsnd_ssi_mod_get(priv, ssi_id);
-                ret = rsnd_dai_connect(mod, io);
-                if (ret < 0)
-                        return ret;
-        }
+        ret = rsnd_path_parse(priv, io, ssi);
+        if (ret < 0)
+                return ret;
+
+        /* DVC */
+        ret = rsnd_path_parse(priv, io, dvc);
+        if (ret < 0)
+                return ret;
 
         return ret;
 }
@@ -725,30 +743,15 @@ static int rsnd_dai_probe(struct platform_device *pdev,
         struct snd_soc_dai_driver *drv;
         struct rcar_snd_info *info = rsnd_priv_to_info(priv);
         struct rsnd_dai *rdai;
-        struct rsnd_mod *pmod, *cmod;
+        struct rsnd_ssi_platform_info *pmod, *cmod;
         struct device *dev = rsnd_priv_to_dev(priv);
         int dai_nr;
         int i;
 
         rsnd_of_parse_dai(pdev, of_data, priv);
 
-        /*
-         * dai_nr should be set via dai_info_nr,
-         * but allow it to keeping compatible
-         */
         dai_nr = info->dai_info_nr;
         if (!dai_nr) {
-                /* get max dai nr */
-                for (dai_nr = 0; dai_nr < 32; dai_nr++) {
-                        pmod = rsnd_ssi_mod_get_frm_dai(priv, dai_nr, 1);
-                        cmod = rsnd_ssi_mod_get_frm_dai(priv, dai_nr, 0);
-
-                        if (!pmod && !cmod)
-                                break;
-                }
-        }
-
-        if (!dai_nr) {
                 dev_err(dev, "no dai\n");
                 return -EIO;
         }
@@ -765,11 +768,10 @@ static int rsnd_dai_probe(struct platform_device *pdev,
         priv->rdai      = rdai;
 
         for (i = 0; i < dai_nr; i++) {
-                if (info->dai_info)
-                        rdai[i].info = &info->dai_info[i];
+                rdai[i].info = &info->dai_info[i];
 
-                pmod = rsnd_ssi_mod_get_frm_dai(priv, i, 1);
-                cmod = rsnd_ssi_mod_get_frm_dai(priv, i, 0);
+                pmod = rdai[i].info->playback.ssi;
+                cmod = rdai[i].info->capture.ssi;
 
                 /*
                  *      init rsnd_dai
@@ -787,8 +789,7 @@ static int rsnd_dai_probe(struct platform_device *pdev,
                         drv[i].playback.channels_min    = 2;
                         drv[i].playback.channels_max    = 2;
 
-                        if (info->dai_info)
-                                rdai[i].playback.info = &info->dai_info[i].playback;
+                        rdai[i].playback.info = &info->dai_info[i].playback;
                         rsnd_path_init(priv, &rdai[i], &rdai[i].playback);
                 }
                 if (cmod) {
@@ -797,8 +798,7 @@ static int rsnd_dai_probe(struct platform_device *pdev,
                         drv[i].capture.channels_min     = 2;
                         drv[i].capture.channels_max     = 2;
 
-                        if (info->dai_info)
-                                rdai[i].capture.info = &info->dai_info[i].capture;
+                        rdai[i].capture.info = &info->dai_info[i].capture;
                         rsnd_path_init(priv, &rdai[i], &rdai[i].capture);
                 }
 
@@ -873,6 +873,20 @@ static struct snd_pcm_ops rsnd_pcm_ops = {
 
 static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)
 {
+        struct rsnd_priv *priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);
+        struct rsnd_dai *rdai;
+        int i, ret;
+
+        for_each_rsnd_dai(rdai, priv, i) {
+                ret = rsnd_dai_call(pcm_new, &rdai->playback, rdai, rtd);
+                if (ret)
+                        return ret;
+
+                ret = rsnd_dai_call(pcm_new, &rdai->capture, rdai, rtd);
+                if (ret)
+                        return ret;
+        }
+
         return snd_pcm_lib_preallocate_pages_for_all(
                 rtd->pcm,
                 SNDRV_DMA_TYPE_DEV,
@@ -912,6 +926,7 @@ static int rsnd_probe(struct platform_device *pdev)
                 rsnd_gen_probe,
                 rsnd_ssi_probe,
                 rsnd_src_probe,
+                rsnd_dvc_probe,
                 rsnd_adg_probe,
                 rsnd_dai_probe,
         };
@@ -955,11 +970,11 @@ static int rsnd_probe(struct platform_device *pdev)
         }
 
         for_each_rsnd_dai(rdai, priv, i) {
-                ret = rsnd_dai_call(rdai, &rdai->playback, probe);
+                ret = rsnd_dai_call(probe, &rdai->playback, rdai);
                 if (ret)
                         return ret;
 
-                ret = rsnd_dai_call(rdai, &rdai->capture, probe);
+                ret = rsnd_dai_call(probe, &rdai->capture, rdai);
                 if (ret)
                         return ret;
         }
@@ -1002,11 +1017,11 @@ static int rsnd_remove(struct platform_device *pdev)
         pm_runtime_disable(&pdev->dev);
 
         for_each_rsnd_dai(rdai, priv, i) {
-                ret = rsnd_dai_call(rdai, &rdai->playback, remove);
+                ret = rsnd_dai_call(remove, &rdai->playback, rdai);
                 if (ret)
                         return ret;
 
-                ret = rsnd_dai_call(rdai, &rdai->capture, remove);
+                ret = rsnd_dai_call(remove, &rdai->capture, rdai);
                 if (ret)
                         return ret;
         }
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
new file mode 100644
index 000000000000..74769b1be005
--- /dev/null
+++ b/sound/soc/sh/rcar/dvc.c
@@ -0,0 +1,273 @@
+/*
+ * Renesas R-Car DVC support
+ *
+ * Copyright (C) 2014 Renesas Solutions Corp.
+ * 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 "rsnd.h"
+
+#define RSND_DVC_NAME_SIZE      16
+#define RSND_DVC_VOLUME_MAX     100
+#define RSND_DVC_VOLUME_NUM     2
+struct rsnd_dvc {
+        struct rsnd_dvc_platform_info *info; /* rcar_snd.h */
+        struct rsnd_mod mod;
+        struct clk *clk;
+        long volume[RSND_DVC_VOLUME_NUM];
+};
+
+#define rsnd_mod_to_dvc(_mod)   \
+        container_of((_mod), struct rsnd_dvc, mod)
+
+#define for_each_rsnd_dvc(pos, priv, i)                         \
+        for ((i) = 0;                                           \
+             ((i) < rsnd_dvc_nr(priv)) &&                       \
+             ((pos) = (struct rsnd_dvc *)(priv)->dvc + i);      \
+             i++)
+
+static void rsnd_dvc_volume_update(struct rsnd_mod *mod)
+{
+        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
+        u32 max = (0x00800000 - 1);
+        u32 vol[RSND_DVC_VOLUME_NUM];
+        int i;
+
+        for (i = 0; i < RSND_DVC_VOLUME_NUM; i++)
+                vol[i] = max / RSND_DVC_VOLUME_MAX * dvc->volume[i];
+
+        rsnd_mod_write(mod, DVC_VOL0R, vol[0]);
+        rsnd_mod_write(mod, DVC_VOL1R, vol[1]);
+}
+
+static int rsnd_dvc_init(struct rsnd_mod *dvc_mod,
+                         struct rsnd_dai *rdai)
+{
+        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(dvc_mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(dvc_mod);
+        struct rsnd_priv *priv = rsnd_mod_to_priv(dvc_mod);
+        struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        int dvc_id = rsnd_mod_id(dvc_mod);
+        int src_id = rsnd_mod_id(src_mod);
+        u32 route[] = {
+                [0] = 0x30000,
+                [1] = 0x30001,
+                [2] = 0x40000,
+                [3] = 0x10000,
+                [4] = 0x20000,
+                [5] = 0x40100
+        };
+
+        if (src_id >= ARRAY_SIZE(route)) {
+                dev_err(dev, "DVC%d isn't connected to SRC%d\n", dvc_id, src_id);
+                return -EINVAL;
+        }
+
+        clk_prepare_enable(dvc->clk);
+
+        /*
+         * fixme
+         * it doesn't support CTU/MIX
+         */
+        rsnd_mod_write(dvc_mod, CMD_ROUTE_SLCT, route[src_id]);
+
+        rsnd_mod_write(dvc_mod, DVC_SWRSR, 0);
+        rsnd_mod_write(dvc_mod, DVC_SWRSR, 1);
+
+        rsnd_mod_write(dvc_mod, DVC_DVUIR, 1);
+
+        rsnd_mod_write(dvc_mod, DVC_ADINR, rsnd_get_adinr(dvc_mod));
+
+        /*  enable Volume  */
+        rsnd_mod_write(dvc_mod, DVC_DVUCR, 0x100);
+
+        /* ch0/ch1 Volume */
+        rsnd_dvc_volume_update(dvc_mod);
+
+        rsnd_mod_write(dvc_mod, DVC_DVUIR, 0);
+
+        rsnd_mod_write(dvc_mod, DVC_DVUER, 1);
+
+        rsnd_adg_set_cmd_timsel_gen2(rdai, dvc_mod, io);
+
+        return 0;
+}
+
+static int rsnd_dvc_quit(struct rsnd_mod *mod,
+                         struct rsnd_dai *rdai)
+{
+        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
+
+        clk_disable_unprepare(dvc->clk);
+
+        return 0;
+}
+
+static int rsnd_dvc_start(struct rsnd_mod *mod,
+                          struct rsnd_dai *rdai)
+{
+        rsnd_mod_write(mod, CMD_CTRL, 0x10);
+
+        return 0;
+}
+
+static int rsnd_dvc_stop(struct rsnd_mod *mod,
+                         struct rsnd_dai *rdai)
+{
+        rsnd_mod_write(mod, CMD_CTRL, 0);
+
+        return 0;
+}
+
+static int rsnd_dvc_volume_info(struct snd_kcontrol *kctrl,
+                               struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = RSND_DVC_VOLUME_NUM;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = RSND_DVC_VOLUME_MAX;
+
+        return 0;
+}
+
+static int rsnd_dvc_volume_get(struct snd_kcontrol *kctrl,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct rsnd_mod *mod = snd_kcontrol_chip(kctrl);
+        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
+        int i;
+
+        for (i = 0; i < RSND_DVC_VOLUME_NUM; i++)
+                ucontrol->value.integer.value[i] = dvc->volume[i];
+
+        return 0;
+}
+
+static int rsnd_dvc_volume_put(struct snd_kcontrol *kctrl,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+        struct rsnd_mod *mod = snd_kcontrol_chip(kctrl);
+        struct rsnd_dvc *dvc = rsnd_mod_to_dvc(mod);
+        int i, change = 0;
+
+        for (i = 0; i < RSND_DVC_VOLUME_NUM; i++) {
+                if (ucontrol->value.integer.value[i] < 0 ||
+                    ucontrol->value.integer.value[i] > RSND_DVC_VOLUME_MAX)
+                        return -EINVAL;
+
+                change |= (ucontrol->value.integer.value[i] != dvc->volume[i]);
+        }
+
+        if (change) {
+                for (i = 0; i < RSND_DVC_VOLUME_NUM; i++)
+                        dvc->volume[i] = ucontrol->value.integer.value[i];
+
+                rsnd_dvc_volume_update(mod);
+        }
+
+        return change;
+}
+
+static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
+                            struct rsnd_dai *rdai,
+                            struct snd_soc_pcm_runtime *rtd)
+{
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+        struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        struct snd_card *card = rtd->card->snd_card;
+        struct snd_kcontrol *kctrl;
+        static struct snd_kcontrol_new knew = {
+                .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name           = "Playback Volume",
+                .info           = rsnd_dvc_volume_info,
+                .get            = rsnd_dvc_volume_get,
+                .put            = rsnd_dvc_volume_put,
+        };
+        int ret;
+
+        if (!rsnd_dai_is_play(rdai, io)) {
+                dev_err(dev, "DVC%d is connected to Capture DAI\n",
+                        rsnd_mod_id(mod));
+                return -EINVAL;
+        }
+
+        kctrl = snd_ctl_new1(&knew, mod);
+        if (!kctrl)
+                return -ENOMEM;
+
+        ret = snd_ctl_add(card, kctrl);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static struct rsnd_mod_ops rsnd_dvc_ops = {
+        .name           = "dvc (gen2)",
+        .init           = rsnd_dvc_init,
+        .quit           = rsnd_dvc_quit,
+        .start          = rsnd_dvc_start,
+        .stop           = rsnd_dvc_stop,
+        .pcm_new        = rsnd_dvc_pcm_new,
+};
+
+struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id)
+{
+        if (WARN_ON(id < 0 || id >= rsnd_dvc_nr(priv)))
+                id = 0;
+
+        return &((struct rsnd_dvc *)(priv->dvc) + id)->mod;
+}
+
+int rsnd_dvc_probe(struct platform_device *pdev,
+                   const struct rsnd_of_data *of_data,
+                   struct rsnd_priv *priv)
+{
+        struct rcar_snd_info *info = rsnd_priv_to_info(priv);
+        struct device *dev = rsnd_priv_to_dev(priv);
+        struct rsnd_dvc *dvc;
+        struct clk *clk;
+        char name[RSND_DVC_NAME_SIZE];
+        int i, nr;
+
+        nr = info->dvc_info_nr;
+        if (!nr)
+                return 0;
+
+        /* This driver doesn't support Gen1 at this point */
+        if (rsnd_is_gen1(priv)) {
+                dev_warn(dev, "CMD is not supported on Gen1\n");
+                return -EINVAL;
+        }
+
+        dvc     = devm_kzalloc(dev, sizeof(*dvc) * nr, GFP_KERNEL);
+        if (!dvc) {
+                dev_err(dev, "CMD allocate failed\n");
+                return -ENOMEM;
+        }
+
+        priv->dvc_nr    = nr;
+        priv->dvc       = dvc;
+
+        for_each_rsnd_dvc(dvc, priv, i) {
+                snprintf(name, RSND_DVC_NAME_SIZE, "dvc.%d", i);
+
+                clk = devm_clk_get(dev, name);
+                if (IS_ERR(clk))
+                        return PTR_ERR(clk);
+
+                dvc->info = &info->dvc_info[i];
+                dvc->clk  = clk;
+
+                rsnd_mod_init(priv, &dvc->mod, &rsnd_dvc_ops, RSND_MOD_DVC, i);
+
+                dev_dbg(dev, "CMD%d probed\n", i);
+        }
+
+        return 0;
+}
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 50a1ef3eb1c6..a1583b57bf8d 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -181,6 +181,8 @@ static int rsnd_gen2_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen)
                 RSND_GEN2_M_REG(gen, SCU,       SRC_BUSIF_MODE, 0x0,    0x20),
                 RSND_GEN2_M_REG(gen, SCU,       SRC_ROUTE_MODE0,0xc,    0x20),
                 RSND_GEN2_M_REG(gen, SCU,       SRC_CTRL,       0x10,   0x20),
+                RSND_GEN2_M_REG(gen, SCU,       CMD_ROUTE_SLCT, 0x18c,  0x20),
+                RSND_GEN2_M_REG(gen, SCU,       CMD_CTRL,       0x190,  0x20),
                 RSND_GEN2_M_REG(gen, SCU,       SRC_SWRSR,      0x200,  0x40),
                 RSND_GEN2_M_REG(gen, SCU,       SRC_SRCIR,      0x204,  0x40),
                 RSND_GEN2_M_REG(gen, SCU,       SRC_ADINR,      0x214,  0x40),
@@ -189,6 +191,14 @@ static int rsnd_gen2_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen)
                 RSND_GEN2_M_REG(gen, SCU,       SRC_SRCCR,      0x224,  0x40),
                 RSND_GEN2_M_REG(gen, SCU,       SRC_BSDSR,      0x22c,  0x40),
                 RSND_GEN2_M_REG(gen, SCU,       SRC_BSISR,      0x238,  0x40),
+                RSND_GEN2_M_REG(gen, SCU,       DVC_SWRSR,      0xe00,  0x100),
+                RSND_GEN2_M_REG(gen, SCU,       DVC_DVUIR,      0xe04,  0x100),
+                RSND_GEN2_M_REG(gen, SCU,       DVC_ADINR,      0xe08,  0x100),
+                RSND_GEN2_M_REG(gen, SCU,       DVC_DVUCR,      0xe10,  0x100),
+                RSND_GEN2_M_REG(gen, SCU,       DVC_ZCMCR,      0xe14,  0x100),
+                RSND_GEN2_M_REG(gen, SCU,       DVC_VOL0R,      0xe28,  0x100),
+                RSND_GEN2_M_REG(gen, SCU,       DVC_VOL1R,      0xe2c,  0x100),
+                RSND_GEN2_M_REG(gen, SCU,       DVC_DVUER,      0xe48,  0x100),
 
                 RSND_GEN2_S_REG(gen, ADG,       BRRA,           0x00),
                 RSND_GEN2_S_REG(gen, ADG,       BRRB,           0x04),
@@ -207,6 +217,7 @@ static int rsnd_gen2_regmap_init(struct rsnd_priv *priv, struct rsnd_gen *gen)
                 RSND_GEN2_S_REG(gen, ADG,       SRCOUT_TIMSEL2, 0x50),
                 RSND_GEN2_S_REG(gen, ADG,       SRCOUT_TIMSEL3, 0x54),
                 RSND_GEN2_S_REG(gen, ADG,       SRCOUT_TIMSEL4, 0x58),
+                RSND_GEN2_S_REG(gen, ADG,       CMDOUT_TIMSEL,  0x5c),
 
                 RSND_GEN2_M_REG(gen, SSI,       SSICR,          0x00,   0x40),
                 RSND_GEN2_M_REG(gen, SSI,       SSISR,          0x04,   0x40),
@@ -252,13 +263,13 @@ static int rsnd_gen2_probe(struct platform_device *pdev,
                 return ret;
 
         dev_dbg(dev, "Gen2 device probed\n");
-        dev_dbg(dev, "SCU  : %08x => %p\n", scu_res->start,
+        dev_dbg(dev, "SCU  : %pap => %p\n", &scu_res->start,
                 gen->base[RSND_GEN2_SCU]);
-        dev_dbg(dev, "ADG  : %08x => %p\n", adg_res->start,
+        dev_dbg(dev, "ADG  : %pap => %p\n", &adg_res->start,
                 gen->base[RSND_GEN2_ADG]);
-        dev_dbg(dev, "SSIU : %08x => %p\n", ssiu_res->start,
+        dev_dbg(dev, "SSIU : %pap => %p\n", &ssiu_res->start,
                 gen->base[RSND_GEN2_SSIU]);
-        dev_dbg(dev, "SSI  : %08x => %p\n", ssi_res->start,
+        dev_dbg(dev, "SSI  : %pap => %p\n", &ssi_res->start,
                 gen->base[RSND_GEN2_SSI]);
 
         return 0;
@@ -345,11 +356,11 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
                 return ret;
 
         dev_dbg(dev, "Gen1 device probed\n");
-        dev_dbg(dev, "SRU : %08x => %p\n",      sru_res->start,
+        dev_dbg(dev, "SRU : %pap => %p\n",      &sru_res->start,
                                                 gen->base[RSND_GEN1_SRU]);
-        dev_dbg(dev, "ADG : %08x => %p\n",      adg_res->start,
+        dev_dbg(dev, "ADG : %pap => %p\n",      &adg_res->start,
                                                 gen->base[RSND_GEN1_ADG]);
-        dev_dbg(dev, "SSI : %08x => %p\n",      ssi_res->start,
+        dev_dbg(dev, "SSI : %pap => %p\n",      &ssi_res->start,
                                                 gen->base[RSND_GEN1_SSI]);
 
         return 0;
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 619d198c7d2e..5aa790170b01 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -44,6 +44,15 @@ enum rsnd_reg {
         RSND_REG_SRC_IFSCR,
         RSND_REG_SRC_IFSVR,
         RSND_REG_SRC_SRCCR,
+        RSND_REG_CMD_ROUTE_SLCT,
+        RSND_REG_DVC_SWRSR,
+        RSND_REG_DVC_DVUIR,
+        RSND_REG_DVC_ADINR,
+        RSND_REG_DVC_DVUCR,
+        RSND_REG_DVC_ZCMCR,
+        RSND_REG_DVC_VOL0R,
+        RSND_REG_DVC_VOL1R,
+        RSND_REG_DVC_DVUER,
 
         /* ADG */
         RSND_REG_BRRA,
@@ -79,6 +88,8 @@ enum rsnd_reg {
         RSND_REG_SHARE17,
         RSND_REG_SHARE18,
         RSND_REG_SHARE19,
+        RSND_REG_SHARE20,
+        RSND_REG_SHARE21,
 
         RSND_REG_MAX,
 };
@@ -114,6 +125,8 @@ enum rsnd_reg {
 #define RSND_REG_SRCOUT_TIMSEL3         RSND_REG_SHARE17
 #define RSND_REG_SRCOUT_TIMSEL4         RSND_REG_SHARE18
 #define RSND_REG_AUDIO_CLK_SEL2         RSND_REG_SHARE19
+#define RSND_REG_CMD_CTRL               RSND_REG_SHARE20
+#define RSND_REG_CMDOUT_TIMSEL          RSND_REG_SHARE21
 
 struct rsnd_of_data;
 struct rsnd_priv;
@@ -136,6 +149,7 @@ void rsnd_write(struct rsnd_priv *priv, struct rsnd_mod *mod,
                 enum rsnd_reg reg, u32 data);
 void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg,
                     u32 mask, u32 data);
+u32 rsnd_get_adinr(struct rsnd_mod *mod);
 
 /*
  *      R-Car DMA
@@ -165,29 +179,27 @@ void  rsnd_dma_quit(struct rsnd_priv *priv,
 enum rsnd_mod_type {
         RSND_MOD_SRC = 0,
         RSND_MOD_SSI,
+        RSND_MOD_DVC,
         RSND_MOD_MAX,
 };
 
 struct rsnd_mod_ops {
         char *name;
         int (*probe)(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai,
-                     struct rsnd_dai_stream *io);
+                     struct rsnd_dai *rdai);
         int (*remove)(struct rsnd_mod *mod,
-                      struct rsnd_dai *rdai,
-                      struct rsnd_dai_stream *io);
+                      struct rsnd_dai *rdai);
         int (*init)(struct rsnd_mod *mod,
-                    struct rsnd_dai *rdai,
-                    struct rsnd_dai_stream *io);
+                    struct rsnd_dai *rdai);
         int (*quit)(struct rsnd_mod *mod,
-                    struct rsnd_dai *rdai,
-                    struct rsnd_dai_stream *io);
+                    struct rsnd_dai *rdai);
         int (*start)(struct rsnd_mod *mod,
-                     struct rsnd_dai *rdai,
-                     struct rsnd_dai_stream *io);
+                     struct rsnd_dai *rdai);
         int (*stop)(struct rsnd_mod *mod,
-                    struct rsnd_dai *rdai,
-                    struct rsnd_dai_stream *io);
+                    struct rsnd_dai *rdai);
+        int (*pcm_new)(struct rsnd_mod *mod,
+                       struct rsnd_dai *rdai,
+                       struct snd_soc_pcm_runtime *rtd);
 };
 
 struct rsnd_dai_stream;
@@ -228,6 +240,7 @@ struct rsnd_dai_stream {
 };
 #define rsnd_io_to_mod_ssi(io)  ((io)->mod[RSND_MOD_SSI])
 #define rsnd_io_to_mod_src(io)  ((io)->mod[RSND_MOD_SRC])
+#define rsnd_io_to_mod_dvc(io)  ((io)->mod[RSND_MOD_DVC])
 
 struct rsnd_dai {
         char name[RSND_DAI_NAME_SIZE];
@@ -291,6 +304,9 @@ int rsnd_adg_set_convert_clk_gen2(struct rsnd_mod *mod,
 int rsnd_adg_set_convert_timing_gen2(struct rsnd_mod *mod,
                                      struct rsnd_dai *rdai,
                                      struct rsnd_dai_stream *io);
+int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_dai *rdai,
+                                 struct rsnd_mod *mod,
+                                 struct rsnd_dai_stream *io);
 
 /*
  *      R-Car sound priv
@@ -328,6 +344,12 @@ struct rsnd_priv {
         int ssi_nr;
 
         /*
+         * below value will be filled on rsnd_dvc_probe()
+         */
+        void *dvc;
+        int dvc_nr;
+
+        /*
          * below value will be filled on rsnd_dai_probe()
          */
         struct snd_soc_dai_driver *daidrv;
@@ -364,11 +386,9 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
                                    struct rsnd_dai_stream *io,
                                    struct snd_pcm_runtime *runtime);
 int rsnd_src_ssi_mode_init(struct rsnd_mod *ssi_mod,
-                           struct rsnd_dai *rdai,
-                           struct rsnd_dai_stream *io);
+                           struct rsnd_dai *rdai);
 int rsnd_src_enable_ssi_irq(struct rsnd_mod *ssi_mod,
-                            struct rsnd_dai *rdai,
-                            struct rsnd_dai_stream *io);
+                            struct rsnd_dai *rdai);
 
 #define rsnd_src_nr(priv) ((priv)->src_nr)
 
@@ -379,9 +399,19 @@ int rsnd_ssi_probe(struct platform_device *pdev,
                    const struct rsnd_of_data *of_data,
                    struct rsnd_priv *priv);
 struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id);
-struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv,
-                                          int dai_id, int is_play);
 int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);
-int rsnd_ssi_is_play(struct rsnd_mod *mod);
+
+/*
+ *      R-Car DVC
+ */
+int rsnd_dvc_probe(struct platform_device *pdev,
+                   const struct rsnd_of_data *of_data,
+                   struct rsnd_priv *priv);
+void rsnd_dvc_remove(struct platform_device *pdev,
+                     struct rsnd_priv *priv);
+struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id);
+
+#define rsnd_dvc_nr(priv) ((priv)->dvc_nr)
+
 
 #endif
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 4d0720ed5a90..e3b078e7c3aa 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -18,21 +18,9 @@ struct rsnd_src {
 
 #define RSND_SRC_NAME_SIZE 16
 
-/*
- * ADINR
- */
-#define OTBL_24         (0 << 16)
-#define OTBL_22         (2 << 16)
-#define OTBL_20         (4 << 16)
-#define OTBL_18         (6 << 16)
-#define OTBL_16         (8 << 16)
-
-#define rsnd_src_mode_flags(p) ((p)->info->flags)
 #define rsnd_src_convert_rate(p) ((p)->info->convert_rate)
 #define rsnd_mod_to_src(_mod)                           \
         container_of((_mod), struct rsnd_src, mod)
-#define rsnd_src_hpbif_is_enable(src)   \
-        (rsnd_src_mode_flags(src) & RSND_SCU_USE_HPBIF)
 #define rsnd_src_dma_available(src) \
         rsnd_dma_available(rsnd_mod_to_dma(&(src)->mod))
 
@@ -80,34 +68,35 @@ struct rsnd_src {
  *
  * This driver request
  * struct rsnd_src_platform_info {
- *      u32 flags;
  *      u32 convert_rate;
+ *      int dma_id;
  * }
  *
- * rsnd_src_hpbif_is_enable() will be true
- * if flags had RSND_SRC_USE_HPBIF,
- * and it controls whether SSIU is used or not.
- *
  * rsnd_src_convert_rate() indicates
  * above convert_rate, and it controls
  * whether SRC is used or not.
  *
  * ex) doesn't use SRC
- * struct rsnd_src_platform_info info = {
- *      .flags = 0,
- *      .convert_rate = 0,
+ * static struct rsnd_dai_platform_info rsnd_dai = {
+ *      .playback = { .ssi = &rsnd_ssi[0], },
  * };
  *
  * ex) uses SRC
- * struct rsnd_src_platform_info info = {
- *      .flags = RSND_SRC_USE_HPBIF,
- *      .convert_rate = 48000,
+ * static struct rsnd_src_platform_info rsnd_src[] = {
+ *      RSND_SCU(48000, 0),
+ *      ...
+ * };
+ * static struct rsnd_dai_platform_info rsnd_dai = {
+ *      .playback = { .ssi = &rsnd_ssi[0], .src = &rsnd_src[0] },
  * };
  *
  * ex) uses SRC bypass mode
- * struct rsnd_src_platform_info info = {
- *      .flags = RSND_SRC_USE_HPBIF,
- *      .convert_rate = 0,
+ * static struct rsnd_src_platform_info rsnd_src[] = {
+ *      RSND_SCU(0, 0),
+ *      ...
+ * };
+ * static struct rsnd_dai_platform_info rsnd_dai = {
+ *      .playback = { .ssi = &rsnd_ssi[0], .src = &rsnd_src[0] },
  * };
  *
  */
@@ -116,27 +105,17 @@ struct rsnd_src {
  *              Gen1/Gen2 common functions
  */
 int rsnd_src_ssi_mode_init(struct rsnd_mod *ssi_mod,
-                           struct rsnd_dai *rdai,
-                           struct rsnd_dai_stream *io)
+                           struct rsnd_dai *rdai)
 {
-        struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(ssi_mod);
         struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
-        struct rcar_snd_info *info = rsnd_priv_to_info(priv);
         int ssi_id = rsnd_mod_id(ssi_mod);
-        int has_src = 0;
 
         /*
          * SSI_MODE0
          */
-        if (info->dai_info) {
-                has_src = !!src_mod;
-        } else {
-                struct rsnd_src *src = rsnd_mod_to_src(src_mod);
-                has_src = rsnd_src_hpbif_is_enable(src);
-        }
-
         rsnd_mod_bset(ssi_mod, SSI_MODE0, (1 << ssi_id),
-                      has_src ? 0 : (1 << ssi_id));
+                      src_mod ? 0 : (1 << ssi_id));
 
         /*
          * SSI_MODE1
@@ -166,8 +145,7 @@ int rsnd_src_ssi_mode_init(struct rsnd_mod *ssi_mod,
 }
 
 int rsnd_src_enable_ssi_irq(struct rsnd_mod *ssi_mod,
-                            struct rsnd_dai *rdai,
-                            struct rsnd_dai_stream *io)
+                            struct rsnd_dai *rdai)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);
 
@@ -203,13 +181,12 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
 }
 
 static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
-                                     struct rsnd_dai *rdai,
-                                     struct rsnd_dai_stream *io)
+                                     struct rsnd_dai *rdai)
 {
+        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 adinr = runtime->channels;
         u32 fsrate = 0;
 
         if (convert_rate)
@@ -226,17 +203,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
         rsnd_mod_write(mod, SRC_SRCIR, 1);
 
         /* Set channel number and output bit length */
-        switch (runtime->sample_bits) {
-        case 16:
-                adinr |= OTBL_16;
-                break;
-        case 32:
-                adinr |= OTBL_24;
-                break;
-        default:
-                return -EIO;
-        }
-        rsnd_mod_write(mod, SRC_ADINR, adinr);
+        rsnd_mod_write(mod, SRC_ADINR, rsnd_get_adinr(mod));
 
         /* Enable the initial value of IFS */
         if (fsrate) {
@@ -253,8 +220,7 @@ static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_init(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -264,8 +230,7 @@ static int rsnd_src_init(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_quit(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -275,8 +240,7 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start(struct rsnd_mod *mod,
-                          struct rsnd_dai *rdai,
-                          struct rsnd_dai_stream *io)
+                          struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -294,8 +258,7 @@ static int rsnd_src_start(struct rsnd_mod *mod,
 
 
 static int rsnd_src_stop(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -313,9 +276,9 @@ static struct rsnd_mod_ops rsnd_src_non_ops = {
  *              Gen1 functions
  */
 static int rsnd_src_set_route_gen1(struct rsnd_mod *mod,
-                                   struct rsnd_dai *rdai,
-                                   struct rsnd_dai_stream *io)
+                                   struct rsnd_dai *rdai)
 {
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct src_route_config {
                 u32 mask;
                 int shift;
@@ -351,9 +314,9 @@ static int rsnd_src_set_route_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod,
-                                            struct rsnd_dai *rdai,
-                                            struct rsnd_dai_stream *io)
+                                            struct rsnd_dai *rdai)
 {
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
@@ -410,12 +373,11 @@ static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,
-                                          struct rsnd_dai *rdai,
-                                          struct rsnd_dai_stream *io)
+                                          struct rsnd_dai *rdai)
 {
         int ret;
 
-        ret = rsnd_src_set_convert_rate(mod, rdai, io);
+        ret = rsnd_src_set_convert_rate(mod, rdai);
         if (ret < 0)
                 return ret;
 
@@ -432,24 +394,23 @@ static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_init_gen1(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         int ret;
 
-        ret = rsnd_src_init(mod, rdai, io);
+        ret = rsnd_src_init(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_route_gen1(mod, rdai, io);
+        ret = rsnd_src_set_route_gen1(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_rate_gen1(mod, rdai, io);
+        ret = rsnd_src_set_convert_rate_gen1(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_timing_gen1(mod, rdai, io);
+        ret = rsnd_src_set_convert_timing_gen1(mod, rdai);
         if (ret < 0)
                 return ret;
 
@@ -457,25 +418,23 @@ static int rsnd_src_init_gen1(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start_gen1(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai,
-                               struct rsnd_dai_stream *io)
+                               struct rsnd_dai *rdai)
 {
         int id = rsnd_mod_id(mod);
 
         rsnd_mod_bset(mod, SRC_ROUTE_CTRL, (1 << id), (1 << id));
 
-        return rsnd_src_start(mod, rdai, io);
+        return rsnd_src_start(mod, rdai);
 }
 
 static int rsnd_src_stop_gen1(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         int id = rsnd_mod_id(mod);
 
         rsnd_mod_bset(mod, SRC_ROUTE_CTRL, (1 << id), 0);
 
-        return rsnd_src_stop(mod, rdai, io);
+        return rsnd_src_stop(mod, rdai);
 }
 
 static struct rsnd_mod_ops rsnd_src_gen1_ops = {
@@ -490,17 +449,16 @@ static struct rsnd_mod_ops rsnd_src_gen1_ops = {
  *              Gen2 functions
  */
 static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,
-                                          struct rsnd_dai *rdai,
-                                          struct rsnd_dai_stream *io)
+                                          struct rsnd_dai *rdai)
 {
         int ret;
 
-        ret = rsnd_src_set_convert_rate(mod, rdai, io);
+        ret = rsnd_src_set_convert_rate(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        rsnd_mod_write(mod, SSI_BUSIF_ADINR, rsnd_mod_read(mod, SRC_ADINR));
-        rsnd_mod_write(mod, SSI_BUSIF_MODE,  rsnd_mod_read(mod, SRC_BUSIF_MODE));
+        rsnd_mod_write(mod, SSI_BUSIF_ADINR, rsnd_get_adinr(mod));
+        rsnd_mod_write(mod, SSI_BUSIF_MODE,  1);
 
         rsnd_mod_write(mod, SRC_SRCCR, 0x00011110);
 
@@ -511,9 +469,9 @@ static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod,
-                                            struct rsnd_dai *rdai,
-                                            struct rsnd_dai_stream *io)
+                                            struct rsnd_dai *rdai)
 {
+        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);
@@ -530,25 +488,16 @@ static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai,
-                               struct rsnd_dai_stream *io)
+                               struct rsnd_dai *rdai)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
-        struct rcar_snd_info *info = rsnd_priv_to_info(priv);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
-        struct rsnd_mod *ssi = rsnd_ssi_mod_get(priv, rsnd_mod_id(mod));
         struct device *dev = rsnd_priv_to_dev(priv);
         int ret;
-        int is_play;
-
-        if (info->dai_info)
-                is_play = rsnd_info_is_playback(priv, src);
-        else
-                is_play = rsnd_ssi_is_play(ssi);
 
         ret = rsnd_dma_init(priv,
                             rsnd_mod_to_dma(mod),
-                            is_play,
+                            rsnd_info_is_playback(priv, src),
                             src->info->dma_id);
         if (ret < 0)
                 dev_err(dev, "SRC DMA failed\n");
@@ -557,8 +506,7 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_remove_gen2(struct rsnd_mod *mod,
-                                struct rsnd_dai *rdai,
-                                struct rsnd_dai_stream *io)
+                                struct rsnd_dai *rdai)
 {
         rsnd_dma_quit(rsnd_mod_to_priv(mod), rsnd_mod_to_dma(mod));
 
@@ -566,20 +514,19 @@ static int rsnd_src_remove_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_init_gen2(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         int ret;
 
-        ret = rsnd_src_init(mod, rdai, io);
+        ret = rsnd_src_init(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_rate_gen2(mod, rdai, io);
+        ret = rsnd_src_set_convert_rate_gen2(mod, rdai);
         if (ret < 0)
                 return ret;
 
-        ret = rsnd_src_set_convert_timing_gen2(mod, rdai, io);
+        ret = rsnd_src_set_convert_timing_gen2(mod, rdai);
         if (ret < 0)
                 return ret;
 
@@ -587,22 +534,22 @@ static int rsnd_src_init_gen2(struct rsnd_mod *mod,
 }
 
 static int rsnd_src_start_gen2(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai,
-                               struct rsnd_dai_stream *io)
+                               struct rsnd_dai *rdai)
 {
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct rsnd_src *src = rsnd_mod_to_src(mod);
+        u32 val = rsnd_io_to_mod_dvc(io) ? 0x01 : 0x11;
 
         rsnd_dma_start(rsnd_mod_to_dma(&src->mod));
 
         rsnd_mod_write(mod, SSI_CTRL, 0x1);
-        rsnd_mod_write(mod, SRC_CTRL, 0x11);
+        rsnd_mod_write(mod, SRC_CTRL, val);
 
-        return rsnd_src_start(mod, rdai, io);
+        return rsnd_src_start(mod, rdai);
 }
 
 static int rsnd_src_stop_gen2(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         struct rsnd_src *src = rsnd_mod_to_src(mod);
 
@@ -611,7 +558,7 @@ static int rsnd_src_stop_gen2(struct rsnd_mod *mod,
 
         rsnd_dma_stop(rsnd_mod_to_dma(&src->mod));
 
-        return rsnd_src_stop(mod, rdai, io);
+        return rsnd_src_stop(mod, rdai);
 }
 
 static struct rsnd_mod_ops rsnd_src_gen2_ops = {
@@ -699,11 +646,6 @@ int rsnd_src_probe(struct platform_device *pdev,
                 snprintf(name, RSND_SRC_NAME_SIZE, "src.%d", i);
 
                 clk = devm_clk_get(dev, name);
-                if (IS_ERR(clk)) {
-                        snprintf(name, RSND_SRC_NAME_SIZE, "scu.%d", i);
-                        clk = devm_clk_get(dev, name);
-                }
-
                 if (IS_ERR(clk))
                         return PTR_ERR(clk);
 
@@ -711,12 +653,10 @@ int rsnd_src_probe(struct platform_device *pdev,
                 src->clk = clk;
 
                 ops = &rsnd_src_non_ops;
-                if (rsnd_src_hpbif_is_enable(src)) {
-                        if (rsnd_is_gen1(priv))
-                                ops = &rsnd_src_gen1_ops;
-                        if (rsnd_is_gen2(priv))
-                                ops = &rsnd_src_gen2_ops;
-                }
+                if (rsnd_is_gen1(priv))
+                        ops = &rsnd_src_gen1_ops;
+                if (rsnd_is_gen2(priv))
+                        ops = &rsnd_src_gen2_ops;
 
                 rsnd_mod_init(priv, &src->mod, ops, RSND_MOD_SRC, i);
 
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 1d8387c25bd8..36654bd4e428 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -240,10 +240,10 @@ static void rsnd_ssi_hw_stop(struct rsnd_ssi *ssi,
  *      SSI mod common functions
  */
 static int rsnd_ssi_init(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
         struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
         u32 cr;
 
@@ -287,14 +287,13 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
         ssi->cr_own     = cr;
         ssi->err        = -1; /* ignore 1st error */
 
-        rsnd_src_ssi_mode_init(mod, rdai, io);
+        rsnd_src_ssi_mode_init(mod, rdai);
 
         return 0;
 }
 
 static int rsnd_ssi_quit(struct rsnd_mod *mod,
-                         struct rsnd_dai *rdai,
-                         struct rsnd_dai_stream *io)
+                         struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
@@ -359,8 +358,7 @@ static irqreturn_t rsnd_ssi_pio_interrupt(int irq, void *data)
 }
 
 static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct device *dev = rsnd_priv_to_dev(priv);
@@ -379,15 +377,15 @@ static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_pio_start(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
 
         /* enable PIO IRQ */
         ssi->cr_etc = UIEN | OIEN | DIEN;
 
-        rsnd_src_enable_ssi_irq(mod, rdai, io);
+        rsnd_src_enable_ssi_irq(mod, rdai);
 
         rsnd_ssi_hw_start(ssi, rdai, io);
 
@@ -395,8 +393,7 @@ static int rsnd_ssi_pio_start(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_pio_stop(struct rsnd_mod *mod,
-                             struct rsnd_dai *rdai,
-                             struct rsnd_dai_stream *io)
+                             struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
 
@@ -417,25 +414,17 @@ static struct rsnd_mod_ops rsnd_ssi_pio_ops = {
 };
 
 static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
-                          struct rsnd_dai *rdai,
-                          struct rsnd_dai_stream *io)
+                          struct rsnd_dai *rdai)
 {
         struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-        struct rcar_snd_info *info = rsnd_priv_to_info(priv);
         struct device *dev = rsnd_priv_to_dev(priv);
         int dma_id = ssi->info->dma_id;
-        int is_play;
         int ret;
 
-        if (info->dai_info)
-                is_play = rsnd_info_is_playback(priv, ssi);
-        else
-                is_play = rsnd_ssi_is_play(&ssi->mod);
-
         ret = rsnd_dma_init(
                 priv, rsnd_mod_to_dma(mod),
-                is_play,
+                rsnd_info_is_playback(priv, ssi),
                 dma_id);
 
         if (ret < 0)
@@ -445,8 +434,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
-                               struct rsnd_dai *rdai,
-                               struct rsnd_dai_stream *io)
+                               struct rsnd_dai *rdai)
 {
         rsnd_dma_quit(rsnd_mod_to_priv(mod), rsnd_mod_to_dma(mod));
 
@@ -454,11 +442,11 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_dma_start(struct rsnd_mod *mod,
-                              struct rsnd_dai *rdai,
-                              struct rsnd_dai_stream *io)
+                              struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_dma *dma = rsnd_mod_to_dma(&ssi->mod);
+        struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
 
         /* enable DMA transfer */
         ssi->cr_etc = DMEN;
@@ -475,8 +463,7 @@ static int rsnd_ssi_dma_start(struct rsnd_mod *mod,
 }
 
 static int rsnd_ssi_dma_stop(struct rsnd_mod *mod,
-                             struct rsnd_dai *rdai,
-                             struct rsnd_dai_stream *io)
+                             struct rsnd_dai *rdai)
 {
         struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
         struct rsnd_dma *dma = rsnd_mod_to_dma(&ssi->mod);
@@ -512,41 +499,6 @@ static struct rsnd_mod_ops rsnd_ssi_non_ops = {
 /*
  *              ssi mod function
  */
-struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv,
-                                          int dai_id, int is_play)
-{
-        struct rsnd_dai_platform_info *dai_info = NULL;
-        struct rsnd_dai_path_info *path_info = NULL;
-        struct rsnd_ssi_platform_info *target_info = NULL;
-        struct rsnd_ssi *ssi;
-        int i, has_play;
-
-        if (priv->rdai)
-                dai_info = priv->rdai[dai_id].info;
-        if (dai_info)
-                path_info = (is_play) ? &dai_info->playback : &dai_info->capture;
-        if (path_info)
-                target_info = path_info->ssi;
-
-        is_play = !!is_play;
-
-        for_each_rsnd_ssi(ssi, priv, i) {
-                if (target_info == ssi->info)
-                        return &ssi->mod;
-
-                /* for compatible */
-                if (rsnd_ssi_dai_id(ssi) != dai_id)
-                        continue;
-
-                has_play = rsnd_ssi_is_play(&ssi->mod);
-
-                if (is_play == has_play)
-                        return &ssi->mod;
-        }
-
-        return NULL;
-}
-
 struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id)
 {
         if (WARN_ON(id < 0 || id >= rsnd_ssi_nr(priv)))
@@ -562,13 +514,6 @@ int rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod)
         return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_CLK_PIN_SHARE);
 }
 
-int rsnd_ssi_is_play(struct rsnd_mod *mod)
-{
-        struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-
-        return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_PLAY);
-}
-
 static void rsnd_ssi_parent_clk_setup(struct rsnd_priv *priv, struct rsnd_ssi *ssi)
 {
         if (!rsnd_ssi_is_pin_sharing(&ssi->mod))
diff --git a/sound/soc/sirf/sirf-audio-port.c b/sound/soc/sirf/sirf-audio-port.c
index b04a53f2b4f6..b4afa31b2bc1 100644
--- a/sound/soc/sirf/sirf-audio-port.c
+++ b/sound/soc/sirf/sirf-audio-port.c
@@ -6,60 +6,15 @@
  * Licensed under GPLv2 or later.
  */
 #include <linux/module.h>
-#include <linux/io.h>
-#include <linux/regmap.h>
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
 
-#include "sirf-audio-port.h"
-
 struct sirf_audio_port {
         struct regmap *regmap;
         struct snd_dmaengine_dai_dma_data playback_dma_data;
         struct snd_dmaengine_dai_dma_data capture_dma_data;
 };
 
-static void sirf_audio_port_tx_enable(struct sirf_audio_port *port)
-{
-        regmap_update_bits(port->regmap, AUDIO_PORT_IC_TXFIFO_OP,
-                AUDIO_FIFO_RESET, AUDIO_FIFO_RESET);
-        regmap_write(port->regmap, AUDIO_PORT_IC_TXFIFO_INT_MSK, 0);
-        regmap_write(port->regmap, AUDIO_PORT_IC_TXFIFO_OP, 0);
-        regmap_update_bits(port->regmap, AUDIO_PORT_IC_TXFIFO_OP,
-                AUDIO_FIFO_START, AUDIO_FIFO_START);
-        regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_TX_CTRL,
-                IC_TX_ENABLE, IC_TX_ENABLE);
-}
-
-static void sirf_audio_port_tx_disable(struct sirf_audio_port *port)
-{
-        regmap_write(port->regmap, AUDIO_PORT_IC_TXFIFO_OP, 0);
-        regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_TX_CTRL,
-                IC_TX_ENABLE, ~IC_TX_ENABLE);
-}
-
-static void sirf_audio_port_rx_enable(struct sirf_audio_port *port,
-        int channels)
-{
-        regmap_update_bits(port->regmap, AUDIO_PORT_IC_RXFIFO_OP,
-                AUDIO_FIFO_RESET, AUDIO_FIFO_RESET);
-        regmap_write(port->regmap, AUDIO_PORT_IC_RXFIFO_INT_MSK, 0);
-        regmap_write(port->regmap, AUDIO_PORT_IC_RXFIFO_OP, 0);
-        regmap_update_bits(port->regmap, AUDIO_PORT_IC_RXFIFO_OP,
-                AUDIO_FIFO_START, AUDIO_FIFO_START);
-        if (channels == 1)
-                regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_RX_CTRL,
-                        IC_RX_ENABLE_MONO, IC_RX_ENABLE_MONO);
-        else
-                regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_RX_CTRL,
-                        IC_RX_ENABLE_STEREO, IC_RX_ENABLE_STEREO);
-}
-
-static void sirf_audio_port_rx_disable(struct sirf_audio_port *port)
-{
-        regmap_update_bits(port->regmap, AUDIO_PORT_IC_CODEC_RX_CTRL,
-                        IC_RX_ENABLE_STEREO, ~IC_RX_ENABLE_STEREO);
-}
 
 static int sirf_audio_port_dai_probe(struct snd_soc_dai *dai)
 {
@@ -69,41 +24,6 @@ static int sirf_audio_port_dai_probe(struct snd_soc_dai *dai)
         return 0;
 }
 
-static int sirf_audio_port_trigger(struct snd_pcm_substream *substream, int cmd,
-        struct snd_soc_dai *dai)
-{
-        struct sirf_audio_port *port = snd_soc_dai_get_drvdata(dai);
-        int playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
-
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_STOP:
-        case SNDRV_PCM_TRIGGER_SUSPEND:
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                if (playback)
-                        sirf_audio_port_tx_disable(port);
-                else
-                        sirf_audio_port_rx_disable(port);
-                break;
-        case SNDRV_PCM_TRIGGER_START:
-        case SNDRV_PCM_TRIGGER_RESUME:
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                if (playback)
-                        sirf_audio_port_tx_enable(port);
-                else
-                        sirf_audio_port_rx_enable(port,
-                                substream->runtime->channels);
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static const struct snd_soc_dai_ops sirf_audio_port_dai_ops = {
-        .trigger = sirf_audio_port_trigger,
-};
-
 static struct snd_soc_dai_driver sirf_audio_port_dai = {
         .probe = sirf_audio_port_dai_probe,
         .name = "sirf-audio-port",
@@ -120,49 +40,22 @@ static struct snd_soc_dai_driver sirf_audio_port_dai = {
                 .rates = SNDRV_PCM_RATE_48000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,
         },
-        .ops = &sirf_audio_port_dai_ops,
 };
 
 static const struct snd_soc_component_driver sirf_audio_port_component = {
         .name       = "sirf-audio-port",
 };
 
-static const struct regmap_config sirf_audio_port_regmap_config = {
-        .reg_bits = 32,
-        .reg_stride = 4,
-        .val_bits = 32,
-        .max_register = AUDIO_PORT_IC_RXFIFO_INT_MSK,
-        .cache_type = REGCACHE_NONE,
-};
-
 static int sirf_audio_port_probe(struct platform_device *pdev)
 {
         int ret;
         struct sirf_audio_port *port;
-        void __iomem *base;
-        struct resource *mem_res;
 
         port = devm_kzalloc(&pdev->dev,
                         sizeof(struct sirf_audio_port), GFP_KERNEL);
         if (!port)
                 return -ENOMEM;
 
-        mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!mem_res) {
-                dev_err(&pdev->dev, "no mem resource?\n");
-                return -ENODEV;
-        }
-
-        base = devm_ioremap(&pdev->dev, mem_res->start,
-                        resource_size(mem_res));
-        if (base == NULL)
-                return -ENOMEM;
-
-        port->regmap = devm_regmap_init_mmio(&pdev->dev, base,
-                                            &sirf_audio_port_regmap_config);
-        if (IS_ERR(port->regmap))
-                return PTR_ERR(port->regmap);
-
         ret = devm_snd_soc_register_component(&pdev->dev,
                         &sirf_audio_port_component, &sirf_audio_port_dai, 1);
         if (ret)
diff --git a/sound/soc/sirf/sirf-audio-port.h b/sound/soc/sirf/sirf-audio-port.h
deleted file mode 100644
index f32dc54f4499..000000000000
--- a/sound/soc/sirf/sirf-audio-port.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * SiRF Audio port controllers define
- *
- * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
- *
- * Licensed under GPLv2 or later.
- */
-
-#ifndef _SIRF_AUDIO_PORT_H
-#define _SIRF_AUDIO_PORT_H
-
-#define AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK     0x3F
-#define AUDIO_PORT_TX_FIFO_SC_OFFSET    0
-#define AUDIO_PORT_TX_FIFO_LC_OFFSET    10
-#define AUDIO_PORT_TX_FIFO_HC_OFFSET    20
-
-#define TX_FIFO_SC(x)           (((x) & AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK) \
-                                << AUDIO_PORT_TX_FIFO_SC_OFFSET)
-#define TX_FIFO_LC(x)           (((x) & AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK) \
-                                << AUDIO_PORT_TX_FIFO_LC_OFFSET)
-#define TX_FIFO_HC(x)           (((x) & AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK) \
-                                << AUDIO_PORT_TX_FIFO_HC_OFFSET)
-
-#define AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK     0x0F
-#define AUDIO_PORT_RX_FIFO_SC_OFFSET    0
-#define AUDIO_PORT_RX_FIFO_LC_OFFSET    10
-#define AUDIO_PORT_RX_FIFO_HC_OFFSET    20
-
-#define RX_FIFO_SC(x)           (((x) & AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK) \
-                                << AUDIO_PORT_RX_FIFO_SC_OFFSET)
-#define RX_FIFO_LC(x)           (((x) & AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK) \
-                                << AUDIO_PORT_RX_FIFO_LC_OFFSET)
-#define RX_FIFO_HC(x)           (((x) & AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK) \
-                                << AUDIO_PORT_RX_FIFO_HC_OFFSET)
-#define AUDIO_PORT_IC_CODEC_TX_CTRL             (0x00F4)
-#define AUDIO_PORT_IC_CODEC_RX_CTRL             (0x00F8)
-
-#define AUDIO_PORT_IC_TXFIFO_OP                 (0x00FC)
-#define AUDIO_PORT_IC_TXFIFO_LEV_CHK            (0x0100)
-#define AUDIO_PORT_IC_TXFIFO_STS                (0x0104)
-#define AUDIO_PORT_IC_TXFIFO_INT                (0x0108)
-#define AUDIO_PORT_IC_TXFIFO_INT_MSK            (0x010C)
-
-#define AUDIO_PORT_IC_RXFIFO_OP                 (0x0110)
-#define AUDIO_PORT_IC_RXFIFO_LEV_CHK            (0x0114)
-#define AUDIO_PORT_IC_RXFIFO_STS                (0x0118)
-#define AUDIO_PORT_IC_RXFIFO_INT                (0x011C)
-#define AUDIO_PORT_IC_RXFIFO_INT_MSK            (0x0120)
-
-#define AUDIO_FIFO_START                (1 << 0)
-#define AUDIO_FIFO_RESET                (1 << 1)
-
-#define AUDIO_FIFO_FULL                 (1 << 0)
-#define AUDIO_FIFO_EMPTY                (1 << 1)
-#define AUDIO_FIFO_OFLOW                (1 << 2)
-#define AUDIO_FIFO_UFLOW                (1 << 3)
-
-#define IC_TX_ENABLE            (0x03)
-#define IC_RX_ENABLE_MONO       (0x01)
-#define IC_RX_ENABLE_STEREO     (0x03)
-
-#endif /*__SIRF_AUDIO_PORT_H*/
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index bfed3e4c45ff..3fa77d5f9b75 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -162,8 +162,6 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
                                                   i, codec_drv->reg_word_size) == val)
                                 continue;
 
-                WARN_ON(!snd_soc_codec_writable_register(codec, i));
-
                 ret = snd_soc_write(codec, i, val);
                 if (ret)
                         return ret;
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 91083e6a6b38..10f7f1da2aca 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -203,7 +203,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
 
         if (platform->driver->compr_ops && platform->driver->compr_ops->free)
                 platform->driver->compr_ops->free(cstream);
-        cpu_dai->runtime = NULL;
 
         if (cstream->direction == SND_COMPRESS_PLAYBACK) {
                 if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
@@ -317,8 +316,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
                 cmd == SND_COMPR_TRIGGER_DRAIN) {
 
                 if (platform->driver->compr_ops &&
-                        platform->driver->compr_ops->trigger)
-                return platform->driver->compr_ops->trigger(cstream, cmd);
+                    platform->driver->compr_ops->trigger)
+                        return platform->driver->compr_ops->trigger(cstream,
+                                                                    cmd);
         }
 
         if (cstream->direction == SND_COMPRESS_PLAYBACK)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 051c006281f5..b87d7d882e6d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -154,22 +154,15 @@ static ssize_t soc_codec_reg_show(struct snd_soc_codec *codec, char *buf,
                 step = codec->driver->reg_cache_step;
 
         for (i = 0; i < codec->driver->reg_cache_size; i += step) {
-                if (!snd_soc_codec_readable_register(codec, i))
-                        continue;
-                if (codec->driver->display_register) {
-                        count += codec->driver->display_register(codec, buf + count,
-                                                         PAGE_SIZE - count, i);
-                } else {
-                        /* only support larger than PAGE_SIZE bytes debugfs
-                         * entries for the default case */
-                        if (p >= pos) {
-                                if (total + len >= count - 1)
-                                        break;
-                                format_register_str(codec, i, buf + total, len);
-                                total += len;
-                        }
-                        p += len;
+                /* only support larger than PAGE_SIZE bytes debugfs
+                 * entries for the default case */
+                if (p >= pos) {
+                        if (total + len >= count - 1)
+                                break;
+                        format_register_str(codec, i, buf + total, len);
+                        total += len;
                 }
+                p += len;
         }
 
         total = min(total, count - 1);
@@ -663,8 +656,8 @@ int snd_soc_suspend(struct device *dev)
                                 codec->driver->suspend(codec);
                                 codec->suspended = 1;
                                 codec->cache_sync = 1;
-                                if (codec->using_regmap)
-                                        regcache_mark_dirty(codec->control_data);
+                                if (codec->component.regmap)
+                                        regcache_mark_dirty(codec->component.regmap);
                                 /* deactivate pins to sleep state */
                                 pinctrl_pm_select_sleep_state(codec->dev);
                                 break;
@@ -854,14 +847,47 @@ EXPORT_SYMBOL_GPL(snd_soc_resume);
 static const struct snd_soc_dai_ops null_dai_ops = {
 };
 
+static struct snd_soc_codec *soc_find_codec(const struct device_node *codec_of_node,
+                                            const char *codec_name)
+{
+        struct snd_soc_codec *codec;
+
+        list_for_each_entry(codec, &codec_list, list) {
+                if (codec_of_node) {
+                        if (codec->dev->of_node != codec_of_node)
+                                continue;
+                } else {
+                        if (strcmp(codec->name, codec_name))
+                                continue;
+                }
+
+                return codec;
+        }
+
+        return NULL;
+}
+
+static struct snd_soc_dai *soc_find_codec_dai(struct snd_soc_codec *codec,
+                                              const char *codec_dai_name)
+{
+        struct snd_soc_dai *codec_dai;
+
+        list_for_each_entry(codec_dai, &codec->component.dai_list, list) {
+                if (!strcmp(codec_dai->name, codec_dai_name)) {
+                        return codec_dai;
+                }
+        }
+
+        return NULL;
+}
+
 static int soc_bind_dai_link(struct snd_soc_card *card, int num)
 {
         struct snd_soc_dai_link *dai_link = &card->dai_link[num];
         struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
         struct snd_soc_component *component;
-        struct snd_soc_codec *codec;
         struct snd_soc_platform *platform;
-        struct snd_soc_dai *codec_dai, *cpu_dai;
+        struct snd_soc_dai *cpu_dai;
         const char *platform_name;
 
         dev_dbg(card->dev, "ASoC: binding %s at idx %d\n", dai_link->name, num);
@@ -889,42 +915,24 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
                 return -EPROBE_DEFER;
         }
 
-        /* Find CODEC from registered CODECs */
-        list_for_each_entry(codec, &codec_list, list) {
-                if (dai_link->codec_of_node) {
-                        if (codec->dev->of_node != dai_link->codec_of_node)
-                                continue;
-                } else {
-                        if (strcmp(codec->name, dai_link->codec_name))
-                                continue;
-                }
-
-                rtd->codec = codec;
-
-                /*
-                 * CODEC found, so find CODEC DAI from registered DAIs from
-                 * this CODEC
-                 */
-                list_for_each_entry(codec_dai, &codec->component.dai_list, list) {
-                        if (!strcmp(codec_dai->name, dai_link->codec_dai_name)) {
-                                rtd->codec_dai = codec_dai;
-                                break;
-                        }
-                }
-
-                if (!rtd->codec_dai) {
-                        dev_err(card->dev, "ASoC: CODEC DAI %s not registered\n",
-                                dai_link->codec_dai_name);
-                        return -EPROBE_DEFER;
-                }
-        }
-
+        /* Find CODEC from registered list */
+        rtd->codec = soc_find_codec(dai_link->codec_of_node,
+                                    dai_link->codec_name);
         if (!rtd->codec) {
                 dev_err(card->dev, "ASoC: CODEC %s not registered\n",
                         dai_link->codec_name);
                 return -EPROBE_DEFER;
         }
 
+        /* Find CODEC DAI from registered list */
+        rtd->codec_dai = soc_find_codec_dai(rtd->codec,
+                                            dai_link->codec_dai_name);
+        if (!rtd->codec_dai) {
+                dev_err(card->dev, "ASoC: CODEC DAI %s not registered\n",
+                        dai_link->codec_dai_name);
+                return -EPROBE_DEFER;
+        }
+
         /* if there's no platform we match on the empty platform */
         platform_name = dai_link->platform_name;
         if (!platform_name && !dai_link->platform_of_node)
@@ -995,6 +1003,23 @@ static void soc_remove_codec(struct snd_soc_codec *codec)
         module_put(codec->dev->driver->owner);
 }
 
+static void soc_remove_codec_dai(struct snd_soc_dai *codec_dai, int order)
+{
+        int err;
+
+        if (codec_dai && codec_dai->probed &&
+                        codec_dai->driver->remove_order == order) {
+                if (codec_dai->driver->remove) {
+                        err = codec_dai->driver->remove(codec_dai);
+                        if (err < 0)
+                                dev_err(codec_dai->dev,
+                                        "ASoC: failed to remove %s: %d\n",
+                                        codec_dai->name, err);
+                }
+                codec_dai->probed = 0;
+        }
+}
+
 static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
 {
         struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
@@ -1010,18 +1035,7 @@ static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
         }
 
         /* remove the CODEC DAI */
-        if (codec_dai && codec_dai->probed &&
-                        codec_dai->driver->remove_order == order) {
-                if (codec_dai->driver->remove) {
-                        err = codec_dai->driver->remove(codec_dai);
-                        if (err < 0)
-                                dev_err(codec_dai->dev,
-                                        "ASoC: failed to remove %s: %d\n",
-                                        codec_dai->name, err);
-                }
-                codec_dai->probed = 0;
-                list_del(&codec_dai->card_list);
-        }
+        soc_remove_codec_dai(codec_dai, order);
 
         /* remove the cpu_dai */
         if (cpu_dai && cpu_dai->probed &&
@@ -1034,7 +1048,6 @@ static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
                                         cpu_dai->name, err);
                 }
                 cpu_dai->probed = 0;
-                list_del(&cpu_dai->card_list);
 
                 if (!cpu_dai->codec) {
                         snd_soc_dapm_free(&cpu_dai->dapm);
@@ -1104,10 +1117,12 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
 
         for (i = 0; i < card->num_configs; i++) {
                 struct snd_soc_codec_conf *map = &card->codec_conf[i];
-                if (map->dev_name && !strcmp(codec->name, map->dev_name)) {
-                        codec->name_prefix = map->name_prefix;
-                        break;
-                }
+                if (map->of_node && codec->dev->of_node != map->of_node)
+                        continue;
+                if (map->dev_name && strcmp(codec->name, map->dev_name))
+                        continue;
+                codec->name_prefix = map->name_prefix;
+                break;
         }
 }
 
@@ -1127,26 +1142,31 @@ static int soc_probe_codec(struct snd_soc_card *card,
 
         soc_init_codec_debugfs(codec);
 
-        if (driver->dapm_widgets)
-                snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets,
-                                          driver->num_dapm_widgets);
+        if (driver->dapm_widgets) {
+                ret = snd_soc_dapm_new_controls(&codec->dapm,
+                                                driver->dapm_widgets,
+                                                driver->num_dapm_widgets);
 
-        /* Create DAPM widgets for each DAI stream */
-        list_for_each_entry(dai, &codec->component.dai_list, list)
-                snd_soc_dapm_new_dai_widgets(&codec->dapm, dai);
+                if (ret != 0) {
+                        dev_err(codec->dev,
+                                "Failed to create new controls %d\n", ret);
+                        goto err_probe;
+                }
+        }
 
-        codec->dapm.idle_bias_off = driver->idle_bias_off;
+        /* Create DAPM widgets for each DAI stream */
+        list_for_each_entry(dai, &codec->component.dai_list, list) {
+                ret = snd_soc_dapm_new_dai_widgets(&codec->dapm, dai);
 
-        if (!codec->write && dev_get_regmap(codec->dev, NULL)) {
-                /* Set the default I/O up try regmap */
-                ret = snd_soc_codec_set_cache_io(codec, NULL);
-                if (ret < 0) {
+                if (ret != 0) {
                         dev_err(codec->dev,
-                                "Failed to set cache I/O: %d\n", ret);
+                                "Failed to create DAI widgets %d\n", ret);
                         goto err_probe;
                 }
         }
 
+        codec->dapm.idle_bias_off = driver->idle_bias_off;
+
         if (driver->probe) {
                 ret = driver->probe(codec);
                 if (ret < 0) {
@@ -1246,6 +1266,50 @@ static void rtd_release(struct device *dev)
         kfree(dev);
 }
 
+static int soc_aux_dev_init(struct snd_soc_card *card,
+                            struct snd_soc_codec *codec,
+                            int num)
+{
+        struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
+        struct snd_soc_pcm_runtime *rtd = &card->rtd_aux[num];
+        int ret;
+
+        rtd->card = card;
+
+        /* do machine specific initialization */
+        if (aux_dev->init) {
+                ret = aux_dev->init(&codec->dapm);
+                if (ret < 0)
+                        return ret;
+        }
+
+        rtd->codec = codec;
+
+        return 0;
+}
+
+static int soc_dai_link_init(struct snd_soc_card *card,
+                             struct snd_soc_codec *codec,
+                             int num)
+{
+        struct snd_soc_dai_link *dai_link =  &card->dai_link[num];
+        struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
+        int ret;
+
+        rtd->card = card;
+
+        /* do machine specific initialization */
+        if (dai_link->init) {
+                ret = dai_link->init(rtd);
+                if (ret < 0)
+                        return ret;
+        }
+
+        rtd->codec = codec;
+
+        return 0;
+}
+
 static int soc_post_component_init(struct snd_soc_card *card,
                                    struct snd_soc_codec *codec,
                                    int num, int dailess)
@@ -1260,26 +1324,20 @@ static int soc_post_component_init(struct snd_soc_card *card,
                 dai_link = &card->dai_link[num];
                 rtd = &card->rtd[num];
                 name = dai_link->name;
+                ret = soc_dai_link_init(card, codec, num);
         } else {
                 aux_dev = &card->aux_dev[num];
                 rtd = &card->rtd_aux[num];
                 name = aux_dev->name;
+                ret = soc_aux_dev_init(card, codec, num);
         }
-        rtd->card = card;
 
-        /* do machine specific initialization */
-        if (!dailess && dai_link->init)
-                ret = dai_link->init(rtd);
-        else if (dailess && aux_dev->init)
-                ret = aux_dev->init(&codec->dapm);
         if (ret < 0) {
                 dev_err(card->dev, "ASoC: failed to init %s: %d\n", name, ret);
                 return ret;
         }
 
         /* register the rtd device */
-        rtd->codec = codec;
-
         rtd->dev = kzalloc(sizeof(struct device), GFP_KERNEL);
         if (!rtd->dev)
                 return -ENOMEM;
@@ -1366,6 +1424,66 @@ static int soc_probe_link_components(struct snd_soc_card *card, int num,
         return 0;
 }
 
+static int soc_probe_codec_dai(struct snd_soc_card *card,
+                               struct snd_soc_dai *codec_dai,
+                               int order)
+{
+        int ret;
+
+        if (!codec_dai->probed && codec_dai->driver->probe_order == order) {
+                if (codec_dai->driver->probe) {
+                        ret = codec_dai->driver->probe(codec_dai);
+                        if (ret < 0) {
+                                dev_err(codec_dai->dev,
+                                        "ASoC: failed to probe CODEC DAI %s: %d\n",
+                                        codec_dai->name, ret);
+                                return ret;
+                        }
+                }
+
+                /* mark codec_dai as probed and add to card dai list */
+                codec_dai->probed = 1;
+        }
+
+        return 0;
+}
+
+static int soc_link_dai_widgets(struct snd_soc_card *card,
+                                struct snd_soc_dai_link *dai_link,
+                                struct snd_soc_dai *cpu_dai,
+                                struct snd_soc_dai *codec_dai)
+{
+        struct snd_soc_dapm_widget *play_w, *capture_w;
+        int ret;
+
+        /* link the DAI widgets */
+        play_w = codec_dai->playback_widget;
+        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);
+                if (ret != 0) {
+                        dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
+                                play_w->name, capture_w->name, ret);
+                        return ret;
+                }
+        }
+
+        play_w = cpu_dai->playback_widget;
+        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);
+                if (ret != 0) {
+                        dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
+                                play_w->name, capture_w->name, ret);
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+
 static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
 {
         struct snd_soc_dai_link *dai_link = &card->dai_link[num];
@@ -1374,7 +1492,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
         struct snd_soc_platform *platform = rtd->platform;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct snd_soc_dapm_widget *play_w, *capture_w;
         int ret;
 
         dev_dbg(card->dev, "ASoC: probe %s dai link %d late %d\n",
@@ -1410,26 +1527,12 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
                         }
                 }
                 cpu_dai->probed = 1;
-                /* mark cpu_dai as probed and add to card dai list */
-                list_add(&cpu_dai->card_list, &card->dai_dev_list);
         }
 
         /* probe the CODEC DAI */
-        if (!codec_dai->probed && codec_dai->driver->probe_order == order) {
-                if (codec_dai->driver->probe) {
-                        ret = codec_dai->driver->probe(codec_dai);
-                        if (ret < 0) {
-                                dev_err(codec_dai->dev,
-                                        "ASoC: failed to probe CODEC DAI %s: %d\n",
-                                        codec_dai->name, ret);
-                                return ret;
-                        }
-                }
-
-                /* mark codec_dai as probed and add to card dai list */
-                codec_dai->probed = 1;
-                list_add(&codec_dai->card_list, &card->dai_dev_list);
-        }
+        ret = soc_probe_codec_dai(card, codec_dai, order);
+        if (ret)
+                return ret;
 
         /* complete DAI probe during last probe */
         if (order != SND_SOC_COMP_ORDER_LAST)
@@ -1467,29 +1570,10 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
                                                 codec2codec_close_delayed_work);
 
                         /* link the DAI widgets */
-                        play_w = codec_dai->playback_widget;
-                        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);
-                                if (ret != 0) {
-                                        dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
-                                                play_w->name, capture_w->name, ret);
-                                        return ret;
-                                }
-                        }
-
-                        play_w = cpu_dai->playback_widget;
-                        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);
-                                if (ret != 0) {
-                                        dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
-                                                play_w->name, capture_w->name, ret);
-                                        return ret;
-                                }
-                        }
+                        ret = soc_link_dai_widgets(card, dai_link,
+                                        cpu_dai, codec_dai);
+                        if (ret)
+                                return ret;
                 }
         }
 
@@ -1501,14 +1585,15 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
 }
 
 #ifdef CONFIG_SND_SOC_AC97_BUS
-static int soc_register_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
+static int soc_register_ac97_codec(struct snd_soc_codec *codec,
+                                   struct snd_soc_dai *codec_dai)
 {
         int ret;
 
         /* Only instantiate AC97 if not already done by the adaptor
          * for the generic AC97 subsystem.
          */
-        if (rtd->codec_dai->driver->ac97_control && !rtd->codec->ac97_registered) {
+        if (codec_dai->driver->ac97_control && !codec->ac97_registered) {
                 /*
                  * It is possible that the AC97 device is already registered to
                  * the device subsystem. This happens when the device is created
@@ -1517,76 +1602,101 @@ static int soc_register_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
                  *
                  * In those cases we don't try to register the device again.
                  */
-                if (!rtd->codec->ac97_created)
+                if (!codec->ac97_created)
                         return 0;
 
-                ret = soc_ac97_dev_register(rtd->codec);
+                ret = soc_ac97_dev_register(codec);
                 if (ret < 0) {
-                        dev_err(rtd->codec->dev,
+                        dev_err(codec->dev,
                                 "ASoC: AC97 device register failed: %d\n", ret);
                         return ret;
                 }
 
-                rtd->codec->ac97_registered = 1;
+                codec->ac97_registered = 1;
         }
         return 0;
 }
 
-static void soc_unregister_ac97_dai_link(struct snd_soc_codec *codec)
+static int soc_register_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
+{
+        return soc_register_ac97_codec(rtd->codec, rtd->codec_dai);
+}
+
+static void soc_unregister_ac97_codec(struct snd_soc_codec *codec)
 {
         if (codec->ac97_registered) {
                 soc_ac97_dev_unregister(codec);
                 codec->ac97_registered = 0;
         }
 }
+
+static void soc_unregister_ac97_dai_link(struct snd_soc_pcm_runtime *rtd)
+{
+        soc_unregister_ac97_codec(rtd->codec);
+}
 #endif
 
-static int soc_check_aux_dev(struct snd_soc_card *card, int num)
+static struct snd_soc_codec *soc_find_matching_codec(struct snd_soc_card *card,
+        int num)
 {
         struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
         struct snd_soc_codec *codec;
 
-        /* find CODEC from registered CODECs*/
+        /* find CODEC from registered CODECs */
         list_for_each_entry(codec, &codec_list, list) {
-                if (!strcmp(codec->name, aux_dev->codec_name))
-                        return 0;
+                if (aux_dev->codec_of_node &&
+                   (codec->dev->of_node != aux_dev->codec_of_node))
+                        continue;
+                if (aux_dev->codec_name && strcmp(codec->name, aux_dev->codec_name))
+                        continue;
+                return codec;
         }
 
-        dev_err(card->dev, "ASoC: %s not registered\n", aux_dev->codec_name);
+        return NULL;
+}
 
+static int soc_check_aux_dev(struct snd_soc_card *card, int num)
+{
+        struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
+        const char *codecname = aux_dev->codec_name;
+        struct snd_soc_codec *codec = soc_find_matching_codec(card, num);
+
+        if (codec)
+                return 0;
+        if (aux_dev->codec_of_node)
+                codecname = of_node_full_name(aux_dev->codec_of_node);
+
+        dev_err(card->dev, "ASoC: %s not registered\n", codecname);
         return -EPROBE_DEFER;
 }
 
 static int soc_probe_aux_dev(struct snd_soc_card *card, int num)
 {
         struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
-        struct snd_soc_codec *codec;
+        const char *codecname = aux_dev->codec_name;
         int ret = -ENODEV;
+        struct snd_soc_codec *codec = soc_find_matching_codec(card, num);
 
-        /* find CODEC from registered CODECs*/
-        list_for_each_entry(codec, &codec_list, list) {
-                if (!strcmp(codec->name, aux_dev->codec_name)) {
-                        if (codec->probed) {
-                                dev_err(codec->dev,
-                                        "ASoC: codec already probed");
-                                ret = -EBUSY;
-                                goto out;
-                        }
-                        goto found;
-                }
+        if (!codec) {
+                if (aux_dev->codec_of_node)
+                        codecname = of_node_full_name(aux_dev->codec_of_node);
+
+                /* codec not found */
+                dev_err(card->dev, "ASoC: codec %s not found", codecname);
+                return -EPROBE_DEFER;
+        }
+
+        if (codec->probed) {
+                dev_err(codec->dev, "ASoC: codec already probed");
+                return -EBUSY;
         }
-        /* codec not found */
-        dev_err(card->dev, "ASoC: codec %s not found", aux_dev->codec_name);
-        return -EPROBE_DEFER;
 
-found:
         ret = soc_probe_codec(card, codec);
         if (ret < 0)
                 return ret;
 
         ret = soc_post_component_init(card, codec, num, 1);
 
-out:
         return ret;
 }
 
@@ -1837,7 +1947,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
                         dev_err(card->dev,
                                 "ASoC: failed to register AC97: %d\n", ret);
                         while (--i >= 0)
-                                soc_unregister_ac97_dai_link(card->rtd[i].codec);
+                                soc_unregister_ac97_dai_link(&card->rtd[i]);
                         goto probe_aux_dev_err;
                 }
         }
@@ -1980,92 +2090,6 @@ static struct platform_driver soc_driver = {
 };
 
 /**
- * snd_soc_codec_volatile_register: Report if a register is volatile.
- *
- * @codec: CODEC to query.
- * @reg: Register to query.
- *
- * Boolean function indiciating if a CODEC register is volatile.
- */
-int snd_soc_codec_volatile_register(struct snd_soc_codec *codec,
-                                    unsigned int reg)
-{
-        if (codec->volatile_register)
-                return codec->volatile_register(codec, reg);
-        else
-                return 0;
-}
-EXPORT_SYMBOL_GPL(snd_soc_codec_volatile_register);
-
-/**
- * snd_soc_codec_readable_register: Report if a register is readable.
- *
- * @codec: CODEC to query.
- * @reg: Register to query.
- *
- * Boolean function indicating if a CODEC register is readable.
- */
-int snd_soc_codec_readable_register(struct snd_soc_codec *codec,
-                                    unsigned int reg)
-{
-        if (codec->readable_register)
-                return codec->readable_register(codec, reg);
-        else
-                return 1;
-}
-EXPORT_SYMBOL_GPL(snd_soc_codec_readable_register);
-
-/**
- * snd_soc_codec_writable_register: Report if a register is writable.
- *
- * @codec: CODEC to query.
- * @reg: Register to query.
- *
- * Boolean function indicating if a CODEC register is writable.
- */
-int snd_soc_codec_writable_register(struct snd_soc_codec *codec,
-                                    unsigned int reg)
-{
-        if (codec->writable_register)
-                return codec->writable_register(codec, reg);
-        else
-                return 1;
-}
-EXPORT_SYMBOL_GPL(snd_soc_codec_writable_register);
-
-int snd_soc_platform_read(struct snd_soc_platform *platform,
-                                        unsigned int reg)
-{
-        unsigned int ret;
-
-        if (!platform->driver->read) {
-                dev_err(platform->dev, "ASoC: platform has no read back\n");
-                return -1;
-        }
-
-        ret = platform->driver->read(platform, reg);
-        dev_dbg(platform->dev, "read %x => %x\n", reg, ret);
-        trace_snd_soc_preg_read(platform, reg, ret);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(snd_soc_platform_read);
-
-int snd_soc_platform_write(struct snd_soc_platform *platform,
-                                         unsigned int reg, unsigned int val)
-{
-        if (!platform->driver->write) {
-                dev_err(platform->dev, "ASoC: platform has no write back\n");
-                return -1;
-        }
-
-        dev_dbg(platform->dev, "write %x = %x\n", reg, val);
-        trace_snd_soc_preg_write(platform, reg, val);
-        return platform->driver->write(platform, reg, val);
-}
-EXPORT_SYMBOL_GPL(snd_soc_platform_write);
-
-/**
  * snd_soc_new_ac97_codec - initailise AC97 device
  * @codec: audio codec
  * @ops: AC97 bus operations
@@ -2153,28 +2177,28 @@ static int snd_soc_ac97_parse_pinctl(struct device *dev,
         p = devm_pinctrl_get(dev);
         if (IS_ERR(p)) {
                 dev_err(dev, "Failed to get pinctrl\n");
-                return PTR_RET(p);
+                return PTR_ERR(p);
         }
         cfg->pctl = p;
 
         state = pinctrl_lookup_state(p, "ac97-reset");
         if (IS_ERR(state)) {
                 dev_err(dev, "Can't find pinctrl state ac97-reset\n");
-                return PTR_RET(state);
+                return PTR_ERR(state);
         }
         cfg->pstate_reset = state;
 
         state = pinctrl_lookup_state(p, "ac97-warm-reset");
         if (IS_ERR(state)) {
                 dev_err(dev, "Can't find pinctrl state ac97-warm-reset\n");
-                return PTR_RET(state);
+                return PTR_ERR(state);
         }
         cfg->pstate_warm_reset = state;
 
         state = pinctrl_lookup_state(p, "ac97-running");
         if (IS_ERR(state)) {
                 dev_err(dev, "Can't find pinctrl state ac97-running\n");
-                return PTR_RET(state);
+                return PTR_ERR(state);
         }
         cfg->pstate_run = state;
 
@@ -2273,7 +2297,7 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec)
 {
         mutex_lock(&codec->mutex);
 #ifdef CONFIG_SND_SOC_AC97_BUS
-        soc_unregister_ac97_dai_link(codec);
+        soc_unregister_ac97_codec(codec);
 #endif
         kfree(codec->ac97->bus);
         kfree(codec->ac97);
@@ -2283,118 +2307,6 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec)
 }
 EXPORT_SYMBOL_GPL(snd_soc_free_ac97_codec);
 
-unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg)
-{
-        unsigned int ret;
-
-        ret = codec->read(codec, reg);
-        dev_dbg(codec->dev, "read %x => %x\n", reg, ret);
-        trace_snd_soc_reg_read(codec, reg, ret);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(snd_soc_read);
-
-unsigned int snd_soc_write(struct snd_soc_codec *codec,
-                           unsigned int reg, unsigned int val)
-{
-        dev_dbg(codec->dev, "write %x = %x\n", reg, val);
-        trace_snd_soc_reg_write(codec, reg, val);
-        return codec->write(codec, reg, val);
-}
-EXPORT_SYMBOL_GPL(snd_soc_write);
-
-/**
- * snd_soc_update_bits - update codec register bits
- * @codec: audio codec
- * @reg: codec register
- * @mask: register mask
- * @value: new value
- *
- * Writes new register value.
- *
- * Returns 1 for change, 0 for no change, or negative error code.
- */
-int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
-                                unsigned int mask, unsigned int value)
-{
-        bool change;
-        unsigned int old, new;
-        int ret;
-
-        if (codec->using_regmap) {
-                ret = regmap_update_bits_check(codec->control_data, reg,
-                                               mask, value, &change);
-        } else {
-                ret = snd_soc_read(codec, reg);
-                if (ret < 0)
-                        return ret;
-
-                old = ret;
-                new = (old & ~mask) | (value & mask);
-                change = old != new;
-                if (change)
-                        ret = snd_soc_write(codec, reg, new);
-        }
-
-        if (ret < 0)
-                return ret;
-
-        return change;
-}
-EXPORT_SYMBOL_GPL(snd_soc_update_bits);
-
-/**
- * snd_soc_update_bits_locked - update codec register bits
- * @codec: audio codec
- * @reg: codec register
- * @mask: register mask
- * @value: new value
- *
- * Writes new register value, and takes the codec mutex.
- *
- * Returns 1 for change else 0.
- */
-int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
-                               unsigned short reg, unsigned int mask,
-                               unsigned int value)
-{
-        int change;
-
-        mutex_lock(&codec->mutex);
-        change = snd_soc_update_bits(codec, reg, mask, value);
-        mutex_unlock(&codec->mutex);
-
-        return change;
-}
-EXPORT_SYMBOL_GPL(snd_soc_update_bits_locked);
-
-/**
- * snd_soc_test_bits - test register for change
- * @codec: audio codec
- * @reg: codec register
- * @mask: register mask
- * @value: new value
- *
- * Tests a register with a new value and checks if the new value is
- * different from the old value.
- *
- * Returns 1 for change else 0.
- */
-int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,
-                                unsigned int mask, unsigned int value)
-{
-        int change;
-        unsigned int old, new;
-
-        old = snd_soc_read(codec, reg);
-        new = (old & ~mask) | value;
-        change = old != new;
-
-        return change;
-}
-EXPORT_SYMBOL_GPL(snd_soc_test_bits);
-
 /**
  * snd_soc_cnew - create new control
  * @_template: control template
@@ -2491,7 +2403,7 @@ int snd_soc_add_codec_controls(struct snd_soc_codec *codec,
         struct snd_card *card = codec->card->snd_card;
 
         return snd_soc_add_controls(card, codec->dev, controls, num_controls,
-                        codec->name_prefix, codec);
+                        codec->name_prefix, &codec->component);
 }
 EXPORT_SYMBOL_GPL(snd_soc_add_codec_controls);
 
@@ -2511,7 +2423,7 @@ int snd_soc_add_platform_controls(struct snd_soc_platform *platform,
         struct snd_card *card = platform->card->snd_card;
 
         return snd_soc_add_controls(card, platform->dev, controls, num_controls,
-                        NULL, platform);
+                        NULL, &platform->component);
 }
 EXPORT_SYMBOL_GPL(snd_soc_add_platform_controls);
 
@@ -2595,12 +2507,15 @@ EXPORT_SYMBOL_GPL(snd_soc_info_enum_double);
 int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int val, item;
         unsigned int reg_val;
+        int ret;
 
-        reg_val = snd_soc_read(codec, e->reg);
+        ret = snd_soc_component_read(component, e->reg, &reg_val);
+        if (ret)
+                return ret;
         val = (reg_val >> e->shift_l) & e->mask;
         item = snd_soc_enum_val_to_item(e, val);
         ucontrol->value.enumerated.item[0] = item;
@@ -2626,7 +2541,7 @@ EXPORT_SYMBOL_GPL(snd_soc_get_enum_double);
 int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int *item = ucontrol->value.enumerated.item;
         unsigned int val;
@@ -2643,38 +2558,48 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
                 mask |= e->mask << e->shift_r;
         }
 
-        return snd_soc_update_bits_locked(codec, e->reg, mask, val);
+        return snd_soc_component_update_bits(component, e->reg, mask, val);
 }
 EXPORT_SYMBOL_GPL(snd_soc_put_enum_double);
 
 /**
  * snd_soc_read_signed - Read a codec register and interprete as signed value
- * @codec: codec
+ * @component: component
  * @reg: Register to read
  * @mask: Mask to use after shifting the register value
  * @shift: Right shift of register value
  * @sign_bit: Bit that describes if a number is negative or not.
+ * @signed_val: Pointer to where the read value should be stored
  *
  * This functions reads a codec register. The register value is shifted right
  * by 'shift' bits and masked with the given 'mask'. Afterwards it translates
  * the given registervalue into a signed integer if sign_bit is non-zero.
  *
- * Returns the register value as signed int.
+ * Returns 0 on sucess, otherwise an error value
  */
-static int snd_soc_read_signed(struct snd_soc_codec *codec, unsigned int reg,
-                unsigned int mask, unsigned int shift, unsigned int sign_bit)
+static int snd_soc_read_signed(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int shift,
+        unsigned int sign_bit, int *signed_val)
 {
         int ret;
         unsigned int val;
 
-        val = (snd_soc_read(codec, reg) >> shift) & mask;
+        ret = snd_soc_component_read(component, reg, &val);
+        if (ret < 0)
+                return ret;
 
-        if (!sign_bit)
-                return val;
+        val = (val >> shift) & mask;
+
+        if (!sign_bit) {
+                *signed_val = val;
+                return 0;
+        }
 
         /* non-negative number */
-        if (!(val & BIT(sign_bit)))
-                return val;
+        if (!(val & BIT(sign_bit))) {
+                *signed_val = val;
+                return 0;
+        }
 
         ret = val;
 
@@ -2686,7 +2611,9 @@ static int snd_soc_read_signed(struct snd_soc_codec *codec, unsigned int reg,
          */
         ret |= ~((int)(BIT(sign_bit) - 1));
 
-        return ret;
+        *signed_val = ret;
+
+        return 0;
 }
 
 /**
@@ -2735,9 +2662,9 @@ EXPORT_SYMBOL_GPL(snd_soc_info_volsw);
 int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         unsigned int shift = mc->shift;
@@ -2747,25 +2674,32 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
         int sign_bit = mc->sign_bit;
         unsigned int mask = (1 << fls(max)) - 1;
         unsigned int invert = mc->invert;
+        int val;
+        int ret;
 
         if (sign_bit)
                 mask = BIT(sign_bit + 1) - 1;
 
-        ucontrol->value.integer.value[0] = snd_soc_read_signed(codec, reg, mask,
-                        shift, sign_bit) - min;
+        ret = snd_soc_read_signed(component, reg, mask, shift, sign_bit, &val);
+        if (ret)
+                return ret;
+
+        ucontrol->value.integer.value[0] = val - min;
         if (invert)
                 ucontrol->value.integer.value[0] =
                         max - ucontrol->value.integer.value[0];
 
         if (snd_soc_volsw_is_stereo(mc)) {
                 if (reg == reg2)
-                        ucontrol->value.integer.value[1] =
-                                snd_soc_read_signed(codec, reg, mask, rshift,
-                                                sign_bit) - min;
+                        ret = snd_soc_read_signed(component, reg, mask, rshift,
+                                sign_bit, &val);
                 else
-                        ucontrol->value.integer.value[1] =
-                                snd_soc_read_signed(codec, reg2, mask, shift,
-                                                sign_bit) - min;
+                        ret = snd_soc_read_signed(component, reg2, mask, shift,
+                                sign_bit, &val);
+                if (ret)
+                        return ret;
+
+                ucontrol->value.integer.value[1] = val - min;
                 if (invert)
                         ucontrol->value.integer.value[1] =
                                 max - ucontrol->value.integer.value[1];
@@ -2788,9 +2722,9 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw);
 int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         unsigned int shift = mc->shift;
@@ -2825,12 +2759,13 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
                         type_2r = true;
                 }
         }
-        err = snd_soc_update_bits_locked(codec, reg, val_mask, val);
+        err = snd_soc_component_update_bits(component, reg, val_mask, val);
         if (err < 0)
                 return err;
 
         if (type_2r)
-                err = snd_soc_update_bits_locked(codec, reg2, val_mask, val2);
+                err = snd_soc_component_update_bits(component, reg2, val_mask,
+                        val2);
 
         return err;
 }
@@ -2849,10 +2784,9 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw);
 int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_mixer_control *mc =
             (struct soc_mixer_control *)kcontrol->private_value;
-
         unsigned int reg = mc->reg;
         unsigned int reg2 = mc->rreg;
         unsigned int shift = mc->shift;
@@ -2860,13 +2794,23 @@ int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol,
         int max = mc->max;
         int min = mc->min;
         int mask = (1 << (fls(min + max) - 1)) - 1;
+        unsigned int val;
+        int ret;
 
-        ucontrol->value.integer.value[0] =
-            ((snd_soc_read(codec, reg) >> shift) - min) & mask;
+        ret = snd_soc_component_read(component, reg, &val);
+        if (ret < 0)
+                return ret;
 
-        if (snd_soc_volsw_is_stereo(mc))
-                ucontrol->value.integer.value[1] =
-                        ((snd_soc_read(codec, reg2) >> rshift) - min) & mask;
+        ucontrol->value.integer.value[0] = ((val >> shift) - min) & mask;
+
+        if (snd_soc_volsw_is_stereo(mc)) {
+                ret = snd_soc_component_read(component, reg2, &val);
+                if (ret < 0)
+                        return ret;
+
+                val = ((val >> rshift) - min) & mask;
+                ucontrol->value.integer.value[1] = val;
+        }
 
         return 0;
 }
@@ -2884,7 +2828,7 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw_sx);
 int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_mixer_control *mc =
             (struct soc_mixer_control *)kcontrol->private_value;
 
@@ -2896,13 +2840,13 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
         int min = mc->min;
         int mask = (1 << (fls(min + max) - 1)) - 1;
         int err = 0;
-        unsigned short val, val_mask, val2 = 0;
+        unsigned int val, val_mask, val2 = 0;
 
         val_mask = mask << shift;
         val = (ucontrol->value.integer.value[0] + min) & mask;
         val = val << shift;
 
-        err = snd_soc_update_bits_locked(codec, reg, val_mask, val);
+        err = snd_soc_component_update_bits(component, reg, val_mask, val);
         if (err < 0)
                 return err;
 
@@ -2911,10 +2855,10 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
                 val2 = (ucontrol->value.integer.value[1] + min) & mask;
                 val2 = val2 << rshift;
 
-                if (snd_soc_update_bits_locked(codec, reg2, val_mask, val2))
-                        return err;
+                err = snd_soc_component_update_bits(component, reg2, val_mask,
+                        val2);
         }
-        return 0;
+        return err;
 }
 EXPORT_SYMBOL_GPL(snd_soc_put_volsw_sx);
 
@@ -2961,10 +2905,15 @@ int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         unsigned int reg = mc->reg;
+        unsigned int val;
         int min = mc->min;
-        int val = snd_soc_read(codec, reg);
+        int ret;
+
+        ret = snd_soc_component_read(component, reg, &val);
+        if (ret)
+                return ret;
 
         ucontrol->value.integer.value[0] =
                 ((signed char)(val & 0xff))-min;
@@ -2988,7 +2937,7 @@ int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         unsigned int reg = mc->reg;
         int min = mc->min;
         unsigned int val;
@@ -2996,7 +2945,7 @@ int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
         val = (ucontrol->value.integer.value[0]+min) & 0xff;
         val |= ((ucontrol->value.integer.value[1]+min) & 0xff) << 8;
 
-        return snd_soc_update_bits_locked(codec, reg, 0xffff, val);
+        return snd_soc_component_update_bits(component, reg, 0xffff, val);
 }
 EXPORT_SYMBOL_GPL(snd_soc_put_volsw_s8);
 
@@ -3045,7 +2994,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
 {
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int rreg = mc->rreg;
         unsigned int shift = mc->shift;
@@ -3062,7 +3011,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
         val_mask = mask << shift;
         val = val << shift;
 
-        ret = snd_soc_update_bits_locked(codec, reg, val_mask, val);
+        ret = snd_soc_component_update_bits(component, reg, val_mask, val);
         if (ret < 0)
                 return ret;
 
@@ -3073,7 +3022,8 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
                 val_mask = mask << shift;
                 val = val << shift;
 
-                ret = snd_soc_update_bits_locked(codec, rreg, val_mask, val);
+                ret = snd_soc_component_update_bits(component, rreg, val_mask,
+                        val);
         }
 
         return ret;
@@ -3092,9 +3042,9 @@ EXPORT_SYMBOL_GPL(snd_soc_put_volsw_range);
 int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int rreg = mc->rreg;
         unsigned int shift = mc->shift;
@@ -3102,9 +3052,14 @@ int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,
         int max = mc->max;
         unsigned int mask = (1 << fls(max)) - 1;
         unsigned int invert = mc->invert;
+        unsigned int val;
+        int ret;
 
-        ucontrol->value.integer.value[0] =
-                (snd_soc_read(codec, reg) >> shift) & mask;
+        ret = snd_soc_component_read(component, reg, &val);
+        if (ret)
+                return ret;
+
+        ucontrol->value.integer.value[0] = (val >> shift) & mask;
         if (invert)
                 ucontrol->value.integer.value[0] =
                         max - ucontrol->value.integer.value[0];
@@ -3112,8 +3067,11 @@ int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,
                 ucontrol->value.integer.value[0] - min;
 
         if (snd_soc_volsw_is_stereo(mc)) {
-                ucontrol->value.integer.value[1] =
-                        (snd_soc_read(codec, rreg) >> shift) & mask;
+                ret = snd_soc_component_read(component, rreg, &val);
+                if (ret)
+                        return ret;
+
+                ucontrol->value.integer.value[1] = (val >> shift) & mask;
                 if (invert)
                         ucontrol->value.integer.value[1] =
                                 max - ucontrol->value.integer.value[1];
@@ -3167,11 +3125,11 @@ EXPORT_SYMBOL_GPL(snd_soc_limit_volume);
 int snd_soc_bytes_info(struct snd_kcontrol *kcontrol,
                        struct snd_ctl_elem_info *uinfo)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_bytes *params = (void *)kcontrol->private_value;
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
-        uinfo->count = params->num_regs * codec->val_bytes;
+        uinfo->count = params->num_regs * component->val_bytes;
 
         return 0;
 }
@@ -3180,20 +3138,20 @@ EXPORT_SYMBOL_GPL(snd_soc_bytes_info);
 int snd_soc_bytes_get(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_bytes *params = (void *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         int ret;
 
-        if (codec->using_regmap)
-                ret = regmap_raw_read(codec->control_data, params->base,
+        if (component->regmap)
+                ret = regmap_raw_read(component->regmap, params->base,
                                       ucontrol->value.bytes.data,
-                                      params->num_regs * codec->val_bytes);
+                                      params->num_regs * component->val_bytes);
         else
                 ret = -EINVAL;
 
         /* Hide any masked bytes to ensure consistent data reporting */
         if (ret == 0 && params->mask) {
-                switch (codec->val_bytes) {
+                switch (component->val_bytes) {
                 case 1:
                         ucontrol->value.bytes.data[0] &= ~params->mask;
                         break;
@@ -3217,16 +3175,16 @@ EXPORT_SYMBOL_GPL(snd_soc_bytes_get);
 int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                       struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_bytes *params = (void *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         int ret, len;
         unsigned int val, mask;
         void *data;
 
-        if (!codec->using_regmap)
+        if (!component->regmap)
                 return -EINVAL;
 
-        len = params->num_regs * codec->val_bytes;
+        len = params->num_regs * component->val_bytes;
 
         data = kmemdup(ucontrol->value.bytes.data, len, GFP_KERNEL | GFP_DMA);
         if (!data)
@@ -3238,27 +3196,27 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
          * copy.
          */
         if (params->mask) {
-                ret = regmap_read(codec->control_data, params->base, &val);
+                ret = regmap_read(component->regmap, params->base, &val);
                 if (ret != 0)
                         goto out;
 
                 val &= params->mask;
 
-                switch (codec->val_bytes) {
+                switch (component->val_bytes) {
                 case 1:
                         ((u8 *)data)[0] &= ~params->mask;
                         ((u8 *)data)[0] |= val;
                         break;
                 case 2:
                         mask = ~params->mask;
-                        ret = regmap_parse_val(codec->control_data,
+                        ret = regmap_parse_val(component->regmap,
                                                         &mask, &mask);
                         if (ret != 0)
                                 goto out;
 
                         ((u16 *)data)[0] &= mask;
 
-                        ret = regmap_parse_val(codec->control_data,
+                        ret = regmap_parse_val(component->regmap,
                                                         &val, &val);
                         if (ret != 0)
                                 goto out;
@@ -3267,14 +3225,14 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                         break;
                 case 4:
                         mask = ~params->mask;
-                        ret = regmap_parse_val(codec->control_data,
+                        ret = regmap_parse_val(component->regmap,
                                                         &mask, &mask);
                         if (ret != 0)
                                 goto out;
 
                         ((u32 *)data)[0] &= mask;
 
-                        ret = regmap_parse_val(codec->control_data,
+                        ret = regmap_parse_val(component->regmap,
                                                         &val, &val);
                         if (ret != 0)
                                 goto out;
@@ -3287,7 +3245,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                 }
         }
 
-        ret = regmap_raw_write(codec->control_data, params->base,
+        ret = regmap_raw_write(component->regmap, params->base,
                                data, len);
 
 out:
@@ -3297,6 +3255,18 @@ out:
 }
 EXPORT_SYMBOL_GPL(snd_soc_bytes_put);
 
+int snd_soc_bytes_info_ext(struct snd_kcontrol *kcontrol,
+                        struct snd_ctl_elem_info *ucontrol)
+{
+        struct soc_bytes_ext *params = (void *)kcontrol->private_value;
+
+        ucontrol->type = SNDRV_CTL_ELEM_TYPE_BYTES;
+        ucontrol->count = params->max;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_bytes_info_ext);
+
 /**
  * snd_soc_info_xr_sx - signed multi register info callback
  * @kcontrol: mreg control
@@ -3338,24 +3308,27 @@ EXPORT_SYMBOL_GPL(snd_soc_info_xr_sx);
 int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_mreg_control *mc =
                 (struct soc_mreg_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         unsigned int regbase = mc->regbase;
         unsigned int regcount = mc->regcount;
-        unsigned int regwshift = codec->driver->reg_word_size * BITS_PER_BYTE;
+        unsigned int regwshift = component->val_bytes * BITS_PER_BYTE;
         unsigned int regwmask = (1<<regwshift)-1;
         unsigned int invert = mc->invert;
         unsigned long mask = (1UL<<mc->nbits)-1;
         long min = mc->min;
         long max = mc->max;
         long val = 0;
-        unsigned long regval;
+        unsigned int regval;
         unsigned int i;
+        int ret;
 
         for (i = 0; i < regcount; i++) {
-                regval = snd_soc_read(codec, regbase+i) & regwmask;
-                val |= regval << (regwshift*(regcount-i-1));
+                ret = snd_soc_component_read(component, regbase+i, &regval);
+                if (ret)
+                        return ret;
+                val |= (regval & regwmask) << (regwshift*(regcount-i-1));
         }
         val &= mask;
         if (min < 0 && val > max)
@@ -3384,12 +3357,12 @@ EXPORT_SYMBOL_GPL(snd_soc_get_xr_sx);
 int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_mreg_control *mc =
                 (struct soc_mreg_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         unsigned int regbase = mc->regbase;
         unsigned int regcount = mc->regcount;
-        unsigned int regwshift = codec->driver->reg_word_size * BITS_PER_BYTE;
+        unsigned int regwshift = component->val_bytes * BITS_PER_BYTE;
         unsigned int regwmask = (1<<regwshift)-1;
         unsigned int invert = mc->invert;
         unsigned long mask = (1UL<<mc->nbits)-1;
@@ -3404,7 +3377,7 @@ int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol,
         for (i = 0; i < regcount; i++) {
                 regval = (val >> (regwshift*(regcount-i-1))) & regwmask;
                 regmask = (mask >> (regwshift*(regcount-i-1))) & regwmask;
-                err = snd_soc_update_bits_locked(codec, regbase+i,
+                err = snd_soc_component_update_bits(component, regbase+i,
                                 regmask, regval);
                 if (err < 0)
                         return err;
@@ -3426,14 +3399,21 @@ EXPORT_SYMBOL_GPL(snd_soc_put_xr_sx);
 int snd_soc_get_strobe(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int shift = mc->shift;
         unsigned int mask = 1 << shift;
         unsigned int invert = mc->invert != 0;
-        unsigned int val = snd_soc_read(codec, reg) & mask;
+        unsigned int val;
+        int ret;
+
+        ret = snd_soc_component_read(component, reg, &val);
+        if (ret)
+                return ret;
+
+        val &= mask;
 
         if (shift != 0 && val != 0)
                 val = val >> shift;
@@ -3456,9 +3436,9 @@ EXPORT_SYMBOL_GPL(snd_soc_get_strobe);
 int snd_soc_put_strobe(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         unsigned int reg = mc->reg;
         unsigned int shift = mc->shift;
         unsigned int mask = 1 << shift;
@@ -3468,12 +3448,11 @@ int snd_soc_put_strobe(struct snd_kcontrol *kcontrol,
         unsigned int val2 = (strobe ^ invert) ? 0 : mask;
         int err;
 
-        err = snd_soc_update_bits_locked(codec, reg, mask, val1);
+        err = snd_soc_component_update_bits(component, reg, mask, val1);
         if (err < 0)
                 return err;
 
-        err = snd_soc_update_bits_locked(codec, reg, mask, val2);
-        return err;
+        return snd_soc_component_update_bits(component, reg, mask, val2);
 }
 EXPORT_SYMBOL_GPL(snd_soc_put_strobe);
 
@@ -3821,7 +3800,6 @@ int snd_soc_register_card(struct snd_soc_card *card)
         for (i = 0; i < card->num_links; i++)
                 card->rtd[i].dai_link = &card->dai_link[i];
 
-        INIT_LIST_HEAD(&card->list);
         INIT_LIST_HEAD(&card->dapm_dirty);
         card->instantiated = 0;
         mutex_init(&card->mutex);
@@ -4037,6 +4015,8 @@ __snd_soc_register_component(struct device *dev,
                 return -ENOMEM;
         }
 
+        mutex_init(&cmpnt->io_mutex);
+
         cmpnt->name = fmt_single_name(dev, &cmpnt->id);
         if (!cmpnt->name) {
                 dev_err(dev, "ASoC: Failed to simplifying name\n");
@@ -4084,12 +4064,25 @@ int snd_soc_register_component(struct device *dev,
         }
 
         cmpnt->ignore_pmdown_time = true;
+        cmpnt->registered_as_component = true;
 
         return __snd_soc_register_component(dev, cmpnt, cmpnt_drv, NULL,
                                             dai_drv, num_dai, true);
 }
 EXPORT_SYMBOL_GPL(snd_soc_register_component);
 
+static void __snd_soc_unregister_component(struct snd_soc_component *cmpnt)
+{
+        snd_soc_unregister_dais(cmpnt);
+
+        mutex_lock(&client_mutex);
+        list_del(&cmpnt->list);
+        mutex_unlock(&client_mutex);
+
+        dev_dbg(cmpnt->dev, "ASoC: Unregistered component '%s'\n", cmpnt->name);
+        kfree(cmpnt->name);
+}
+
 /**
  * snd_soc_unregister_component - Unregister a component from the ASoC core
  *
@@ -4099,22 +4092,33 @@ void snd_soc_unregister_component(struct device *dev)
         struct snd_soc_component *cmpnt;
 
         list_for_each_entry(cmpnt, &component_list, list) {
-                if (dev == cmpnt->dev)
+                if (dev == cmpnt->dev && cmpnt->registered_as_component)
                         goto found;
         }
         return;
 
 found:
-        snd_soc_unregister_dais(cmpnt);
+        __snd_soc_unregister_component(cmpnt);
+}
+EXPORT_SYMBOL_GPL(snd_soc_unregister_component);
 
-        mutex_lock(&client_mutex);
-        list_del(&cmpnt->list);
-        mutex_unlock(&client_mutex);
+static int snd_soc_platform_drv_write(struct snd_soc_component *component,
+        unsigned int reg, unsigned int val)
+{
+        struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
 
-        dev_dbg(dev, "ASoC: Unregistered component '%s'\n", cmpnt->name);
-        kfree(cmpnt->name);
+        return platform->driver->write(platform, reg, val);
+}
+
+static int snd_soc_platform_drv_read(struct snd_soc_component *component,
+        unsigned int reg, unsigned int *val)
+{
+        struct snd_soc_platform *platform = snd_soc_component_to_platform(component);
+
+        *val = platform->driver->read(platform, reg);
+
+        return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_unregister_component);
 
 /**
  * snd_soc_add_platform - Add a platform to the ASoC core
@@ -4125,6 +4129,8 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_component);
 int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
                 const struct snd_soc_platform_driver *platform_drv)
 {
+        int ret;
+
         /* create platform component name */
         platform->name = fmt_single_name(dev, &platform->id);
         if (platform->name == NULL)
@@ -4134,8 +4140,22 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
         platform->driver = platform_drv;
         platform->dapm.dev = dev;
         platform->dapm.platform = platform;
+        platform->dapm.component = &platform->component;
         platform->dapm.stream_event = platform_drv->stream_event;
-        mutex_init(&platform->mutex);
+        if (platform_drv->write)
+                platform->component.write = snd_soc_platform_drv_write;
+        if (platform_drv->read)
+                platform->component.read = snd_soc_platform_drv_read;
+
+        /* register component */
+        ret = __snd_soc_register_component(dev, &platform->component,
+                                           &platform_drv->component_driver,
+                                           NULL, NULL, 0, false);
+        if (ret < 0) {
+                dev_err(platform->component.dev,
+                        "ASoC: Failed to register component: %d\n", ret);
+                return ret;
+        }
 
         mutex_lock(&client_mutex);
         list_add(&platform->list, &platform_list);
@@ -4178,6 +4198,8 @@ EXPORT_SYMBOL_GPL(snd_soc_register_platform);
  */
 void snd_soc_remove_platform(struct snd_soc_platform *platform)
 {
+        __snd_soc_unregister_component(&platform->component);
+
         mutex_lock(&client_mutex);
         list_del(&platform->list);
         mutex_unlock(&client_mutex);
@@ -4252,6 +4274,24 @@ static void fixup_codec_formats(struct snd_soc_pcm_stream *stream)
                         stream->formats |= codec_format_map[i];
 }
 
+static int snd_soc_codec_drv_write(struct snd_soc_component *component,
+        unsigned int reg, unsigned int val)
+{
+        struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
+
+        return codec->driver->write(codec, reg, val);
+}
+
+static int snd_soc_codec_drv_read(struct snd_soc_component *component,
+        unsigned int reg, unsigned int *val)
+{
+        struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
+
+        *val = codec->driver->read(codec, reg);
+
+        return 0;
+}
+
 /**
  * snd_soc_register_codec - Register a codec with the ASoC core
  *
@@ -4263,6 +4303,7 @@ int snd_soc_register_codec(struct device *dev,
                            int num_dai)
 {
         struct snd_soc_codec *codec;
+        struct regmap *regmap;
         int ret, i;
 
         dev_dbg(dev, "codec register %s\n", dev_name(dev));
@@ -4278,22 +4319,40 @@ int snd_soc_register_codec(struct device *dev,
                 goto fail_codec;
         }
 
-        codec->write = codec_drv->write;
-        codec->read = codec_drv->read;
-        codec->volatile_register = codec_drv->volatile_register;
-        codec->readable_register = codec_drv->readable_register;
-        codec->writable_register = codec_drv->writable_register;
+        if (codec_drv->write)
+                codec->component.write = snd_soc_codec_drv_write;
+        if (codec_drv->read)
+                codec->component.read = snd_soc_codec_drv_read;
         codec->component.ignore_pmdown_time = codec_drv->ignore_pmdown_time;
         codec->dapm.bias_level = SND_SOC_BIAS_OFF;
         codec->dapm.dev = dev;
         codec->dapm.codec = codec;
+        codec->dapm.component = &codec->component;
         codec->dapm.seq_notifier = codec_drv->seq_notifier;
         codec->dapm.stream_event = codec_drv->stream_event;
         codec->dev = dev;
         codec->driver = codec_drv;
-        codec->num_dai = num_dai;
+        codec->component.val_bytes = codec_drv->reg_word_size;
         mutex_init(&codec->mutex);
 
+        if (!codec->component.write) {
+                if (codec_drv->get_regmap)
+                        regmap = codec_drv->get_regmap(dev);
+                else
+                        regmap = dev_get_regmap(dev, NULL);
+
+                if (regmap) {
+                        ret = snd_soc_component_init_io(&codec->component,
+                                regmap);
+                        if (ret) {
+                                dev_err(codec->dev,
+                                                "Failed to set cache I/O:%d\n",
+                                                ret);
+                                return ret;
+                        }
+                }
+        }
+
         for (i = 0; i < num_dai; i++) {
                 fixup_codec_formats(&dai_drv[i].playback);
                 fixup_codec_formats(&dai_drv[i].capture);
@@ -4343,7 +4402,7 @@ void snd_soc_unregister_codec(struct device *dev)
         return;
 
 found:
-        snd_soc_unregister_component(dev);
+        __snd_soc_unregister_component(&codec->component);
 
         mutex_lock(&client_mutex);
         list_del(&codec->list);
@@ -4554,7 +4613,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
 EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing);
 
 unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
-                                     const char *prefix)
+                                     const char *prefix,
+                                     struct device_node **bitclkmaster,
+                                     struct device_node **framemaster)
 {
         int ret, i;
         char prop[128];
@@ -4637,9 +4698,13 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
          */
         snprintf(prop, sizeof(prop), "%sbitclock-master", prefix);
         bit = !!of_get_property(np, prop, NULL);
+        if (bit && bitclkmaster)
+                *bitclkmaster = of_parse_phandle(np, prop, 0);
 
         snprintf(prop, sizeof(prop), "%sframe-master", prefix);
         frame = !!of_get_property(np, prop, NULL);
+        if (frame && framemaster)
+                *framemaster = of_parse_phandle(np, prop, 0);
 
         switch ((bit << 4) + frame) {
         case 0x11:
@@ -4698,7 +4763,7 @@ int snd_soc_of_get_dai_name(struct device_node *of_node,
 
                         if (id < 0 || id >= pos->num_dai) {
                                 ret = -EINVAL;
-                                break;
+                                continue;
                         }
 
                         ret = 0;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 6d6ceee447d5..a74b9bf23d9f 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -378,86 +378,24 @@ static void dapm_reset(struct snd_soc_card *card)
 static int soc_widget_read(struct snd_soc_dapm_widget *w, int reg,
         unsigned int *value)
 {
-        if (w->codec) {
-                *value = snd_soc_read(w->codec, reg);
-                return 0;
-        } else if (w->platform) {
-                *value = snd_soc_platform_read(w->platform, reg);
-                return 0;
-        }
-
-        dev_err(w->dapm->dev, "ASoC: no valid widget read method\n");
-        return -1;
-}
-
-static int soc_widget_write(struct snd_soc_dapm_widget *w, int reg,
-        unsigned int val)
-{
-        if (w->codec)
-                return snd_soc_write(w->codec, reg, val);
-        else if (w->platform)
-                return snd_soc_platform_write(w->platform, reg, val);
-
-        dev_err(w->dapm->dev, "ASoC: no valid widget write method\n");
-        return -1;
-}
-
-static inline void soc_widget_lock(struct snd_soc_dapm_widget *w)
-{
-        if (w->codec && !w->codec->using_regmap)
-                mutex_lock(&w->codec->mutex);
-        else if (w->platform)
-                mutex_lock(&w->platform->mutex);
+        if (!w->dapm->component)
+                return -EIO;
+        return snd_soc_component_read(w->dapm->component, reg, value);
 }
 
-static inline void soc_widget_unlock(struct snd_soc_dapm_widget *w)
+static int soc_widget_update_bits(struct snd_soc_dapm_widget *w,
+        int reg, unsigned int mask, unsigned int value)
 {
-        if (w->codec && !w->codec->using_regmap)
-                mutex_unlock(&w->codec->mutex);
-        else if (w->platform)
-                mutex_unlock(&w->platform->mutex);
+        if (!w->dapm->component)
+                return -EIO;
+        return snd_soc_component_update_bits_async(w->dapm->component, reg,
+                mask, value);
 }
 
 static void soc_dapm_async_complete(struct snd_soc_dapm_context *dapm)
 {
-        if (dapm->codec && dapm->codec->using_regmap)
-                regmap_async_complete(dapm->codec->control_data);
-}
-
-static int soc_widget_update_bits_locked(struct snd_soc_dapm_widget *w,
-        unsigned short reg, unsigned int mask, unsigned int value)
-{
-        bool change;
-        unsigned int old, new;
-        int ret;
-
-        if (w->codec && w->codec->using_regmap) {
-                ret = regmap_update_bits_check_async(w->codec->control_data,
-                                                     reg, mask, value,
-                                                     &change);
-                if (ret != 0)
-                        return ret;
-        } else {
-                soc_widget_lock(w);
-                ret = soc_widget_read(w, reg, &old);
-                if (ret < 0) {
-                        soc_widget_unlock(w);
-                        return ret;
-                }
-
-                new = (old & ~mask) | (value & mask);
-                change = old != new;
-                if (change) {
-                        ret = soc_widget_write(w, reg, new);
-                        if (ret < 0) {
-                                soc_widget_unlock(w);
-                                return ret;
-                        }
-                }
-                soc_widget_unlock(w);
-        }
-
-        return change;
+        if (dapm->component)
+                snd_soc_component_async_complete(dapm->component);
 }
 
 /**
@@ -1120,26 +1058,6 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
 }
 
 /*
- * Handler for generic register modifier widget.
- */
-int dapm_reg_event(struct snd_soc_dapm_widget *w,
-                   struct snd_kcontrol *kcontrol, int event)
-{
-        unsigned int val;
-
-        if (SND_SOC_DAPM_EVENT_ON(event))
-                val = w->on_val;
-        else
-                val = w->off_val;
-
-        soc_widget_update_bits_locked(w, -(w->reg + 1),
-                            w->mask << w->shift, val << w->shift);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(dapm_reg_event);
-
-/*
  * Handler for regulator supply widget.
  */
 int dapm_regulator_event(struct snd_soc_dapm_widget *w,
@@ -1428,7 +1346,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_card *card,
                         "pop test : Applying 0x%x/0x%x to %x in %dms\n",
                         value, mask, reg, card->pop_time);
                 pop_wait(card->pop_time);
-                soc_widget_update_bits_locked(w, reg, mask, value);
+                soc_widget_update_bits(w, reg, mask, value);
         }
 
         list_for_each_entry(w, pending, power_list) {
@@ -1574,8 +1492,7 @@ static void dapm_widget_update(struct snd_soc_card *card)
         if (!w)
                 return;
 
-        ret = soc_widget_update_bits_locked(w, update->reg, update->mask,
-                                  update->val);
+        ret = soc_widget_update_bits(w, update->reg, update->mask, update->val);
         if (ret < 0)
                 dev_err(w->dapm->dev, "ASoC: %s DAPM update failed: %d\n",
                         w->name, ret);
@@ -2446,8 +2363,7 @@ err:
 }
 
 static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
-                                  const struct snd_soc_dapm_route *route,
-                                  unsigned int is_prefixed)
+                                  const struct snd_soc_dapm_route *route)
 {
         struct snd_soc_dapm_widget *wsource = NULL, *wsink = NULL, *w;
         struct snd_soc_dapm_widget *wtsource = NULL, *wtsink = NULL;
@@ -2457,7 +2373,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
         char prefixed_source[80];
         int ret;
 
-        if (dapm->codec && dapm->codec->name_prefix && !is_prefixed) {
+        if (dapm->codec && dapm->codec->name_prefix) {
                 snprintf(prefixed_sink, sizeof(prefixed_sink), "%s %s",
                          dapm->codec->name_prefix, route->sink);
                 sink = prefixed_sink;
@@ -2585,7 +2501,7 @@ int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,
 
         mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT);
         for (i = 0; i < num; i++) {
-                r = snd_soc_dapm_add_route(dapm, route, false);
+                r = snd_soc_dapm_add_route(dapm, route);
                 if (r < 0) {
                         dev_err(dapm->dev, "ASoC: Failed to add route %s -> %s -> %s\n",
                                 route->source,
@@ -2857,22 +2773,19 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
         mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
 
         change = dapm_kcontrol_set_value(kcontrol, val);
-
-        if (reg != SND_SOC_NOPM) {
-                mask = mask << shift;
-                val = val << shift;
-
-                change = snd_soc_test_bits(codec, reg, mask, val);
-        }
-
         if (change) {
                 if (reg != SND_SOC_NOPM) {
-                        update.kcontrol = kcontrol;
-                        update.reg = reg;
-                        update.mask = mask;
-                        update.val = val;
+                        mask = mask << shift;
+                        val = val << shift;
+
+                        if (snd_soc_test_bits(codec, reg, mask, val)) {
+                                update.kcontrol = kcontrol;
+                                update.reg = reg;
+                                update.mask = mask;
+                                update.val = val;
+                                card->update = &update;
+                        }
 
-                        card->update = &update;
                 }
 
                 ret = soc_dapm_mixer_update_power(card, kcontrol, connect);
@@ -3311,11 +3224,11 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
                          struct snd_soc_dapm_widget *source,
                          struct snd_soc_dapm_widget *sink)
 {
-        struct snd_soc_dapm_route routes[2];
         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);
@@ -3342,15 +3255,10 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
 
         w->params = params;
 
-        memset(&routes, 0, sizeof(routes));
-
-        routes[0].source = source->name;
-        routes[0].sink = link_name;
-        routes[1].source = link_name;
-        routes[1].sink = sink->name;
-
-        return snd_soc_dapm_add_routes(&card->dapm, routes,
-                                       ARRAY_SIZE(routes));
+        ret = snd_soc_dapm_add_path(&card->dapm, source, w, NULL, NULL);
+        if (ret)
+                return ret;
+        return snd_soc_dapm_add_path(&card->dapm, w, sink, NULL, NULL);
 }
 
 int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
@@ -3408,6 +3316,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
 int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card)
 {
         struct snd_soc_dapm_widget *dai_w, *w;
+        struct snd_soc_dapm_widget *src, *sink;
         struct snd_soc_dai *dai;
 
         /* For each DAI widget... */
@@ -3438,25 +3347,15 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card)
                         if (!w->sname || !strstr(w->sname, dai_w->name))
                                 continue;
 
-                        if (dai->driver->playback.stream_name &&
-                            strstr(w->sname,
-                                   dai->driver->playback.stream_name)) {
-                                dev_dbg(dai->dev, "%s -> %s\n",
-                                         dai->playback_widget->name, w->name);
-
-                                snd_soc_dapm_add_path(w->dapm,
-                                        dai->playback_widget, w, NULL, NULL);
-                        }
-
-                        if (dai->driver->capture.stream_name &&
-                            strstr(w->sname,
-                                   dai->driver->capture.stream_name)) {
-                                dev_dbg(dai->dev, "%s -> %s\n",
-                                        w->name, dai->capture_widget->name);
-
-                                snd_soc_dapm_add_path(w->dapm, w,
-                                        dai->capture_widget, NULL, NULL);
+                        if (dai_w->id == snd_soc_dapm_dai_in) {
+                                src = dai_w;
+                                sink = w;
+                        } else {
+                                src = w;
+                                sink = dai_w;
                         }
+                        dev_dbg(dai->dev, "%s -> %s\n", src->name, sink->name);
+                        snd_soc_dapm_add_path(w->dapm, src, sink, NULL, NULL);
                 }
         }
 
@@ -3466,12 +3365,10 @@ 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)
 {
         struct snd_soc_pcm_runtime *rtd = card->rtd;
+        struct snd_soc_dapm_widget *sink, *source;
         struct snd_soc_dai *cpu_dai, *codec_dai;
-        struct snd_soc_dapm_route r;
         int i;
 
-        memset(&r, 0, sizeof(r));
-
         /* for each BE DAI link... */
         for (i = 0; i < card->num_rtd; i++) {
                 rtd = &card->rtd[i];
@@ -3492,55 +3389,49 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card)
 
                 /* connect BE DAI playback if widgets are valid */
                 if (codec_dai->playback_widget && cpu_dai->playback_widget) {
-                        r.source = cpu_dai->playback_widget->name;
-                        r.sink = codec_dai->playback_widget->name;
+                        source = cpu_dai->playback_widget;
+                        sink = codec_dai->playback_widget;
                         dev_dbg(rtd->dev, "connected DAI link %s:%s -> %s:%s\n",
-                                cpu_dai->codec->name, r.source,
-                                codec_dai->platform->name, r.sink);
+                                cpu_dai->codec->name, source->name,
+                                codec_dai->platform->name, sink->name);
 
-                        snd_soc_dapm_add_route(&card->dapm, &r, true);
+                        snd_soc_dapm_add_path(&card->dapm, source, sink,
+                                NULL, NULL);
                 }
 
                 /* connect BE DAI capture if widgets are valid */
                 if (codec_dai->capture_widget && cpu_dai->capture_widget) {
-                        r.source = codec_dai->capture_widget->name;
-                        r.sink = cpu_dai->capture_widget->name;
+                        source = codec_dai->capture_widget;
+                        sink = cpu_dai->capture_widget;
                         dev_dbg(rtd->dev, "connected DAI link %s:%s -> %s:%s\n",
-                                codec_dai->codec->name, r.source,
-                                cpu_dai->platform->name, r.sink);
+                                codec_dai->codec->name, source->name,
+                                cpu_dai->platform->name, sink->name);
 
-                        snd_soc_dapm_add_route(&card->dapm, &r, true);
+                        snd_soc_dapm_add_path(&card->dapm, source, sink,
+                                NULL, NULL);
                 }
-
         }
 }
 
-static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
+static void soc_dapm_dai_stream_event(struct snd_soc_dai *dai, int stream,
         int event)
 {
+        struct snd_soc_dapm_widget *w;
 
-        struct snd_soc_dapm_widget *w_cpu, *w_codec;
-        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-        struct snd_soc_dai *codec_dai = rtd->codec_dai;
-
-        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                w_cpu = cpu_dai->playback_widget;
-                w_codec = codec_dai->playback_widget;
-        } else {
-                w_cpu = cpu_dai->capture_widget;
-                w_codec = codec_dai->capture_widget;
-        }
-
-        if (w_cpu) {
+        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+                w = dai->playback_widget;
+        else
+                w = dai->capture_widget;
 
-                dapm_mark_dirty(w_cpu, "stream event");
+        if (w) {
+                dapm_mark_dirty(w, "stream event");
 
                 switch (event) {
                 case SND_SOC_DAPM_STREAM_START:
-                        w_cpu->active = 1;
+                        w->active = 1;
                         break;
                 case SND_SOC_DAPM_STREAM_STOP:
-                        w_cpu->active = 0;
+                        w->active = 0;
                         break;
                 case SND_SOC_DAPM_STREAM_SUSPEND:
                 case SND_SOC_DAPM_STREAM_RESUME:
@@ -3549,25 +3440,13 @@ static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
                         break;
                 }
         }
+}
 
-        if (w_codec) {
-
-                dapm_mark_dirty(w_codec, "stream event");
-
-                switch (event) {
-                case SND_SOC_DAPM_STREAM_START:
-                        w_codec->active = 1;
-                        break;
-                case SND_SOC_DAPM_STREAM_STOP:
-                        w_codec->active = 0;
-                        break;
-                case SND_SOC_DAPM_STREAM_SUSPEND:
-                case SND_SOC_DAPM_STREAM_RESUME:
-                case SND_SOC_DAPM_STREAM_PAUSE_PUSH:
-                case SND_SOC_DAPM_STREAM_PAUSE_RELEASE:
-                        break;
-                }
-        }
+static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
+        int event)
+{
+        soc_dapm_dai_stream_event(rtd->cpu_dai, stream, event);
+        soc_dapm_dai_stream_event(rtd->codec_dai, stream, event);
 
         dapm_power_widgets(rtd->card, event);
 }
diff --git a/sound/soc/soc-devres.c b/sound/soc/soc-devres.c
index 7ac745df1412..057e5ef7dcce 100644
--- a/sound/soc/soc-devres.c
+++ b/sound/soc/soc-devres.c
@@ -52,6 +52,41 @@ int devm_snd_soc_register_component(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(devm_snd_soc_register_component);
 
+static void devm_platform_release(struct device *dev, void *res)
+{
+        snd_soc_unregister_platform(*(struct device **)res);
+}
+
+/**
+ * devm_snd_soc_register_platform - resource managed platform registration
+ * @dev: Device used to manage platform
+ * @platform: platform to register
+ *
+ * Register a platform driver with automatic unregistration when the device is
+ * unregistered.
+ */
+int devm_snd_soc_register_platform(struct device *dev,
+                        const struct snd_soc_platform_driver *platform_drv)
+{
+        struct device **ptr;
+        int ret;
+
+        ptr = devres_alloc(devm_platform_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return -ENOMEM;
+
+        ret = snd_soc_register_platform(dev, platform_drv);
+        if (ret == 0) {
+                *ptr = dev;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(devm_snd_soc_register_platform);
+
 static void devm_card_release(struct device *dev, void *res)
 {
         snd_soc_unregister_card(*(struct snd_soc_card **)res);
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 260efc8466fc..7767fbd73eb7 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -17,77 +17,285 @@
 #include <linux/export.h>
 #include <sound/soc.h>
 
-#include <trace/events/asoc.h>
+/**
+ * snd_soc_component_read() - Read register value
+ * @component: Component to read from
+ * @reg: Register to read
+ * @val: Pointer to where the read value is stored
+ *
+ * Return: 0 on success, a negative error code otherwise.
+ */
+int snd_soc_component_read(struct snd_soc_component *component,
+        unsigned int reg, unsigned int *val)
+{
+        int ret;
+
+        if (component->regmap)
+                ret = regmap_read(component->regmap, reg, val);
+        else if (component->read)
+                ret = component->read(component, reg, val);
+        else
+                ret = -EIO;
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_read);
 
-#ifdef CONFIG_REGMAP
-static int hw_write(struct snd_soc_codec *codec, unsigned int reg,
-                    unsigned int value)
+/**
+ * snd_soc_component_write() - Write register value
+ * @component: Component to write to
+ * @reg: Register to write
+ * @val: Value to write to the register
+ *
+ * Return: 0 on success, a negative error code otherwise.
+ */
+int snd_soc_component_write(struct snd_soc_component *component,
+        unsigned int reg, unsigned int val)
 {
-        return regmap_write(codec->control_data, reg, value);
+        if (component->regmap)
+                return regmap_write(component->regmap, reg, val);
+        else if (component->write)
+                return component->write(component, reg, val);
+        else
+                return -EIO;
 }
+EXPORT_SYMBOL_GPL(snd_soc_component_write);
 
-static unsigned int hw_read(struct snd_soc_codec *codec, unsigned int reg)
+static int snd_soc_component_update_bits_legacy(
+        struct snd_soc_component *component, unsigned int reg,
+        unsigned int mask, unsigned int val, bool *change)
 {
+        unsigned int old, new;
         int ret;
-        unsigned int val;
 
-        ret = regmap_read(codec->control_data, reg, &val);
-        if (ret == 0)
-                return val;
+        if (!component->read || !component->write)
+                return -EIO;
+
+        mutex_lock(&component->io_mutex);
+
+        ret = component->read(component, reg, &old);
+        if (ret < 0)
+                goto out_unlock;
+
+        new = (old & ~mask) | (val & mask);
+        *change = old != new;
+        if (*change)
+                ret = component->write(component, reg, new);
+out_unlock:
+        mutex_unlock(&component->io_mutex);
+
+        return ret;
+}
+
+/**
+ * snd_soc_component_update_bits() - Perform read/modify/write cycle
+ * @component: Component to update
+ * @reg: Register to update
+ * @mask: Mask that specifies which bits to update
+ * @val: New value for the bits specified by mask
+ *
+ * Return: 1 if the operation was successful and the value of the register
+ * changed, 0 if the operation was successful, but the value did not change.
+ * Returns a negative error code otherwise.
+ */
+int snd_soc_component_update_bits(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int val)
+{
+        bool change;
+        int ret;
+
+        if (component->regmap)
+                ret = regmap_update_bits_check(component->regmap, reg, mask,
+                        val, &change);
+        else
+                ret = snd_soc_component_update_bits_legacy(component, reg,
+                        mask, val, &change);
+
+        if (ret < 0)
+                return ret;
+        return change;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_update_bits);
+
+/**
+ * snd_soc_component_update_bits_async() - Perform asynchronous
+ *  read/modify/write cycle
+ * @component: Component to update
+ * @reg: Register to update
+ * @mask: Mask that specifies which bits to update
+ * @val: New value for the bits specified by mask
+ *
+ * This function is similar to snd_soc_component_update_bits(), but the update
+ * operation is scheduled asynchronously. This means it may not be completed
+ * when the function returns. To make sure that all scheduled updates have been
+ * completed snd_soc_component_async_complete() must be called.
+ *
+ * Return: 1 if the operation was successful and the value of the register
+ * changed, 0 if the operation was successful, but the value did not change.
+ * Returns a negative error code otherwise.
+ */
+int snd_soc_component_update_bits_async(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int val)
+{
+        bool change;
+        int ret;
+
+        if (component->regmap)
+                ret = regmap_update_bits_check_async(component->regmap, reg,
+                        mask, val, &change);
         else
+                ret = snd_soc_component_update_bits_legacy(component, reg,
+                        mask, val, &change);
+
+        if (ret < 0)
+                return ret;
+        return change;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_update_bits_async);
+
+/**
+ * snd_soc_component_async_complete() - Ensure asynchronous I/O has completed
+ * @component: Component for which to wait
+ *
+ * This function blocks until all asynchronous I/O which has previously been
+ * scheduled using snd_soc_component_update_bits_async() has completed.
+ */
+void snd_soc_component_async_complete(struct snd_soc_component *component)
+{
+        if (component->regmap)
+                regmap_async_complete(component->regmap);
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_async_complete);
+
+/**
+ * snd_soc_component_test_bits - Test register for change
+ * @component: component
+ * @reg: Register to test
+ * @mask: Mask that specifies which bits to test
+ * @value: Value to test against
+ *
+ * Tests a register with a new value and checks if the new value is
+ * different from the old value.
+ *
+ * Return: 1 for change, otherwise 0.
+ */
+int snd_soc_component_test_bits(struct snd_soc_component *component,
+        unsigned int reg, unsigned int mask, unsigned int value)
+{
+        unsigned int old, new;
+        int ret;
+
+        ret = snd_soc_component_read(component, reg, &old);
+        if (ret < 0)
+                return ret;
+        new = (old & ~mask) | value;
+        return old != new;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_test_bits);
+
+unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg)
+{
+        unsigned int val;
+        int ret;
+
+        ret = snd_soc_component_read(&codec->component, reg, &val);
+        if (ret < 0)
                 return -1;
+
+        return val;
 }
+EXPORT_SYMBOL_GPL(snd_soc_read);
+
+int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
+        unsigned int val)
+{
+        return snd_soc_component_write(&codec->component, reg, val);
+}
+EXPORT_SYMBOL_GPL(snd_soc_write);
 
 /**
- * snd_soc_codec_set_cache_io: Set up standard I/O functions.
+ * snd_soc_update_bits - update codec register bits
+ * @codec: audio codec
+ * @reg: codec register
+ * @mask: register mask
+ * @value: new value
  *
- * @codec: CODEC to configure.
- * @map: Register map to write to
+ * Writes new register value.
  *
- * Register formats are frequently shared between many I2C and SPI
- * devices.  In order to promote code reuse the ASoC core provides
- * some standard implementations of CODEC read and write operations
- * which can be set up using this function.
+ * Returns 1 for change, 0 for no change, or negative error code.
+ */
+int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg,
+                                unsigned int mask, unsigned int value)
+{
+        return snd_soc_component_update_bits(&codec->component, reg, mask,
+                value);
+}
+EXPORT_SYMBOL_GPL(snd_soc_update_bits);
+
+/**
+ * snd_soc_test_bits - test register for change
+ * @codec: audio codec
+ * @reg: codec register
+ * @mask: register mask
+ * @value: new value
  *
- * The caller is responsible for allocating and initialising the
- * actual cache.
+ * Tests a register with a new value and checks if the new value is
+ * different from the old value.
  *
- * Note that at present this code cannot be used by CODECs with
- * volatile registers.
+ * Returns 1 for change else 0.
  */
-int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
-                               struct regmap *regmap)
+int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg,
+                                unsigned int mask, unsigned int value)
+{
+        return snd_soc_component_test_bits(&codec->component, reg, mask, value);
+}
+EXPORT_SYMBOL_GPL(snd_soc_test_bits);
+
+int snd_soc_platform_read(struct snd_soc_platform *platform,
+                                        unsigned int reg)
 {
+        unsigned int val;
         int ret;
 
-        /* Device has made its own regmap arrangements */
-        if (!regmap)
-                codec->control_data = dev_get_regmap(codec->dev, NULL);
-        else
-                codec->control_data = regmap;
+        ret = snd_soc_component_read(&platform->component, reg, &val);
+        if (ret < 0)
+                return -1;
+
+        return val;
+}
+EXPORT_SYMBOL_GPL(snd_soc_platform_read);
+
+int snd_soc_platform_write(struct snd_soc_platform *platform,
+                                         unsigned int reg, unsigned int val)
+{
+        return snd_soc_component_write(&platform->component, reg, val);
+}
+EXPORT_SYMBOL_GPL(snd_soc_platform_write);
 
-        if (IS_ERR(codec->control_data))
-                return PTR_ERR(codec->control_data);
+/**
+ * snd_soc_component_init_io() - Initialize regmap IO
+ *
+ * @component: component to initialize
+ * @regmap: regmap instance to use for IO operations
+ *
+ * Return: 0 on success, a negative error code otherwise
+ */
+int snd_soc_component_init_io(struct snd_soc_component *component,
+        struct regmap *regmap)
+{
+        int ret;
 
-        codec->write = hw_write;
-        codec->read = hw_read;
+        if (!regmap)
+                return -EINVAL;
 
-        ret = regmap_get_val_bytes(codec->control_data);
+        ret = regmap_get_val_bytes(regmap);
         /* Errors are legitimate for non-integer byte
          * multiples */
         if (ret > 0)
-                codec->val_bytes = ret;
+                component->val_bytes = ret;
 
-        codec->using_regmap = true;
+        component->regmap = regmap;
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
-#else
-int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
-                               struct regmap *regmap)
-{
-        return -ENOTSUPP;
-}
-EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
-#endif
+EXPORT_SYMBOL_GPL(snd_soc_component_init_io);
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index a391de058037..54d18f22a33e 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -555,7 +555,6 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
 
         if (platform->driver->ops && platform->driver->ops->close)
                 platform->driver->ops->close(substream);
-        cpu_dai->runtime = NULL;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
@@ -819,6 +818,13 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
                 if (ret < 0)
                         return ret;
         }
+
+        if (rtd->dai_link->ops && rtd->dai_link->ops->trigger) {
+                ret = rtd->dai_link->ops->trigger(substream, cmd);
+                if (ret < 0)
+                        return ret;
+        }
+
         return 0;
 }
 
@@ -1012,21 +1018,12 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card,
 }
 
 static inline struct snd_soc_dapm_widget *
-        rtd_get_cpu_widget(struct snd_soc_pcm_runtime *rtd, int stream)
-{
-        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-                return rtd->cpu_dai->playback_widget;
-        else
-                return rtd->cpu_dai->capture_widget;
-}
-
-static inline struct snd_soc_dapm_widget *
-        rtd_get_codec_widget(struct snd_soc_pcm_runtime *rtd, int stream)
+        dai_get_widget(struct snd_soc_dai *dai, int stream)
 {
         if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-                return rtd->codec_dai->playback_widget;
+                return dai->playback_widget;
         else
-                return rtd->codec_dai->capture_widget;
+                return dai->capture_widget;
 }
 
 static int widget_in_list(struct snd_soc_dapm_widget_list *list,
@@ -1076,14 +1073,14 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,
         list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) {
 
                 /* is there a valid CPU DAI widget for this BE */
-                widget = rtd_get_cpu_widget(dpcm->be, stream);
+                widget = dai_get_widget(dpcm->be->cpu_dai, stream);
 
                 /* prune the BE if it's no longer in our active list */
                 if (widget && widget_in_list(list, widget))
                         continue;
 
                 /* is there a valid CODEC DAI widget for this BE */
-                widget = rtd_get_codec_widget(dpcm->be, stream);
+                widget = dai_get_widget(dpcm->be->codec_dai, stream);
 
                 /* prune the BE if it's no longer in our active list */
                 if (widget && widget_in_list(list, widget))
diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
index 25a7f8211ecf..de087ee3458a 100644
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -50,9 +50,7 @@ static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_codec *codec = codec_dai->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
-
-        return snd_soc_dapm_sync(dapm);
+        return snd_soc_dapm_force_enable_pin(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 7e923ecf8901..be4f1ac7cd5e 100644
--- a/sound/soc/ux500/mop500_ab8500.c
+++ b/sound/soc/ux500/mop500_ab8500.c
@@ -411,7 +411,7 @@ int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd)
         drvdata->mclk_sel = MCLK_ULPCLK;
 
         /* Add controls */
-        ret = snd_soc_add_card_controls(codec->card, mop500_ab8500_ctrls,
+        ret = snd_soc_add_card_controls(rtd->card, mop500_ab8500_ctrls,
                         ARRAY_SIZE(mop500_ab8500_ctrls));
         if (ret < 0) {
                 pr_err("%s: Failed to add machine-controls (%d)!\n",
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index e05a86b7c0da..d393153c474f 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -147,5 +147,18 @@ config SND_USB_HIFACE
           To compile this driver as a module, choose M here: the module
           will be called snd-usb-hiface.
 
+config SND_BCD2000
+        tristate "Behringer BCD2000 MIDI driver"
+        select SND_RAWMIDI
+        help
+          Say Y here to include MIDI support for the Behringer BCD2000 DJ
+          controller.
+
+          Audio support is still work-in-progress at
+          https://github.com/anyc/snd-usb-bcd2000
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-bcd2000.
+
 endif   # SND_USB
 
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index abe668f660d1..2b92f0dcbc4c 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -23,4 +23,4 @@ obj-$(CONFIG_SND_USB_UA101) += snd-usbmidi-lib.o
 obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o
 obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o
 
-obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/
+obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/ hiface/ bcd2000/
diff --git a/sound/usb/bcd2000/Makefile b/sound/usb/bcd2000/Makefile
new file mode 100644
index 000000000000..f09ccc0af6ff
--- /dev/null
+++ b/sound/usb/bcd2000/Makefile
@@ -0,0 +1,3 @@
+snd-bcd2000-y := bcd2000.o
+
+obj-$(CONFIG_SND_BCD2000) += snd-bcd2000.o
\ No newline at end of file
diff --git a/sound/usb/bcd2000/bcd2000.c b/sound/usb/bcd2000/bcd2000.c
new file mode 100644
index 000000000000..820d6ca8c458
--- /dev/null
+++ b/sound/usb/bcd2000/bcd2000.c
@@ -0,0 +1,461 @@
+/*
+ * Behringer BCD2000 driver
+ *
+ *   Copyright (C) 2014 Mario Kicherer (dev@kicherer.org)
+ *
+ *   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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/bitmap.h>
+#include <linux/usb.h>
+#include <linux/usb/audio.h>
+#include <sound/core.h>
+#include <sound/initval.h>
+#include <sound/rawmidi.h>
+
+#define PREFIX "snd-bcd2000: "
+#define BUFSIZE 64
+
+static struct usb_device_id id_table[] = {
+        { USB_DEVICE(0x1397, 0x00bd) },
+        { },
+};
+
+static unsigned char device_cmd_prefix[] = {0x03, 0x00};
+
+static unsigned char bcd2000_init_sequence[] = {
+        0x07, 0x00, 0x00, 0x00, 0x78, 0x48, 0x1c, 0x81,
+        0xc4, 0x00, 0x00, 0x00, 0x5e, 0x53, 0x4a, 0xf7,
+        0x18, 0xfa, 0x11, 0xff, 0x6c, 0xf3, 0x90, 0xff,
+        0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+        0x18, 0xfa, 0x11, 0xff, 0x14, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xf2, 0x34, 0x4a, 0xf7,
+        0x18, 0xfa, 0x11, 0xff
+};
+
+struct bcd2000 {
+        struct usb_device *dev;
+        struct snd_card *card;
+        struct usb_interface *intf;
+        int card_index;
+
+        int midi_out_active;
+        struct snd_rawmidi *rmidi;
+        struct snd_rawmidi_substream *midi_receive_substream;
+        struct snd_rawmidi_substream *midi_out_substream;
+
+        unsigned char midi_in_buf[BUFSIZE];
+        unsigned char midi_out_buf[BUFSIZE];
+
+        struct urb *midi_out_urb;
+        struct urb *midi_in_urb;
+
+        struct usb_anchor anchor;
+};
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
+
+static DEFINE_MUTEX(devices_mutex);
+DECLARE_BITMAP(devices_used, SNDRV_CARDS);
+static struct usb_driver bcd2000_driver;
+
+#ifdef CONFIG_SND_DEBUG
+static void bcd2000_dump_buffer(const char *prefix, const char *buf, int len)
+{
+        print_hex_dump(KERN_DEBUG, prefix,
+                        DUMP_PREFIX_NONE, 16, 1,
+                        buf, len, false);
+}
+#else
+static void bcd2000_dump_buffer(const char *prefix, const char *buf, int len) {}
+#endif
+
+static int bcd2000_midi_input_open(struct snd_rawmidi_substream *substream)
+{
+        return 0;
+}
+
+static int bcd2000_midi_input_close(struct snd_rawmidi_substream *substream)
+{
+        return 0;
+}
+
+/* (de)register midi substream from client */
+static void bcd2000_midi_input_trigger(struct snd_rawmidi_substream *substream,
+                                                int up)
+{
+        struct bcd2000 *bcd2k = substream->rmidi->private_data;
+        bcd2k->midi_receive_substream = up ? substream : NULL;
+}
+
+static void bcd2000_midi_handle_input(struct bcd2000 *bcd2k,
+                                const unsigned char *buf, unsigned int buf_len)
+{
+        unsigned int payload_length, tocopy;
+        struct snd_rawmidi_substream *midi_receive_substream;
+
+        midi_receive_substream = ACCESS_ONCE(bcd2k->midi_receive_substream);
+        if (!midi_receive_substream)
+                return;
+
+        bcd2000_dump_buffer(PREFIX "received from device: ", buf, buf_len);
+
+        if (buf_len < 2)
+                return;
+
+        payload_length = buf[0];
+
+        /* ignore packets without payload */
+        if (payload_length == 0)
+                return;
+
+        tocopy = min(payload_length, buf_len-1);
+
+        bcd2000_dump_buffer(PREFIX "sending to userspace: ",
+                                        &buf[1], tocopy);
+
+        snd_rawmidi_receive(midi_receive_substream,
+                                        &buf[1], tocopy);
+}
+
+static void bcd2000_midi_send(struct bcd2000 *bcd2k)
+{
+        int len, ret;
+        struct snd_rawmidi_substream *midi_out_substream;
+
+        BUILD_BUG_ON(sizeof(device_cmd_prefix) >= BUFSIZE);
+
+        midi_out_substream = ACCESS_ONCE(bcd2k->midi_out_substream);
+        if (!midi_out_substream)
+                return;
+
+        /* copy command prefix bytes */
+        memcpy(bcd2k->midi_out_buf, device_cmd_prefix,
+                sizeof(device_cmd_prefix));
+
+        /*
+         * get MIDI packet and leave space for command prefix
+         * and payload length
+         */
+        len = snd_rawmidi_transmit(midi_out_substream,
+                                bcd2k->midi_out_buf + 3, BUFSIZE - 3);
+
+        if (len < 0)
+                dev_err(&bcd2k->dev->dev, "%s: snd_rawmidi_transmit error %d\n",
+                                __func__, len);
+
+        if (len <= 0)
+                return;
+
+        /* set payload length */
+        bcd2k->midi_out_buf[2] = len;
+        bcd2k->midi_out_urb->transfer_buffer_length = BUFSIZE;
+
+        bcd2000_dump_buffer(PREFIX "sending to device: ",
+                        bcd2k->midi_out_buf, len+3);
+
+        /* send packet to the BCD2000 */
+        ret = usb_submit_urb(bcd2k->midi_out_urb, GFP_ATOMIC);
+        if (ret < 0)
+                dev_err(&bcd2k->dev->dev, PREFIX
+                        "%s (%p): usb_submit_urb() failed, ret=%d, len=%d\n",
+                        __func__, midi_out_substream, ret, len);
+        else
+                bcd2k->midi_out_active = 1;
+}
+
+static int bcd2000_midi_output_open(struct snd_rawmidi_substream *substream)
+{
+        return 0;
+}
+
+static int bcd2000_midi_output_close(struct snd_rawmidi_substream *substream)
+{
+        struct bcd2000 *bcd2k = substream->rmidi->private_data;
+
+        if (bcd2k->midi_out_active) {
+                usb_kill_urb(bcd2k->midi_out_urb);
+                bcd2k->midi_out_active = 0;
+        }
+
+        return 0;
+}
+
+/* (de)register midi substream from client */
+static void bcd2000_midi_output_trigger(struct snd_rawmidi_substream *substream,
+                                                int up)
+{
+        struct bcd2000 *bcd2k = substream->rmidi->private_data;
+
+        if (up) {
+                bcd2k->midi_out_substream = substream;
+                /* check if there is data userspace wants to send */
+                if (!bcd2k->midi_out_active)
+                        bcd2000_midi_send(bcd2k);
+        } else {
+                bcd2k->midi_out_substream = NULL;
+        }
+}
+
+static void bcd2000_output_complete(struct urb *urb)
+{
+        struct bcd2000 *bcd2k = urb->context;
+
+        bcd2k->midi_out_active = 0;
+
+        if (urb->status)
+                dev_warn(&urb->dev->dev,
+                        PREFIX "output urb->status: %d\n", urb->status);
+
+        if (urb->status == -ESHUTDOWN)
+                return;
+
+        /* check if there is more data userspace wants to send */
+        bcd2000_midi_send(bcd2k);
+}
+
+static void bcd2000_input_complete(struct urb *urb)
+{
+        int ret;
+        struct bcd2000 *bcd2k = urb->context;
+
+        if (urb->status)
+                dev_warn(&urb->dev->dev,
+                        PREFIX "input urb->status: %i\n", urb->status);
+
+        if (!bcd2k || urb->status == -ESHUTDOWN)
+                return;
+
+        if (urb->actual_length > 0)
+                bcd2000_midi_handle_input(bcd2k, urb->transfer_buffer,
+                                        urb->actual_length);
+
+        /* return URB to device */
+        ret = usb_submit_urb(bcd2k->midi_in_urb, GFP_ATOMIC);
+        if (ret < 0)
+                dev_err(&bcd2k->dev->dev, PREFIX
+                        "%s: usb_submit_urb() failed, ret=%d\n",
+                        __func__, ret);
+}
+
+static struct snd_rawmidi_ops bcd2000_midi_output = {
+        .open =    bcd2000_midi_output_open,
+        .close =   bcd2000_midi_output_close,
+        .trigger = bcd2000_midi_output_trigger,
+};
+
+static struct snd_rawmidi_ops bcd2000_midi_input = {
+        .open =    bcd2000_midi_input_open,
+        .close =   bcd2000_midi_input_close,
+        .trigger = bcd2000_midi_input_trigger,
+};
+
+static void bcd2000_init_device(struct bcd2000 *bcd2k)
+{
+        int ret;
+
+        init_usb_anchor(&bcd2k->anchor);
+        usb_anchor_urb(bcd2k->midi_out_urb, &bcd2k->anchor);
+        usb_anchor_urb(bcd2k->midi_in_urb, &bcd2k->anchor);
+
+        /* copy init sequence into buffer */
+        memcpy(bcd2k->midi_out_buf, bcd2000_init_sequence, 52);
+        bcd2k->midi_out_urb->transfer_buffer_length = 52;
+
+        /* submit sequence */
+        ret = usb_submit_urb(bcd2k->midi_out_urb, GFP_KERNEL);
+        if (ret < 0)
+                dev_err(&bcd2k->dev->dev, PREFIX
+                        "%s: usb_submit_urb() out failed, ret=%d: ",
+                        __func__, ret);
+        else
+                bcd2k->midi_out_active = 1;
+
+        /* pass URB to device to enable button and controller events */
+        ret = usb_submit_urb(bcd2k->midi_in_urb, GFP_KERNEL);
+        if (ret < 0)
+                dev_err(&bcd2k->dev->dev, PREFIX
+                        "%s: usb_submit_urb() in failed, ret=%d: ",
+                        __func__, ret);
+
+        /* ensure initialization is finished */
+        usb_wait_anchor_empty_timeout(&bcd2k->anchor, 1000);
+}
+
+static int bcd2000_init_midi(struct bcd2000 *bcd2k)
+{
+        int ret;
+        struct snd_rawmidi *rmidi;
+
+        ret = snd_rawmidi_new(bcd2k->card, bcd2k->card->shortname, 0,
+                                        1, /* output */
+                                        1, /* input */
+                                        &rmidi);
+
+        if (ret < 0)
+                return ret;
+
+        strlcpy(rmidi->name, bcd2k->card->shortname, sizeof(rmidi->name));
+
+        rmidi->info_flags = SNDRV_RAWMIDI_INFO_DUPLEX;
+        rmidi->private_data = bcd2k;
+
+        rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT;
+        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
+                                        &bcd2000_midi_output);
+
+        rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT;
+        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,
+                                        &bcd2000_midi_input);
+
+        bcd2k->rmidi = rmidi;
+
+        bcd2k->midi_in_urb = usb_alloc_urb(0, GFP_KERNEL);
+        bcd2k->midi_out_urb = usb_alloc_urb(0, GFP_KERNEL);
+
+        if (!bcd2k->midi_in_urb || !bcd2k->midi_out_urb) {
+                dev_err(&bcd2k->dev->dev, PREFIX "usb_alloc_urb failed\n");
+                return -ENOMEM;
+        }
+
+        usb_fill_int_urb(bcd2k->midi_in_urb, bcd2k->dev,
+                                usb_rcvintpipe(bcd2k->dev, 0x81),
+                                bcd2k->midi_in_buf, BUFSIZE,
+                                bcd2000_input_complete, bcd2k, 1);
+
+        usb_fill_int_urb(bcd2k->midi_out_urb, bcd2k->dev,
+                                usb_sndintpipe(bcd2k->dev, 0x1),
+                                bcd2k->midi_out_buf, BUFSIZE,
+                                bcd2000_output_complete, bcd2k, 1);
+
+        bcd2000_init_device(bcd2k);
+
+        return 0;
+}
+
+static void bcd2000_free_usb_related_resources(struct bcd2000 *bcd2k,
+                                                struct usb_interface *interface)
+{
+        /* usb_kill_urb not necessary, urb is aborted automatically */
+
+        usb_free_urb(bcd2k->midi_out_urb);
+        usb_free_urb(bcd2k->midi_in_urb);
+
+        if (bcd2k->intf) {
+                usb_set_intfdata(bcd2k->intf, NULL);
+                bcd2k->intf = NULL;
+        }
+}
+
+static int bcd2000_probe(struct usb_interface *interface,
+                                const struct usb_device_id *usb_id)
+{
+        struct snd_card *card;
+        struct bcd2000 *bcd2k;
+        unsigned int card_index;
+        char usb_path[32];
+        int err;
+
+        mutex_lock(&devices_mutex);
+
+        for (card_index = 0; card_index < SNDRV_CARDS; ++card_index)
+                if (!test_bit(card_index, devices_used))
+                        break;
+
+        if (card_index >= SNDRV_CARDS) {
+                mutex_unlock(&devices_mutex);
+                return -ENOENT;
+        }
+
+        err = snd_card_new(&interface->dev, index[card_index], id[card_index],
+                        THIS_MODULE, sizeof(*bcd2k), &card);
+        if (err < 0) {
+                mutex_unlock(&devices_mutex);
+                return err;
+        }
+
+        bcd2k = card->private_data;
+        bcd2k->dev = interface_to_usbdev(interface);
+        bcd2k->card = card;
+        bcd2k->card_index = card_index;
+        bcd2k->intf = interface;
+
+        snd_card_set_dev(card, &interface->dev);
+
+        strncpy(card->driver, "snd-bcd2000", sizeof(card->driver));
+        strncpy(card->shortname, "BCD2000", sizeof(card->shortname));
+        usb_make_path(bcd2k->dev, usb_path, sizeof(usb_path));
+        snprintf(bcd2k->card->longname, sizeof(bcd2k->card->longname),
+                    "Behringer BCD2000 at %s",
+                        usb_path);
+
+        err = bcd2000_init_midi(bcd2k);
+        if (err < 0)
+                goto probe_error;
+
+        err = snd_card_register(card);
+        if (err < 0)
+                goto probe_error;
+
+        usb_set_intfdata(interface, bcd2k);
+        set_bit(card_index, devices_used);
+
+        mutex_unlock(&devices_mutex);
+        return 0;
+
+probe_error:
+        dev_info(&bcd2k->dev->dev, PREFIX "error during probing");
+        bcd2000_free_usb_related_resources(bcd2k, interface);
+        snd_card_free(card);
+        mutex_unlock(&devices_mutex);
+        return err;
+}
+
+static void bcd2000_disconnect(struct usb_interface *interface)
+{
+        struct bcd2000 *bcd2k = usb_get_intfdata(interface);
+
+        if (!bcd2k)
+                return;
+
+        mutex_lock(&devices_mutex);
+
+        /* make sure that userspace cannot create new requests */
+        snd_card_disconnect(bcd2k->card);
+
+        bcd2000_free_usb_related_resources(bcd2k, interface);
+
+        clear_bit(bcd2k->card_index, devices_used);
+
+        snd_card_free_when_closed(bcd2k->card);
+
+        mutex_unlock(&devices_mutex);
+}
+
+static struct usb_driver bcd2000_driver = {
+        .name =         "snd-bcd2000",
+        .probe =        bcd2000_probe,
+        .disconnect =   bcd2000_disconnect,
+        .id_table =     id_table,
+};
+
+module_usb_driver(bcd2000_driver);
+
+MODULE_DEVICE_TABLE(usb, id_table);
+MODULE_AUTHOR("Mario Kicherer, dev@kicherer.org");
+MODULE_DESCRIPTION("Behringer BCD2000 driver");
+MODULE_LICENSE("GPL");
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index d40a2850e270..0b728d886f0d 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -162,7 +162,7 @@ static int check_mapped_selector_name(struct mixer_build *state, int unitid,
 {
         const struct usbmix_selector_map *p;
 
-        if (! state->selector_map)
+        if (!state->selector_map)
                 return 0;
         for (p = state->selector_map; p->id; p++) {
                 if (p->id == unitid && index < p->count)
@@ -174,7 +174,8 @@ static int check_mapped_selector_name(struct mixer_build *state, int unitid,
 /*
  * find an audio control unit with the given unit id
  */
-static void *find_audio_control_unit(struct mixer_build *state, unsigned char unit)
+static void *find_audio_control_unit(struct mixer_build *state,
+                                     unsigned char unit)
 {
         /* we just parse the header */
         struct uac_feature_unit_descriptor *hdr = NULL;
@@ -194,7 +195,8 @@ static void *find_audio_control_unit(struct mixer_build *state, unsigned char un
 /*
  * copy a string with the given id
  */
-static int snd_usb_copy_string_desc(struct mixer_build *state, int index, char *buf, int maxlen)
+static int snd_usb_copy_string_desc(struct mixer_build *state,
+                                    int index, char *buf, int maxlen)
 {
         int len = usb_string(state->chip->dev, index, buf, maxlen - 1);
         buf[len] = 0;
@@ -253,7 +255,7 @@ static int convert_bytes_value(struct usb_mixer_elem_info *cval, int val)
 
 static int get_relative_value(struct usb_mixer_elem_info *cval, int val)
 {
-        if (! cval->res)
+        if (!cval->res)
                 cval->res = 1;
         if (val < cval->min)
                 return 0;
@@ -267,7 +269,7 @@ static int get_abs_value(struct usb_mixer_elem_info *cval, int val)
 {
         if (val < 0)
                 return cval->min;
-        if (! cval->res)
+        if (!cval->res)
                 cval->res = 1;
         val *= cval->res;
         val += cval->min;
@@ -281,7 +283,8 @@ static int get_abs_value(struct usb_mixer_elem_info *cval, int val)
  * retrieve a mixer value
  */
 
-static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int validx, int *value_ret)
+static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request,
+                            int validx, int *value_ret)
 {
         struct snd_usb_audio *chip = cval->mixer->chip;
         unsigned char buf[2];
@@ -292,6 +295,7 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v
         err = snd_usb_autoresume(cval->mixer->chip);
         if (err < 0)
                 return -EIO;
+
         down_read(&chip->shutdown_rwsem);
         while (timeout-- > 0) {
                 if (chip->shutdown)
@@ -316,10 +320,11 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v
         return err;
 }
 
-static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int validx, int *value_ret)
+static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request,
+                            int validx, int *value_ret)
 {
         struct snd_usb_audio *chip = cval->mixer->chip;
-        unsigned char buf[2 + 3*sizeof(__u16)]; /* enough space for one range */
+        unsigned char buf[2 + 3 * sizeof(__u16)]; /* enough space for one range */
         unsigned char *val;
         int idx = 0, ret, size;
         __u8 bRequest;
@@ -339,9 +344,9 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v
                 goto error;
 
         down_read(&chip->shutdown_rwsem);
-        if (chip->shutdown)
+        if (chip->shutdown) {
                 ret = -ENODEV;
-        else {
+        } else {
                 idx = snd_usb_ctrl_intf(chip) | (cval->id << 8);
                 ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest,
                               USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
@@ -382,7 +387,8 @@ error:
         return 0;
 }
 
-static int get_ctl_value(struct usb_mixer_elem_info *cval, int request, int validx, int *value_ret)
+static int get_ctl_value(struct usb_mixer_elem_info *cval, int request,
+                         int validx, int *value_ret)
 {
         validx += cval->idx_off;
 
@@ -391,7 +397,8 @@ static int get_ctl_value(struct usb_mixer_elem_info *cval, int request, int vali
                 get_ctl_value_v2(cval, request, validx, value_ret);
 }
 
-static int get_cur_ctl_value(struct usb_mixer_elem_info *cval, int validx, int *value)
+static int get_cur_ctl_value(struct usb_mixer_elem_info *cval,
+                             int validx, int *value)
 {
         return get_ctl_value(cval, UAC_GET_CUR, validx, value);
 }
@@ -400,7 +407,9 @@ static int get_cur_ctl_value(struct usb_mixer_elem_info *cval, int validx, int *
 static inline int get_cur_mix_raw(struct usb_mixer_elem_info *cval,
                                   int channel, int *value)
 {
-        return get_ctl_value(cval, UAC_GET_CUR, (cval->control << 8) | channel, value);
+        return get_ctl_value(cval, UAC_GET_CUR,
+                             (cval->control << 8) | channel,
+                             value);
 }
 
 static int get_cur_mix_value(struct usb_mixer_elem_info *cval,
@@ -417,7 +426,7 @@ static int get_cur_mix_value(struct usb_mixer_elem_info *cval,
                 if (!cval->mixer->ignore_ctl_error)
                         usb_audio_dbg(cval->mixer->chip,
                                 "cannot get current value for control %d ch %d: err = %d\n",
-                                   cval->control, channel, err);
+                                      cval->control, channel, err);
                 return err;
         }
         cval->cached |= 1 << channel;
@@ -425,7 +434,6 @@ static int get_cur_mix_value(struct usb_mixer_elem_info *cval,
         return 0;
 }
 
-
 /*
  * set a mixer value
  */
@@ -474,7 +482,7 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
                 }
         }
         usb_audio_dbg(chip, "cannot set ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, data = %#x/%#x\n",
-                    request, validx, idx, cval->val_type, buf[0], buf[1]);
+                      request, validx, idx, cval->val_type, buf[0], buf[1]);
         err = -EINVAL;
 
  out:
@@ -483,7 +491,8 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
         return err;
 }
 
-static int set_cur_ctl_value(struct usb_mixer_elem_info *cval, int validx, int value)
+static int set_cur_ctl_value(struct usb_mixer_elem_info *cval,
+                             int validx, int value)
 {
         return snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR, validx, value);
 }
@@ -503,8 +512,9 @@ static int set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel,
                 return 0;
         }
 
-        err = snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR, (cval->control << 8) | channel,
-                            value);
+        err = snd_usb_mixer_set_ctl_value(cval,
+                                          UAC_SET_CUR, (cval->control << 8) | channel,
+                                          value);
         if (err < 0)
                 return err;
         cval->cached |= 1 << channel;
@@ -541,13 +551,13 @@ static int parse_audio_unit(struct mixer_build *state, int unitid);
  * check if the input/output channel routing is enabled on the given bitmap.
  * used for mixer unit parser
  */
-static int check_matrix_bitmap(unsigned char *bmap, int ich, int och, int num_outs)
+static int check_matrix_bitmap(unsigned char *bmap,
+                               int ich, int och, int num_outs)
 {
         int idx = ich * num_outs + och;
         return bmap[idx >> 3] & (0x80 >> (idx & 7));
 }
 
-
 /*
  * add an alsa control element
  * search and increment the index until an empty slot is found.
@@ -564,7 +574,8 @@ int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer,
         while (snd_ctl_find_id(mixer->chip->card, &kctl->id))
                 kctl->id.index++;
         if ((err = snd_ctl_add(mixer->chip->card, kctl)) < 0) {
-                usb_audio_dbg(mixer->chip, "cannot add control (err = %d)\n", err);
+                usb_audio_dbg(mixer->chip, "cannot add control (err = %d)\n",
+                              err);
                 return err;
         }
         cval->elem_id = &kctl->id;
@@ -573,7 +584,6 @@ int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer,
         return 0;
 }
 
-
 /*
  * get a terminal name string
  */
@@ -627,7 +637,8 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm
         struct iterm_name_combo *names;
 
         if (iterm->name)
-                return snd_usb_copy_string_desc(state, iterm->name, name, maxlen);
+                return snd_usb_copy_string_desc(state, iterm->name,
+                                                name, maxlen);
 
         /* virtual type - not a real terminal */
         if (iterm->type >> 16) {
@@ -635,13 +646,17 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm
                         return 0;
                 switch (iterm->type >> 16) {
                 case UAC_SELECTOR_UNIT:
-                        strcpy(name, "Selector"); return 8;
+                        strcpy(name, "Selector");
+                        return 8;
                 case UAC1_PROCESSING_UNIT:
-                        strcpy(name, "Process Unit"); return 12;
+                        strcpy(name, "Process Unit");
+                        return 12;
                 case UAC1_EXTENSION_UNIT:
-                        strcpy(name, "Ext Unit"); return 8;
+                        strcpy(name, "Ext Unit");
+                        return 8;
                 case UAC_MIXER_UNIT:
-                        strcpy(name, "Mixer"); return 5;
+                        strcpy(name, "Mixer");
+                        return 5;
                 default:
                         return sprintf(name, "Unit %d", iterm->id);
                 }
@@ -649,29 +664,35 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm
 
         switch (iterm->type & 0xff00) {
         case 0x0100:
-                strcpy(name, "PCM"); return 3;
+                strcpy(name, "PCM");
+                return 3;
         case 0x0200:
-                strcpy(name, "Mic"); return 3;
+                strcpy(name, "Mic");
+                return 3;
         case 0x0400:
-                strcpy(name, "Headset"); return 7;
+                strcpy(name, "Headset");
+                return 7;
         case 0x0500:
-                strcpy(name, "Phone"); return 5;
+                strcpy(name, "Phone");
+                return 5;
         }
 
-        for (names = iterm_names; names->type; names++)
+        for (names = iterm_names; names->type; names++) {
                 if (names->type == iterm->type) {
                         strcpy(name, names->name);
                         return strlen(names->name);
                 }
+        }
+
         return 0;
 }
 
-
 /*
  * parse the source unit recursively until it reaches to a terminal
  * or a branched unit.
  */
-static int check_input_term(struct mixer_build *state, int id, struct usb_audio_term *term)
+static int check_input_term(struct mixer_build *state, int id,
+                            struct usb_audio_term *term)
 {
         int err;
         void *p1;
@@ -766,7 +787,6 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_
         return -ENODEV;
 }
 
-
 /*
  * Feature Unit
  */
@@ -794,7 +814,6 @@ static struct usb_feature_control_info audio_feature_info[] = {
         { "Phase Inverter Control",     USB_MIXER_BOOLEAN },
 };
 
-
 /* private_free callback */
 static void usb_mixer_elem_free(struct snd_kcontrol *kctl)
 {
@@ -802,7 +821,6 @@ static void usb_mixer_elem_free(struct snd_kcontrol *kctl)
         kctl->private_data = NULL;
 }
 
-
 /*
  * interface to ALSA control for feature/mixer units
  */
@@ -906,7 +924,6 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval,
                         cval->res = 384;
                 }
                 break;
-
         }
 }
 
@@ -939,21 +956,26 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval,
                     get_ctl_value(cval, UAC_GET_MIN, (cval->control << 8) | minchn, &cval->min) < 0) {
                         usb_audio_err(cval->mixer->chip,
                                       "%d:%d: cannot get min/max values for control %d (id %d)\n",
-                                   cval->id, snd_usb_ctrl_intf(cval->mixer->chip), cval->control, cval->id);
+                                   cval->id, snd_usb_ctrl_intf(cval->mixer->chip),
+                                                               cval->control, cval->id);
                         return -EINVAL;
                 }
-                if (get_ctl_value(cval, UAC_GET_RES, (cval->control << 8) | minchn, &cval->res) < 0) {
+                if (get_ctl_value(cval, UAC_GET_RES,
+                                  (cval->control << 8) | minchn,
+                                  &cval->res) < 0) {
                         cval->res = 1;
                 } else {
                         int last_valid_res = cval->res;
 
                         while (cval->res > 1) {
                                 if (snd_usb_mixer_set_ctl_value(cval, UAC_SET_RES,
-                                                                (cval->control << 8) | minchn, cval->res / 2) < 0)
+                                                                (cval->control << 8) | minchn,
+                                                                cval->res / 2) < 0)
                                         break;
                                 cval->res /= 2;
                         }
-                        if (get_ctl_value(cval, UAC_GET_RES, (cval->control << 8) | minchn, &cval->res) < 0)
+                        if (get_ctl_value(cval, UAC_GET_RES,
+                                          (cval->control << 8) | minchn, &cval->res) < 0)
                                 cval->res = last_valid_res;
                 }
                 if (cval->res == 0)
@@ -1017,7 +1039,8 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval,
 #define get_min_max(cval, def)  get_min_max_with_quirks(cval, def, NULL)
 
 /* get a feature/mixer unit info */
-static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_info *uinfo)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
 
@@ -1051,7 +1074,8 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol, struct snd_ctl_
 }
 
 /* get the current value from feature/mixer unit */
-static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
         int c, cnt, val, err;
@@ -1082,7 +1106,8 @@ static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol, struct snd_ctl_e
 }
 
 /* put the current value to feature/mixer unit */
-static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
         int c, cnt, val, oval, err;
@@ -1136,22 +1161,25 @@ static struct snd_kcontrol_new usb_feature_unit_ctl_ro = {
         .put = NULL,
 };
 
-/* This symbol is exported in order to allow the mixer quirks to
- * hook up to the standard feature unit control mechanism */
+/*
+ * This symbol is exported in order to allow the mixer quirks to
+ * hook up to the standard feature unit control mechanism
+ */
 struct snd_kcontrol_new *snd_usb_feature_unit_ctl = &usb_feature_unit_ctl;
 
 /*
  * build a feature control
  */
-
 static size_t append_ctl_name(struct snd_kcontrol *kctl, const char *str)
 {
         return strlcat(kctl->id.name, str, sizeof(kctl->id.name));
 }
 
-/* A lot of headsets/headphones have a "Speaker" mixer. Make sure we
-   rename it to "Headphone". We determine if something is a headphone
-   similar to how udev determines form factor. */
+/*
+ * A lot of headsets/headphones have a "Speaker" mixer. Make sure we
+ * rename it to "Headphone". We determine if something is a headphone
+ * similar to how udev determines form factor.
+ */
 static void check_no_speaker_on_headset(struct snd_kcontrol *kctl,
                                         struct snd_card *card)
 {
@@ -1201,10 +1229,8 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                 return;
 
         cval = kzalloc(sizeof(*cval), GFP_KERNEL);
-        if (! cval) {
-                usb_audio_err(state->chip, "cannot malloc kcontrol\n");
+        if (!cval)
                 return;
-        }
         cval->mixer = state->mixer;
         cval->id = unitid;
         cval->control = control;
@@ -1222,15 +1248,17 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                 cval->ch_readonly = readonly_mask;
         }
 
-        /* if all channels in the mask are marked read-only, make the control
+        /*
+         * If all channels in the mask are marked read-only, make the control
          * read-only. set_cur_mix_value() will check the mask again and won't
-         * issue write commands to read-only channels. */
+         * issue write commands to read-only channels.
+         */
         if (cval->channels == readonly_mask)
                 kctl = snd_ctl_new1(&usb_feature_unit_ctl_ro, cval);
         else
                 kctl = snd_ctl_new1(&usb_feature_unit_ctl, cval);
 
-        if (! kctl) {
+        if (!kctl) {
                 usb_audio_err(state->chip, "cannot malloc kcontrol\n");
                 kfree(cval);
                 return;
@@ -1239,48 +1267,53 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
 
         len = check_mapped_name(map, kctl->id.name, sizeof(kctl->id.name));
         mapped_name = len != 0;
-        if (! len && nameid)
+        if (!len && nameid)
                 len = snd_usb_copy_string_desc(state, nameid,
                                 kctl->id.name, sizeof(kctl->id.name));
 
         switch (control) {
         case UAC_FU_MUTE:
         case UAC_FU_VOLUME:
-                /* determine the control name.  the rule is:
+                /*
+                 * determine the control name.  the rule is:
                  * - if a name id is given in descriptor, use it.
                  * - if the connected input can be determined, then use the name
                  *   of terminal type.
                  * - if the connected output can be determined, use it.
                  * - otherwise, anonymous name.
                  */
-                if (! len) {
-                        len = get_term_name(state, iterm, kctl->id.name, sizeof(kctl->id.name), 1);
-                        if (! len)
-                                len = get_term_name(state, &state->oterm, kctl->id.name, sizeof(kctl->id.name), 1);
-                        if (! len)
-                                len = snprintf(kctl->id.name, sizeof(kctl->id.name),
+                if (!len) {
+                        len = get_term_name(state, iterm, kctl->id.name,
+                                            sizeof(kctl->id.name), 1);
+                        if (!len)
+                                len = get_term_name(state, &state->oterm,
+                                                    kctl->id.name,
+                                                    sizeof(kctl->id.name), 1);
+                        if (!len)
+                                len = snprintf(kctl->id.name,
+                                               sizeof(kctl->id.name),
                                                "Feature %d", unitid);
                 }
 
                 if (!mapped_name)
                         check_no_speaker_on_headset(kctl, state->mixer->chip->card);
 
-                /* determine the stream direction:
+                /*
+                 * determine the stream direction:
                  * if the connected output is USB stream, then it's likely a
                  * capture stream.  otherwise it should be playback (hopefully :)
                  */
-                if (! mapped_name && ! (state->oterm.type >> 16)) {
-                        if ((state->oterm.type & 0xff00) == 0x0100) {
+                if (!mapped_name && !(state->oterm.type >> 16)) {
+                        if ((state->oterm.type & 0xff00) == 0x0100)
                                 len = append_ctl_name(kctl, " Capture");
-                        } else {
+                        else
                                 len = append_ctl_name(kctl, " Playback");
-                        }
                 }
                 append_ctl_name(kctl, control == UAC_FU_MUTE ?
                                 " Switch" : " Volume");
                 break;
         default:
-                if (! len)
+                if (!len)
                         strlcpy(kctl->id.name, audio_feature_info[control-1].name,
                                 sizeof(kctl->id.name));
                 break;
@@ -1300,33 +1333,35 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
         }
 
         range = (cval->max - cval->min) / cval->res;
-        /* Are there devices with volume range more than 255? I use a bit more
+        /*
+         * Are there devices with volume range more than 255? I use a bit more
          * to be sure. 384 is a resolution magic number found on Logitech
          * devices. It will definitively catch all buggy Logitech devices.
          */
         if (range > 384) {
-                usb_audio_warn(state->chip, "Warning! Unlikely big "
-                           "volume range (=%u), cval->res is probably wrong.",
-                           range);
+                usb_audio_warn(state->chip,
+                               "Warning! Unlikely big volume range (=%u), "
+                               "cval->res is probably wrong.",
+                               range);
                 usb_audio_warn(state->chip, "[%d] FU [%s] ch = %d, "
-                           "val = %d/%d/%d", cval->id,
-                           kctl->id.name, cval->channels,
-                           cval->min, cval->max, cval->res);
+                               "val = %d/%d/%d", cval->id,
+                               kctl->id.name, cval->channels,
+                               cval->min, cval->max, cval->res);
         }
 
         usb_audio_dbg(state->chip, "[%d] FU [%s] ch = %d, val = %d/%d/%d\n",
-                    cval->id, kctl->id.name, cval->channels, cval->min, cval->max, cval->res);
+                      cval->id, kctl->id.name, cval->channels,
+                      cval->min, cval->max, cval->res);
         snd_usb_mixer_add_control(state->mixer, kctl);
 }
 
-
-
 /*
  * parse a feature unit
  *
  * most of controls are defined here.
  */
-static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void *_ftr)
+static int parse_audio_feature_unit(struct mixer_build *state, int unitid,
+                                    void *_ftr)
 {
         int channels, i, j;
         struct usb_audio_term iterm;
@@ -1400,15 +1435,25 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
                 for (i = 0; i < 10; i++) {
                         unsigned int ch_bits = 0;
                         for (j = 0; j < channels; j++) {
-                                unsigned int mask = snd_usb_combine_bytes(bmaControls + csize * (j+1), csize);
+                                unsigned int mask;
+
+                                mask = snd_usb_combine_bytes(bmaControls +
+                                                             csize * (j+1), csize);
                                 if (mask & (1 << i))
                                         ch_bits |= (1 << j);
                         }
                         /* audio class v1 controls are never read-only */
-                        if (ch_bits & 1) /* the first channel must be set (for ease of programming) */
-                                build_feature_ctl(state, _ftr, ch_bits, i, &iterm, unitid, 0);
+
+                        /*
+                         * The first channel must be set
+                         * (for ease of programming).
+                         */
+                        if (ch_bits & 1)
+                                build_feature_ctl(state, _ftr, ch_bits, i,
+                                                  &iterm, unitid, 0);
                         if (master_bits & (1 << i))
-                                build_feature_ctl(state, _ftr, 0, i, &iterm, unitid, 0);
+                                build_feature_ctl(state, _ftr, 0, i, &iterm,
+                                                  unitid, 0);
                 }
         } else { /* UAC_VERSION_2 */
                 for (i = 0; i < ARRAY_SIZE(audio_feature_info); i++) {
@@ -1416,7 +1461,10 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
                         unsigned int ch_read_only = 0;
 
                         for (j = 0; j < channels; j++) {
-                                unsigned int mask = snd_usb_combine_bytes(bmaControls + csize * (j+1), csize);
+                                unsigned int mask;
+
+                                mask = snd_usb_combine_bytes(bmaControls +
+                                                             csize * (j+1), csize);
                                 if (uac2_control_is_readable(mask, i)) {
                                         ch_bits |= (1 << j);
                                         if (!uac2_control_is_writeable(mask, i))
@@ -1424,12 +1472,22 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
                                 }
                         }
 
-                        /* NOTE: build_feature_ctl() will mark the control read-only if all channels
-                         * are marked read-only in the descriptors. Otherwise, the control will be
-                         * reported as writeable, but the driver will not actually issue a write
-                         * command for read-only channels */
-                        if (ch_bits & 1) /* the first channel must be set (for ease of programming) */
-                                build_feature_ctl(state, _ftr, ch_bits, i, &iterm, unitid, ch_read_only);
+                        /*
+                         * NOTE: build_feature_ctl() will mark the control
+                         * read-only if all channels are marked read-only in
+                         * the descriptors. Otherwise, the control will be
+                         * reported as writeable, but the driver will not
+                         * actually issue a write command for read-only
+                         * channels.
+                         */
+
+                        /*
+                         * The first channel must be set
+                         * (for ease of programming).
+                         */
+                        if (ch_bits & 1)
+                                build_feature_ctl(state, _ftr, ch_bits, i,
+                                                  &iterm, unitid, ch_read_only);
                         if (uac2_control_is_readable(master_bits, i))
                                 build_feature_ctl(state, _ftr, 0, i, &iterm, unitid,
                                                   !uac2_control_is_writeable(master_bits, i));
@@ -1439,7 +1497,6 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
         return 0;
 }
 
-
 /*
  * Mixer Unit
  */
@@ -1450,7 +1507,6 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
  * the callbacks are identical with feature unit.
  * input channel number (zero based) is given in control field instead.
  */
-
 static void build_mixer_unit_ctl(struct mixer_build *state,
                                  struct uac_mixer_unit_descriptor *desc,
                                  int in_pin, int in_ch, int unitid,
@@ -1467,7 +1523,7 @@ static void build_mixer_unit_ctl(struct mixer_build *state,
                 return;
 
         cval = kzalloc(sizeof(*cval), GFP_KERNEL);
-        if (! cval)
+        if (!cval)
                 return;
 
         cval->mixer = state->mixer;
@@ -1475,7 +1531,9 @@ static void build_mixer_unit_ctl(struct mixer_build *state,
         cval->control = in_ch + 1; /* based on 1 */
         cval->val_type = USB_MIXER_S16;
         for (i = 0; i < num_outs; i++) {
-                if (check_matrix_bitmap(uac_mixer_unit_bmControls(desc, state->mixer->protocol), in_ch, i, num_outs)) {
+                __u8 *c = uac_mixer_unit_bmControls(desc, state->mixer->protocol);
+
+                if (check_matrix_bitmap(c, in_ch, i, num_outs)) {
                         cval->cmask |= (1 << i);
                         cval->channels++;
                 }
@@ -1485,7 +1543,7 @@ static void build_mixer_unit_ctl(struct mixer_build *state,
         get_min_max(cval, 0);
 
         kctl = snd_ctl_new1(&usb_feature_unit_ctl, cval);
-        if (! kctl) {
+        if (!kctl) {
                 usb_audio_err(state->chip, "cannot malloc kcontrol\n");
                 kfree(cval);
                 return;
@@ -1493,9 +1551,10 @@ static void build_mixer_unit_ctl(struct mixer_build *state,
         kctl->private_free = usb_mixer_elem_free;
 
         len = check_mapped_name(map, kctl->id.name, sizeof(kctl->id.name));
-        if (! len)
-                len = get_term_name(state, iterm, kctl->id.name, sizeof(kctl->id.name), 0);
-        if (! len)
+        if (!len)
+                len = get_term_name(state, iterm, kctl->id.name,
+                                    sizeof(kctl->id.name), 0);
+        if (!len)
                 len = sprintf(kctl->id.name, "Mixer Source %d", in_ch + 1);
         append_ctl_name(kctl, " Volume");
 
@@ -1504,24 +1563,28 @@ static void build_mixer_unit_ctl(struct mixer_build *state,
         snd_usb_mixer_add_control(state->mixer, kctl);
 }
 
-
 /*
  * parse a mixer unit
  */
-static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, void *raw_desc)
+static int parse_audio_mixer_unit(struct mixer_build *state, int unitid,
+                                  void *raw_desc)
 {
         struct uac_mixer_unit_descriptor *desc = raw_desc;
         struct usb_audio_term iterm;
         int input_pins, num_ins, num_outs;
         int pin, ich, err;
 
-        if (desc->bLength < 11 || ! (input_pins = desc->bNrInPins) || ! (num_outs = uac_mixer_unit_bNrChannels(desc))) {
-                usb_audio_err(state->chip, "invalid MIXER UNIT descriptor %d\n", unitid);
+        if (desc->bLength < 11 || !(input_pins = desc->bNrInPins) ||
+            !(num_outs = uac_mixer_unit_bNrChannels(desc))) {
+                usb_audio_err(state->chip,
+                              "invalid MIXER UNIT descriptor %d\n",
+                              unitid);
                 return -EINVAL;
         }
         /* no bmControls field (e.g. Maya44) -> ignore */
         if (desc->bLength <= 10 + input_pins) {
-                usb_audio_dbg(state->chip, "MU %d has no bmControls field\n", unitid);
+                usb_audio_dbg(state->chip, "MU %d has no bmControls field\n",
+                              unitid);
                 return 0;
         }
 
@@ -1535,12 +1598,14 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, void *r
                 if (err < 0)
                         return err;
                 num_ins += iterm.channels;
-                for (; ich < num_ins; ++ich) {
+                for (; ich < num_ins; ich++) {
                         int och, ich_has_controls = 0;
 
-                        for (och = 0; och < num_outs; ++och) {
-                                if (check_matrix_bitmap(uac_mixer_unit_bmControls(desc, state->mixer->protocol),
-                                                        ich, och, num_outs)) {
+                        for (och = 0; och < num_outs; och++) {
+                                __u8 *c = uac_mixer_unit_bmControls(desc,
+                                                state->mixer->protocol);
+
+                                if (check_matrix_bitmap(c, ich, och, num_outs)) {
                                         ich_has_controls = 1;
                                         break;
                                 }
@@ -1553,13 +1618,13 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, void *r
         return 0;
 }
 
-
 /*
  * Processing Unit / Extension Unit
  */
 
 /* get callback for processing/extension unit */
-static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
         int err, val;
@@ -1577,7 +1642,8 @@ static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
 }
 
 /* put callback for processing/extension unit */
-static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
         int val, oval, err;
@@ -1606,7 +1672,6 @@ static struct snd_kcontrol_new mixer_procunit_ctl = {
         .put = mixer_ctl_procunit_put,
 };
 
-
 /*
  * predefined data for processing units
  */
@@ -1697,10 +1762,13 @@ static struct procunit_info extunits[] = {
         { USB_XU_DEVICE_OPTIONS, "AnalogueIn Soft Limit", soft_limit_xu_info },
         { 0 }
 };
+
 /*
  * build a processing/extension unit
  */
-static int build_audio_procunit(struct mixer_build *state, int unitid, void *raw_desc, struct procunit_info *list, char *name)
+static int build_audio_procunit(struct mixer_build *state, int unitid,
+                                void *raw_desc, struct procunit_info *list,
+                                char *name)
 {
         struct uac_processing_unit_descriptor *desc = raw_desc;
         int num_ins = desc->bNrInPins;
@@ -1733,22 +1801,20 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, void *raw
         for (info = list; info && info->type; info++)
                 if (info->type == type)
                         break;
-        if (! info || ! info->type)
+        if (!info || !info->type)
                 info = &default_info;
 
         for (valinfo = info->values; valinfo->control; valinfo++) {
                 __u8 *controls = uac_processing_unit_bmControls(desc, state->mixer->protocol);
 
-                if (! (controls[valinfo->control / 8] & (1 << ((valinfo->control % 8) - 1))))
+                if (!(controls[valinfo->control / 8] & (1 << ((valinfo->control % 8) - 1))))
                         continue;
                 map = find_map(state, unitid, valinfo->control);
                 if (check_ignored_ctl(map))
                         continue;
                 cval = kzalloc(sizeof(*cval), GFP_KERNEL);
-                if (! cval) {
-                        usb_audio_err(state->chip, "cannot malloc kcontrol\n");
+                if (!cval)
                         return -ENOMEM;
-                }
                 cval->mixer = state->mixer;
                 cval->id = unitid;
                 cval->control = valinfo->control;
@@ -1765,7 +1831,8 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, void *raw
                         cval->initialized = 1;
                 } else {
                         if (type == USB_XU_CLOCK_RATE) {
-                                /* E-Mu USB 0404/0202/TrackerPre/0204
+                                /*
+                                 * E-Mu USB 0404/0202/TrackerPre/0204
                                  * samplerate control quirk
                                  */
                                 cval->min = 0;
@@ -1777,60 +1844,69 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, void *raw
                 }
 
                 kctl = snd_ctl_new1(&mixer_procunit_ctl, cval);
-                if (! kctl) {
-                        usb_audio_err(state->chip, "cannot malloc kcontrol\n");
+                if (!kctl) {
                         kfree(cval);
                         return -ENOMEM;
                 }
                 kctl->private_free = usb_mixer_elem_free;
 
-                if (check_mapped_name(map, kctl->id.name,
-                                                sizeof(kctl->id.name)))
+                if (check_mapped_name(map, kctl->id.name, sizeof(kctl->id.name))) {
                         /* nothing */ ;
-                else if (info->name)
+                } else if (info->name) {
                         strlcpy(kctl->id.name, info->name, sizeof(kctl->id.name));
-                else {
+                } else {
                         nameid = uac_processing_unit_iProcessing(desc, state->mixer->protocol);
                         len = 0;
                         if (nameid)
-                                len = snd_usb_copy_string_desc(state, nameid, kctl->id.name, sizeof(kctl->id.name));
-                        if (! len)
+                                len = snd_usb_copy_string_desc(state, nameid,
+                                                               kctl->id.name,
+                                                               sizeof(kctl->id.name));
+                        if (!len)
                                 strlcpy(kctl->id.name, name, sizeof(kctl->id.name));
                 }
                 append_ctl_name(kctl, " ");
                 append_ctl_name(kctl, valinfo->suffix);
 
                 usb_audio_dbg(state->chip,
-                        "[%d] PU [%s] ch = %d, val = %d/%d\n",
-                            cval->id, kctl->id.name, cval->channels, cval->min, cval->max);
-                if ((err = snd_usb_mixer_add_control(state->mixer, kctl)) < 0)
+                              "[%d] PU [%s] ch = %d, val = %d/%d\n",
+                              cval->id, kctl->id.name, cval->channels,
+                              cval->min, cval->max);
+
+                err = snd_usb_mixer_add_control(state->mixer, kctl);
+                if (err < 0)
                         return err;
         }
         return 0;
 }
 
-
-static int parse_audio_processing_unit(struct mixer_build *state, int unitid, void *raw_desc)
+static int parse_audio_processing_unit(struct mixer_build *state, int unitid,
+                                       void *raw_desc)
 {
-        return build_audio_procunit(state, unitid, raw_desc, procunits, "Processing Unit");
+        return build_audio_procunit(state, unitid, raw_desc,
+                                    procunits, "Processing Unit");
 }
 
-static int parse_audio_extension_unit(struct mixer_build *state, int unitid, void *raw_desc)
+static int parse_audio_extension_unit(struct mixer_build *state, int unitid,
+                                      void *raw_desc)
 {
-        /* Note that we parse extension units with processing unit descriptors.
-         * That's ok as the layout is the same */
-        return build_audio_procunit(state, unitid, raw_desc, extunits, "Extension Unit");
+        /*
+         * Note that we parse extension units with processing unit descriptors.
+         * That's ok as the layout is the same.
+         */
+        return build_audio_procunit(state, unitid, raw_desc,
+                                    extunits, "Extension Unit");
 }
 
-
 /*
  * Selector Unit
  */
 
-/* info callback for selector unit
+/*
+ * info callback for selector unit
  * use an enumerator type for routing
  */
-static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_info *uinfo)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
         const char **itemlist = (const char **)kcontrol->private_value;
@@ -1841,7 +1917,8 @@ static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl
 }
 
 /* get callback for selector unit */
-static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
         int val, err;
@@ -1860,7 +1937,8 @@ static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
 }
 
 /* put callback for selector unit */
-static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
         int val, oval, err;
@@ -1889,8 +1967,8 @@ static struct snd_kcontrol_new mixer_selectunit_ctl = {
         .put = mixer_ctl_selector_put,
 };
 
-
-/* private free callback.
+/*
+ * private free callback.
  * free both private_data and private_value
  */
 static void usb_mixer_selector_elem_free(struct snd_kcontrol *kctl)
@@ -1915,7 +1993,8 @@ static void usb_mixer_selector_elem_free(struct snd_kcontrol *kctl)
 /*
  * parse a selector unit
  */
-static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void *raw_desc)
+static int parse_audio_selector_unit(struct mixer_build *state, int unitid,
+                                     void *raw_desc)
 {
         struct uac_selector_unit_descriptor *desc = raw_desc;
         unsigned int i, nameid, len;
@@ -1944,10 +2023,8 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void
                 return 0;
 
         cval = kzalloc(sizeof(*cval), GFP_KERNEL);
-        if (! cval) {
-                usb_audio_err(state->chip, "cannot malloc kcontrol\n");
+        if (!cval)
                 return -ENOMEM;
-        }
         cval->mixer = state->mixer;
         cval->id = unitid;
         cval->val_type = USB_MIXER_U8;
@@ -1963,8 +2040,7 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void
                 cval->control = 0;
 
         namelist = kmalloc(sizeof(char *) * desc->bNrInPins, GFP_KERNEL);
-        if (! namelist) {
-                usb_audio_err(state->chip, "cannot malloc\n");
+        if (!namelist) {
                 kfree(cval);
                 return -ENOMEM;
         }
@@ -1973,8 +2049,7 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void
                 struct usb_audio_term iterm;
                 len = 0;
                 namelist[i] = kmalloc(MAX_ITEM_NAME_LEN, GFP_KERNEL);
-                if (! namelist[i]) {
-                        usb_audio_err(state->chip, "cannot malloc\n");
+                if (!namelist[i]) {
                         while (i--)
                                 kfree(namelist[i]);
                         kfree(namelist);
@@ -1986,7 +2061,7 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void
                 if (! len && check_input_term(state, desc->baSourceID[i], &iterm) >= 0)
                         len = get_term_name(state, &iterm, namelist[i], MAX_ITEM_NAME_LEN, 0);
                 if (! len)
-                        sprintf(namelist[i], "Input %d", i);
+                        sprintf(namelist[i], "Input %u", i);
         }
 
         kctl = snd_ctl_new1(&mixer_selectunit_ctl, cval);
@@ -2004,11 +2079,12 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void
         if (len)
                 ;
         else if (nameid)
-                snd_usb_copy_string_desc(state, nameid, kctl->id.name, sizeof(kctl->id.name));
+                snd_usb_copy_string_desc(state, nameid, kctl->id.name,
+                                         sizeof(kctl->id.name));
         else {
                 len = get_term_name(state, &state->oterm,
                                     kctl->id.name, sizeof(kctl->id.name), 0);
-                if (! len)
+                if (!len)
                         strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name));
 
                 if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR)
@@ -2027,7 +2103,6 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void
         return 0;
 }
 
-
 /*
  * parse an audio unit recursively
  */
@@ -2125,14 +2200,16 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
         }
 
         p = NULL;
-        while ((p = snd_usb_find_csint_desc(mixer->hostif->extra, mixer->hostif->extralen,
+        while ((p = snd_usb_find_csint_desc(mixer->hostif->extra,
+                                            mixer->hostif->extralen,
                                             p, UAC_OUTPUT_TERMINAL)) != NULL) {
                 if (mixer->protocol == UAC_VERSION_1) {
                         struct uac1_output_terminal_descriptor *desc = p;
 
                         if (desc->bLength < sizeof(*desc))
                                 continue; /* invalid descriptor? */
-                        set_bit(desc->bTerminalID, state.unitbitmap);  /* mark terminal ID as visited */
+                        /* mark terminal ID as visited */
+                        set_bit(desc->bTerminalID, state.unitbitmap);
                         state.oterm.id = desc->bTerminalID;
                         state.oterm.type = le16_to_cpu(desc->wTerminalType);
                         state.oterm.name = desc->iTerminal;
@@ -2144,7 +2221,8 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
 
                         if (desc->bLength < sizeof(*desc))
                                 continue; /* invalid descriptor? */
-                        set_bit(desc->bTerminalID, state.unitbitmap);  /* mark terminal ID as visited */
+                        /* mark terminal ID as visited */
+                        set_bit(desc->bTerminalID, state.unitbitmap);
                         state.oterm.id = desc->bTerminalID;
                         state.oterm.type = le16_to_cpu(desc->wTerminalType);
                         state.oterm.name = desc->iTerminal;
@@ -2152,7 +2230,10 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
                         if (err < 0 && err != -EINVAL)
                                 return err;
 
-                        /* for UAC2, use the same approach to also add the clock selectors */
+                        /*
+                         * For UAC2, use the same approach to also add the
+                         * clock selectors
+                         */
                         err = parse_audio_unit(&state, desc->bCSourceID);
                         if (err < 0 && err != -EINVAL)
                                 return err;
@@ -2306,7 +2387,9 @@ static void snd_usb_mixer_interrupt(struct urb *urb)
         }
 
 requeue:
-        if (ustatus != -ENOENT && ustatus != -ECONNRESET && ustatus != -ESHUTDOWN) {
+        if (ustatus != -ENOENT &&
+            ustatus != -ECONNRESET &&
+            ustatus != -ESHUTDOWN) {
                 urb->dev = mixer->chip->dev;
                 usb_submit_urb(urb, GFP_ATOMIC);
         }